diff --git a/Android.bp b/Android.bp
index 827f431d463..3c2630e8cd9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,6 +79,7 @@ android_library {
         "BiometricsSharedLib",
         "SystemUIUnfoldLib",
         "WifiTrackerLib",
+        "android.hardware.biometrics.flags-aconfig-java",
         "android.hardware.dumpstate-V1-java",
         "android.hardware.dumpstate-V1.0-java",
         "android.hardware.dumpstate-V1.1-java",
@@ -98,6 +99,7 @@ android_library {
         "SettingsLibDataStore",
         "SettingsLibMetadata",
         "SettingsLibPreference",
+        "SettingsLibService",
         "aconfig_settings_flags_lib",
         "accessibility_settings_flags_lib",
         "contextualcards",
@@ -107,7 +109,6 @@ android_library {
         "fuelgauge-protos-lite",
         "settings-logtags",
         "statslog-settings",
-        "telephony_flags_core_java_lib",
         "setupdesign-lottie-loading-layout",
         "device_policy_aconfig_flags_lib",
         "keyboard_flags_lib",
@@ -131,7 +132,12 @@ android_library {
         "ims-common",
     ],
     flags_packages: [
+        "aconfig_settings_flags",
+        "aconfig_settingslib_flags",
         "android.app.flags-aconfig",
+        "android.provider.flags-aconfig",
+        "android.security.flags-aconfig",
+        "keyboard_flags",
     ],
 }
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cc4d898403a..2295ee3dd1a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -237,6 +237,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
                 <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
+                <action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>
             </intent-filter>
         </receiver>
 
@@ -851,10 +852,15 @@
         </activity>
 
         <activity android:name=".network.SimOnboardingActivity"
-            android:exported="false"
+            android:exported="true"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
             android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
-            android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>
+            android:theme="@style/Theme.SpaLib.BottomSheetDialog">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.SIM_PREFERENCE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+      </activity>
 
         <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
                   android:exported="false"
@@ -1072,28 +1078,6 @@
             android:theme="@android:style/Theme.NoDisplay">
         </activity>
 
-        <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.settings.LANGUAGE_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.VOICE_LAUNCH"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.language.LanguageAndInputSettings"/>
-            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
-                       android:value="@string/menu_key_system"/>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true"/>
-        </activity>
-
         <activity
             android:name=".Settings$LanguageSettingsActivity"
             android:label="@string/languages_settings"
@@ -1148,6 +1132,38 @@
                 android:value="true"/>
         </activity>
 
+        <activity
+            android:name=".Settings$TemperatureUnitSettingsActivity"
+            android:label="@string/temperature_preferences_title"
+            android:exported="true" >
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.TEMPERATURE_UNIT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.regionalpreferences.TemperatureUnitFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_system"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true"/>
+        </activity>
+
+        <activity
+            android:name=".Settings$FirstDayOfWeekSettingsActivity"
+            android:label="@string/first_day_of_week_preferences_title"
+            android:exported="true" >
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.FIRST_DAY_OF_WEEK_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_system"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true"/>
+        </activity>
+
         <activity
             android:name=".Settings$KeyboardSettingsActivity"
             android:label="@string/keyboard_settings"
@@ -1219,14 +1235,29 @@
                        android:value="@string/menu_key_system"/>
         </activity>
 
+        <activity android:name="Settings$PhysicalKeyboardLayoutPickerActivity"
+            android:label="@string/physical_keyboard_layout_picker_title"
+            android:exported="true"
+            android:clearTaskOnLaunch="true"
+            android:featureFlag="com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.HARD_KEYBOARD_LAYOUT_PICKER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_system"/>
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="LanguageSettings"
                 android:label="@string/language_input_gesture_title"
                 android:clearTaskOnLaunch="true"
                 android:exported="true"
-                android:targetActivity="Settings$LanguageAndInputSettingsActivity">
+                android:targetActivity="Settings$LanguageSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.language.LanguageAndInputSettings" />
+                android:value="com.android.settings.language.LanguageSettings" />
             <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
                        android:value="@string/menu_key_system"/>
         </activity-alias>
@@ -1383,40 +1414,6 @@
             android:theme="@style/Theme.Settings.NoActionBar">
         </activity>
 
-        <activity
-            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" />
-                <category android:name="com.android.settings.suggested.category.ZEN" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
-            </intent-filter>
-
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="0" />
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/zen_suggestion_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/zen_suggestion_summary" />
-        </activity>
-
-        <activity
-            android:name=".notification.zen.ZenOnboardingActivity"
-            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
-            android:icon="@drawable/ic_notifications"
-            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
-            android:exported="true">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_ONBOARDING" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
@@ -1985,6 +1982,20 @@
                 android:value="@string/menu_key_apps"/>
         </activity-alias>
 
+        <activity android:name="Settings$AppStorageSettingsActivity"
+                  android:label="@string/storage_label"
+                  android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.APP_STORAGE_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.AppStorageSettings" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                   android:value="@string/menu_key_apps"/>
+        </activity>
+
         <activity android:name=".applications.InstalledAppOpenByDefaultActivity"
                   android:label="@string/application_info_label"
                   android:exported="true">
@@ -2833,6 +2844,10 @@
             android:exported="false"
             android:theme="@style/GlifTheme.Light"
             android:taskAffinity="com.android.settings.root" />
+        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$AddAdditionalFingerprint"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light"
+            android:taskAffinity="com.android.settings.root" />
 
         <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"
             android:exported="false"
@@ -3420,6 +3435,21 @@
                        android:value="@string/menu_key_battery"/>
         </activity>
 
+        <activity
+            android:name="Settings$PowerUsageAdvancedActivity"
+            android:label="@string/advanced_battery_title"
+            android:exported="true"
+            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.battery.action.POWER_USAGE_ADVANCED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_battery"/>
+        </activity>
+
         <provider
             android:name=".fuelgauge.batteryusage.BatteryUsageContentProvider"
             android:enabled="true"
@@ -4533,6 +4563,10 @@
                   android:label="@string/privacy_settings_title"
                   android:exported="true"
                   android:icon="@drawable/ic_settings_backup">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.BACKUP_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" />
@@ -5348,12 +5382,47 @@
                 android:value="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog" />
         </activity>
 
+        <activity
+            android:name="Settings$ContactsStorageSettingsActivity"
+            android:label="@string/contacts_storage_settings_title"
+            android:exported="true"
+            android:featureFlag="android.provider.new_default_account_api_enabled">
+            <intent-filter>
+                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.contacts.ContactsStorageSettings"/>
+        </activity>
+
         <service
             android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"
             android:foregroundServiceType="mediaPlayback"
             android:enabled="true"
             android:exported="false" />
 
+        <!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". -->
+        <!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->
+        <service
+            android:name=".SettingsService"
+            android:exported="true"
+            android:permission="android.permission.READ_BASIC_PHONE_STATE">
+            <intent-filter>
+                <action android:name="com.android.settingslib.PREFERENCE_SERVICE" />
+            </intent-filter>
+        </service>
+
+        <!-- Service to expose Preference Metadata and Get/Set functionality -->
+        <service
+            android:name=".service.PreferenceService"
+            android:exported="true"
+            android:featureFlag="com.android.settingslib.flags.settings_catalyst"
+            android:permission="android.permission.READ_SYSTEM_PREFERENCES">
+            <intent-filter>
+                <action android:name="android.service.settings.preferences.action.PREFERENCE_SERVICE" />
+            </intent-filter>
+        </service>
+
         <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"
             android:exported="false">
             <intent-filter>
@@ -5370,6 +5439,23 @@
             </intent-filter>
         </receiver>
 
+        <activity
+            android:name="Settings$ChangeNfcTagAppsActivity"
+            android:exported="true"
+            android:label="@string/change_nfc_tag_apps_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.nfc.action.CHANGE_TAG_INTENT_PREFERENCE" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                       android:value="@string/menu_key_apps"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 01d75e88a17..6e22780c3d7 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,5 +1,6 @@
 [Hook Scripts]
-checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
+# TODO(b/377902600): Re-enable this hook once it is fixed.
+#checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
 
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
 
diff --git a/aconfig/catalyst/about_phone.aconfig b/aconfig/catalyst/about_phone.aconfig
index 59a2228c38f..d0564de2e58 100644
--- a/aconfig/catalyst/about_phone.aconfig
+++ b/aconfig/catalyst/about_phone.aconfig
@@ -15,3 +15,9 @@ flag {
   bug: "323791114"
 }
 
+flag {
+  name: "catalyst_my_device_info_pref_screen"
+  namespace: "android_settings"
+  description: "Flag for About phone"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/accessibility.aconfig b/aconfig/catalyst/accessibility.aconfig
new file mode 100644
index 00000000000..783706709a1
--- /dev/null
+++ b/aconfig/catalyst/accessibility.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_accessibility_color_and_motion"
+  namespace: "android_settings"
+  description: "Migrate Color and motion screen to the Catalyst infrastructure"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_text_reading_screen"
+  namespace: "android_settings"
+  description: "Flag for Display size and text"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/battery.aconfig b/aconfig/catalyst/battery.aconfig
new file mode 100644
index 00000000000..cec40f3746b
--- /dev/null
+++ b/aconfig/catalyst/battery.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_power_usage_summary_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery screen"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_battery_saver_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery Saver"
+  bug: "323791114"
+}
\ No newline at end of file
diff --git a/aconfig/catalyst/connected_devices.aconfig b/aconfig/catalyst/connected_devices.aconfig
new file mode 100644
index 00000000000..7a335fa4675
--- /dev/null
+++ b/aconfig/catalyst/connected_devices.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_bluetooth_switchbar_screen"
+  namespace: "android_settings"
+  description: "Flag for Bluetooth"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/display.aconfig b/aconfig/catalyst/display.aconfig
new file mode 100644
index 00000000000..9485e70fc1d
--- /dev/null
+++ b/aconfig/catalyst/display.aconfig
@@ -0,0 +1,30 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_display_settings_screen"
+  namespace: "android_settings"
+  description: "Flag for Display"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_screen_timeout"
+  namespace: "android_settings"
+  description: "Flag for Screen Timeout settings"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_dark_ui_mode"
+  namespace: "android_settings"
+  description: "Flag for Dark theme"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_screen_brightness_mode"
+  namespace: "android_settings"
+  description: "Flag for Adaptive brightness"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/location.aconfig b/aconfig/catalyst/location.aconfig
new file mode 100644
index 00000000000..c656bf3ea58
--- /dev/null
+++ b/aconfig/catalyst/location.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_location_settings"
+  namespace: "android_settings"
+  description: "Flag for Location"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/lockscreen.aconfig b/aconfig/catalyst/lockscreen.aconfig
new file mode 100644
index 00000000000..9a84f66af15
--- /dev/null
+++ b/aconfig/catalyst/lockscreen.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_lockscreen_from_display_settings"
+  namespace: "android_settings"
+  description: "Flag for Display & touch > Lock screen"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig
new file mode 100644
index 00000000000..aa26ce42be6
--- /dev/null
+++ b/aconfig/catalyst/network_and_internet.aconfig
@@ -0,0 +1,52 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_network_provider_and_internet_screen"
+  namespace: "android_settings"
+  description: "Flag for Network & Internet"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_internet_settings"
+  namespace: "android_settings"
+  description: "Flag for Internet"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_mobile_network_list"
+  namespace: "android_settings"
+  description: "Flag for SIMs"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_tether_settings"
+  namespace: "android_settings"
+  description: "Flag for Hotspot & tethering"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_adaptive_connectivity"
+  namespace: "android_settings"
+  description: "Flag for Adaptive connectivity"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_wifi_calling"
+  namespace: "android_settings"
+  description: "Flag for Wi-Fi calling screen"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_restrict_background_parent_entry"
+  namespace: "android_settings"
+  description: "Flag for Data Saver"
+  bug: "323791114"
+}
+
diff --git a/aconfig/catalyst/sound_screen.aconfig b/aconfig/catalyst/sound_screen.aconfig
new file mode 100644
index 00000000000..ac7f8bc1b80
--- /dev/null
+++ b/aconfig/catalyst/sound_screen.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+    name: "catalyst_sound_screen"
+    namespace: "android_settings"
+    description: "Flag for sound and vibration page"
+    bug: "323791114"
+}
+
+flag {
+    name: "catalyst_vibration_intensity_screen"
+    namespace: "android_settings"
+    description: "Flag for vibration and haptics page"
+    bug: "323791114"
+}
\ No newline at end of file
diff --git a/aconfig/catalyst/system.aconfig b/aconfig/catalyst/system.aconfig
new file mode 100644
index 00000000000..f87ff44a909
--- /dev/null
+++ b/aconfig/catalyst/system.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+    name: "catalyst_language_setting"
+    namespace: "android_settings"
+    description: "Flag for System -> Languages screen"
+    bug: "323791114"
+}
diff --git a/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig b/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
new file mode 100644
index 00000000000..18684ab7344
--- /dev/null
+++ b/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.keyboard"
+container: "system"
+
+flag {
+  name: "keyboard_layout_picker_activity_enabled"
+  namespace: "input"
+  description: "This flag enables or disables exposed page of keyboard layout picker"
+  bug: "345399212"
+}
\ No newline at end of file
diff --git a/aconfig/settings_biometrics_integration_declarations.aconfig b/aconfig/settings_biometrics_integration_declarations.aconfig
index 66d794b9d70..48bf293fa1b 100644
--- a/aconfig/settings_biometrics_integration_declarations.aconfig
+++ b/aconfig/settings_biometrics_integration_declarations.aconfig
@@ -15,3 +15,40 @@ flag {
   bug: "301226085"
 }
 
+flag {
+  name: "enroll_layout_truncate_improvement"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the enroll layout truncate improvement feature should be enabled"
+  bug: "359149850"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
+  name: "screen_off_unlock_power_optimization"
+  namespace: "biometrics_integration"
+  description: "This flag controls Whether to gate fp unlock when screen turns off feature before AOC optimized"
+  bug: "368465560"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
+  name: "biometrics_onboarding_education"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the onboarding education settings UX should be enabled"
+  bug: "370940762"
+}
+
+flag {
+  name: "biometric_onboarding_education"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the onboarding education settings UX should be enabled"
+  bug: "370940762"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
index ee0c233614f..f10c019a459 100644
--- a/aconfig/settings_connecteddevice_flag_declarations.aconfig
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -15,6 +15,13 @@ flag {
   bug: "253296253"
 }
 
+flag {
+  name: "display_topology_pane_in_display_list"
+  namespace: "display_manager"
+  description: "Shows the connected display setting and shows the topology pane in the display list, even with only one display connected."
+  bug: "352648432"
+}
+
 flag {
   name: "enable_auth_challenge_for_usb_preferences"
   namespace: "safety_center"
diff --git a/aconfig/settings_datetime_flag_declarations.aconfig b/aconfig/settings_datetime_flag_declarations.aconfig
index dc3f1f409a6..5e140520fce 100644
--- a/aconfig/settings_datetime_flag_declarations.aconfig
+++ b/aconfig/settings_datetime_flag_declarations.aconfig
@@ -9,3 +9,11 @@ flag {
     bug: "283239837"
 }
 
+flag {
+    name: "revamp_toggles"
+    # "location" is used by the Android System Time team for feature flags.
+    namespace: "location"
+    description: "Makes the use location toggle dependent on automatic time zone detection"
+    bug: "296835792"
+}
+
diff --git a/aconfig/settings_development_flag_declarations.aconfig b/aconfig/settings_development_flag_declarations.aconfig
index b9a084f3a29..cdce6e7437c 100644
--- a/aconfig/settings_development_flag_declarations.aconfig
+++ b/aconfig/settings_development_flag_declarations.aconfig
@@ -19,3 +19,10 @@ flag {
   description: "Shows hdr/sdr dev opton on the development options page from aconfig"
   bug: "291863102"
 }
+
+flag {
+  name: "page_size_app_compat_setting"
+  namespace: "devoptions_settings"
+  description: "Flag to enable page size app compat mode from Settings."
+  bug: "371049373"
+}
diff --git a/aconfig/settings_experience_flag_declarations.aconfig b/aconfig/settings_experience_flag_declarations.aconfig
index d5caccfbb5c..2d32ffaa2c7 100644
--- a/aconfig/settings_experience_flag_declarations.aconfig
+++ b/aconfig/settings_experience_flag_declarations.aconfig
@@ -17,3 +17,14 @@ flag {
         purpose: PURPOSE_BUGFIX
     }
 }
+
+flag {
+    name: "satellite_oem_settings_ux_migration"
+    namespace: "settings_experience"
+    description: "Migrate satellite UX to Android Settings"
+    bug: "378781925"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
+
diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig
index 37a8798d2a8..67ae0941c7a 100644
--- a/aconfig/settings_flag_declarations.aconfig
+++ b/aconfig/settings_flag_declarations.aconfig
@@ -63,3 +63,10 @@ flag {
   description: "Flag for all screens"
   bug: "323791114"
 }
+
+flag {
+  name: "catalyst_service"
+  namespace: "android_settings"
+  description: "Flag for catalyst service"
+  bug: "323791114"
+}
diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig
index 2f046d0026b..0757fa883ae 100644
--- a/aconfig/settings_globalintl_flag_declarations.aconfig
+++ b/aconfig/settings_globalintl_flag_declarations.aconfig
@@ -21,3 +21,10 @@ flag {
     description: "Feature flag for B&R accessibility appearance settings"
     bug: "341210043"
 }
+
+flag {
+    name: "regional_preferences_api_enabled"
+    namespace: "globalintl"
+    description: "Feature flag for regional preferences APIs"
+    bug: "370379000"
+}
\ No newline at end of file
diff --git a/aconfig/settings_telephony_flag_declarations.aconfig b/aconfig/settings_telephony_flag_declarations.aconfig
index c12de7ac340..3543e60c002 100644
--- a/aconfig/settings_telephony_flag_declarations.aconfig
+++ b/aconfig/settings_telephony_flag_declarations.aconfig
@@ -14,3 +14,19 @@ flag {
     description: "Control the Dual SIM onobarding feature"
     bug: "298898436"
 }
+
+# OWNER=yomna TARGET=25Q2
+flag {
+    name: "mobile_network_security_2g_toggle"
+    namespace: "hardware_backed_security"
+    description: "Exposing 2G toggles in Mobile Network Security page"
+    bug: "355062720"
+}
+
+# OWNER=yomna TARGET=25Q2
+flag {
+    name: "add_security_algorithms_to_eng_menu"
+    namespace: "hardware_backed_security"
+    description: "Exposing security transparency features to field engineering menu"
+    bug: "355062720"
+}
diff --git a/res-product/values-af/strings.xml b/res-product/values-af/strings.xml
index d3b04af42d7..4ad95f16f8c 100644
--- a/res-product/values-af/strings.xml
+++ b/res-product/values-af/strings.xml
@@ -33,7 +33,7 @@
     <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="7909547303183236140">"\'n App wil jou foon vir ander Bluetooth-toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="6187874232925632790">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%2$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="1018495685727482700">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou foon <xliff:g id="TIMEOUT">%2$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"\'n Program wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"\'n App wil Bluetooth aanskakel en jou tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="4847493437698663706">"\'n App wil Bluetooth aanskakel en jou foon <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes lank vir ander toestelle sigbaar maak."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="487436507630570730">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou tablet vir ander toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="5169934906530139494">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel en jou foon vir ander toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>
diff --git a/res-product/values-es-feminine/strings.xml b/res-product/values-es-feminine/strings.xml
new file mode 100644
index 00000000000..61a55dabb79
--- /dev/null
+++ b/res-product/values-es-feminine/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Usa la cara para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras).\n\nTen en cuenta lo siguiente:\nSolo puedes tener registrada una cara. Si quieres añadir otra, debes eliminar la que ya está registrada.\n\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 una gemela) pueda desbloquear el teléfono."</string>
+</resources>
diff --git a/res-product/values-es-masculine/strings.xml b/res-product/values-es-masculine/strings.xml
new file mode 100644
index 00000000000..54f55d6e7a0
--- /dev/null
+++ b/res-product/values-es-masculine/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Usa la cara para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras).\n\nTen en cuenta lo siguiente:\nSolo puedes tener registrada una cara. Si quieres añadir otra, debes eliminar la que ya está registrada.\n\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 gemelo) pueda desbloquear el teléfono."</string>
+</resources>
diff --git a/res-product/values-es-neuter/strings.xml b/res-product/values-es-neuter/strings.xml
new file mode 100644
index 00000000000..54f55d6e7a0
--- /dev/null
+++ b/res-product/values-es-neuter/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Usa la cara para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras).\n\nTen en cuenta lo siguiente:\nSolo puedes tener registrada una cara. Si quieres añadir otra, debes eliminar la que ya está registrada.\n\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 gemelo) pueda desbloquear el teléfono."</string>
+</resources>
diff --git a/res-product/values-es/strings.xml b/res-product/values-es/strings.xml
index 4726f3352d1..1d615acec9d 100644
--- a/res-product/values-es/strings.xml
+++ b/res-product/values-es/strings.xml
@@ -322,13 +322,13 @@
     <string name="ambient_display_title" product="tablet" msgid="2347746118188465334">"Doble toque para consultar la tablet"</string>
     <string name="ambient_display_title" product="device" msgid="6306105102175823199">"Doble toque para consultar el dispositivo"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="6753194901596847876">"Levantar teléfono para consultarlo"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="1166999144900082897">"Levantar para consultar la tablet"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="1166999144900082897">"Levantar tablet para consultarla"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2091669267677915975">"Levantar el dispositivo para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="135853288202686097">"Coge el teléfono para consultar la hora, las notificaciones y otra información"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1638055271563107384">"Coge la tablet para consultar la hora, las notificaciones y otra información."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="964509644539692482">"Coge el dispositivo para consultar la hora, las notificaciones y otra información."</string>
     <string name="ambient_display_tap_screen_title" product="default" msgid="4098147293617084955">"Tocar teléfono para consultarlo"</string>
-    <string name="ambient_display_tap_screen_title" product="tablet" msgid="7748346447393988408">"Toca para comprobar la tablet"</string>
+    <string name="ambient_display_tap_screen_title" product="tablet" msgid="7748346447393988408">"Tocar tablet para consultarla"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="5710618387229771616">"Toca para comprobar el dispositivo"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="9220919404923939167">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales de la parte trasera del teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8352977484297938140">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales de la parte trasera del tablet."</string>
diff --git a/res-product/values-fr-feminine/strings.xml b/res-product/values-fr-feminine/strings.xml
new file mode 100644
index 00000000000..1bb646f6d6f
--- /dev/null
+++ b/res-product/values-fr-feminine/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connectée aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être la seule responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values-fr-masculine/strings.xml b/res-product/values-fr-masculine/strings.xml
new file mode 100644
index 00000000000..7d81007a088
--- /dev/null
+++ b/res-product/values-fr-masculine/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values-fr-neuter/strings.xml b/res-product/values-fr-neuter/strings.xml
new file mode 100644
index 00000000000..99faaabf8db
--- /dev/null
+++ b/res-product/values-fr-neuter/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté·e aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être l\'unique responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values-fr-rCA-feminine/strings.xml b/res-product/values-fr-rCA-feminine/strings.xml
new file mode 100644
index 00000000000..3b065d8aa18
--- /dev/null
+++ b/res-product/values-fr-rCA-feminine/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connectée aux comptes suivants :\n"</string>
+</resources>
diff --git a/res/drawable/audio_sharing_rounded_bg_ripple.xml b/res-product/values-fr-rCA-masculine/strings.xml
similarity index 58%
rename from res/drawable/audio_sharing_rounded_bg_ripple.xml
rename to res-product/values-fr-rCA-masculine/strings.xml
index 18696c627ec..ed2e2ca088c 100644
--- a/res/drawable/audio_sharing_rounded_bg_ripple.xml
+++ b/res-product/values-fr-rCA-masculine/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  -->
+ -->
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="@drawable/audio_sharing_rounded_bg"/>
-</ripple>
\ No newline at end of file
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+</resources>
diff --git a/res-product/values-fr-rCA-neuter/strings.xml b/res-product/values-fr-rCA-neuter/strings.xml
new file mode 100644
index 00000000000..6b27fadb15a
--- /dev/null
+++ b/res-product/values-fr-rCA-neuter/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Votre connexion aux comptes suivants est actuellement active :\n"</string>
+</resources>
diff --git a/res-product/values-it-feminine/strings.xml b/res-product/values-it-feminine/strings.xml
new file mode 100644
index 00000000000..d7f3aa06dc4
--- /dev/null
+++ b/res-product/values-it-feminine/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_other_users_present" product="default" msgid="7750368595882863399">\n\n"Sono presenti altre utenti su questo dispositivo.\n"</string>
+</resources>
diff --git a/res-product/values-it-masculine/strings.xml b/res-product/values-it-masculine/strings.xml
new file mode 100644
index 00000000000..d4e98e4c9b7
--- /dev/null
+++ b/res-product/values-it-masculine/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_other_users_present" product="default" msgid="7750368595882863399">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
+</resources>
diff --git a/res-product/values-it-neuter/strings.xml b/res-product/values-it-neuter/strings.xml
new file mode 100644
index 00000000000..160a6d91af5
--- /dev/null
+++ b/res-product/values-it-neuter/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_other_users_present" product="default" msgid="7750368595882863399">\n\n"Sono presenti altrɜ utenti su questo dispositivo.\n"</string>
+</resources>
diff --git a/res-product/values-sk/strings.xml b/res-product/values-sk/strings.xml
index f04d5c63cb1..cd8fb4203f1 100644
--- a/res-product/values-sk/strings.xml
+++ b/res-product/values-sk/strings.xml
@@ -106,7 +106,7 @@
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Odomykajte telefón alebo overujte svoju totožnosť tvárou, napríklad keď sa prihlasujete do aplikácií alebo schvaľujete nákup.\n\nUpozornenie:\nNaraz môžete mať nastavenú iba jednu tvár. Ak chcete pridať ďalšiu tvár, odstráňte aktuálnu.\n\nTelefón môžete neúmyselne odomknúť pohľadom.\n\nMôže ho odomknúť iná osoba, ak vám ho pridrží pred tvárou, a to aj v prípade, že máte zatvorené oči.\n\nMôže ho odomknúť aj niekto, kto sa na vás veľmi podobá, napríklad dvojča."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Odomykajte tablet alebo overujte svoju totožnosť tvárou, napríklad keď sa prihlasujete do aplikácií alebo schvaľujete nákup.\n\nUpozornenie:\nNaraz môžete mať nastavenú iba jednu tvár. Ak chcete pridať ďalšiu tvár, odstráňte aktuálnu.\n\nTablet môžete neúmyselne odomknúť pohľadom.\n\nMôže ho odomknúť iná osoba, ak vám ho pridrží pred tvárou, a to aj v prípade, že máte zatvorené oči.\n\nMôže ho odomknúť aj niekto, kto sa na vás veľmi podobá, napríklad dvojča."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Odomykajte zariadenie alebo overujte svoju totožnosť tvárou, napríklad keď sa prihlasujete do aplikácií alebo schvaľujete nákup.\n\nUpozornenie:\nNaraz môžete mať nastavenú iba jednu tvár. Ak chcete pridať ďalšiu tvár, odstráňte aktuálnu.\n\nZariadenie môžete neúmyselne odomknúť pohľadom.\n\nMôže ho odomknúť iná osoba, ak vám ho pridrží pred tvárou, a to aj v prípade, že máte zatvorené oči.\n\nMôže ho odomknúť aj niekto, kto sa na vás veľmi podobá, napríklad dvojča."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Odomykajte zariadenie <xliff:g id="DEVICENAME">%s</xliff:g> a overujte svoju totožnosť odtlačkom prsta, napríklad keď sa prihlasujete do aplikácií alebo schvaľujete nákup"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Odomykajte zariadenie <xliff:g id="DEVICENAME">%s</xliff:g> a overujte svoju totožnosť odtlačkom prsta, napríklad keď sa prihlasujete do aplikácií alebo schvaľujete nákup."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Povoľte svojmu dieťaťu odomykať telefón a overovať jeho totožnosť odtlačkom prsta. Bude k tomu dochádzať pri prihlasovaní do aplikácií, schvaľovaní nákupov a ďalších činnostiach."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Povoľte svojmu dieťaťu odomykať tablet a overovať totožnosť jeho odtlačkom prsta. Bude sa to vyžadovať pri prihlasovaní do aplikácií, schvaľovaní nákupov a ďalších akciách."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Povoľte svojmu dieťaťu odomykať telefón a overovať totožnosť jeho odtlačkom prsta. Bude sa to vyžadovať pri prihlasovaní do aplikácií, schvaľovaní nákupov a ďalších akciách."</string>
diff --git a/res-product/values-zh-rTW/strings.xml b/res-product/values-zh-rTW/strings.xml
index bb097223de9..f39bc362f8a 100644
--- a/res-product/values-zh-rTW/strings.xml
+++ b/res-product/values-zh-rTW/strings.xml
@@ -309,7 +309,7 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"當行動數據用量達到你設定的上限時，平板電腦將關閉行動數據功能。\n\n由於數據用量是由平板電腦自動計算，而電信業者對用量的計算方式可能有所不同，因此建議你設定保守的上限值。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"當行動數據用量達到你設定的上限時，手機將關閉行動數據功能。\n\n由於數據用量是由手機自動計算，而電信業者對用量的計算方式可能有所不同，因此建議你設定保守的上限值。"</string>
     <string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"新增使用者來共用你的裝置。每位使用者在裝置上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"新增使用者來共用你的平板電腦。每位使用者在平板電腦上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"新增可共用平板電腦的使用者。每位使用者在平板電腦上都享有個人空間，並可自訂主畫面、帳戶、應用程式和設定等。"</string>
     <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"你可以新增其他使用者，與他們共用同一支手機。每位使用者在你的手機上都有自己的個人空間，並可自訂主畫面、帳戶、應用程式和設定等等。"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"只有手機的擁有者可以管理使用者。"</string>
diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index d5ef1c888f6..32e545bd7c2 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -89,6 +89,12 @@
     <string name="security_settings_face_enroll_introduction_message_class3" product="tablet">Use your face to unlock your tablet or for authentication in apps, like when you sign in to apps or approve a purchase</string>
     <!-- Subtitle shown on the face enrollment introduction screen with in-app authentication. [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_introduction_message_class3" product="device">Use your face to unlock your device or for authentication in apps, like when you sign in to apps or approve a purchase</string>
+    <!-- Subtitle shown on the face enrollment introduction screen with in-app authentication. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_message_class3_2" product="default"></string>
+    <!-- Subtitle shown on the face enrollment introduction screen with in-app authentication. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_message_class3_2" product="tablet"></string>
+    <!-- Subtitle shown on the face enrollment introduction screen with in-app authentication. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_message_class3_2" product="device"></string>
     <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="default">Allow your child to use their face to unlock their phone</string>
     <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
@@ -107,6 +113,18 @@
     <string name="security_settings_face_enroll_introduction_consent_message" product="tablet">Using your child\u2019s face to unlock their tablet may be less secure than a strong pattern or PIN.</string>
     <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
     <string name="security_settings_face_enroll_introduction_consent_message" product="device">Using your child\u2019s face to unlock their device may be less secure than a strong pattern or PIN.</string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_1" product="default"></string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_1" product="tablet"></string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_1" product="device"></string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_2" product="default"></string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_2" product="tablet"></string>
+    <!-- Message shown in Secure and helpful section in face enrollment introduction page. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_secure_and_helpful_message_2" product="device"></string>
     <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock. [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_introduction_info_looking" product="default"></string>
     <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock. [CHAR LIMIT=NONE] -->
@@ -161,6 +179,12 @@
     <string name="security_settings_face_enroll_introduction_control_message" product="tablet"></string>
     <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_introduction_control_message" product="device"></string>
+    <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_control_message_2" product="default"></string>
+    <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_control_message_2" product="tablet"></string>
+    <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_control_message_2" product="device"></string>
     <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_introduction_control_consent_message" product="default"></string>
     <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
@@ -193,6 +217,8 @@
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device">Use your face to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase.\n\nKeep in mind:\nYou can only have one face set up at a time. To add another face, delete the current one.\n\nLooking at the device can unlock it when you don\u2019t intend to.\n\nYour device can be unlocked by someone else if it\u2019s held up to your face, even if your eyes are closed.\n\nYour device can be unlocked by someone who looks a lot like you, like an identical sibling.</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_v3_message">Use your fingerprint to unlock your <xliff:g id="deviceName" example="Pixel">%s</xliff:g> or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>
+    <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_v3_message_2">Use your fingerprints to unlock your <xliff:g id="deviceName" example="Pixel">%s</xliff:g> or verify it\u2019s you in apps</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default">Allow your child to use their fingerprint to unlock their phone or verify it\u2019s them. This happens when they sign in to apps, approve a purchase, and more.</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
@@ -241,6 +267,18 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet">Your child\u2019s tablet can be unlocked when they don\u2019t intend to, like if someone holds it up to their finger.</string>
     <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device">Your child\u2019s device can be unlocked when they don\u2019t intend to, like if someone holds it up to their finger.</string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_7" product="default"></string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_7" product="tablet"></string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_7" product="device"></string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_8" product="default"></string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_8" product="tablet"></string>
+    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_8" product="device"></string>
     <!-- Message text only shown in fingerprint security settings home screen. (tablet) [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet">Use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps</string>
     <!-- Message text only shown in fingerprint security settings home screen. (device) [CHAR LIMIT=NONE]-->
diff --git a/res/color/dream_card_color_state_list.xml b/res/color/dream_card_color_state_list.xml
index 082408d1583..44ed589004f 100644
--- a/res/color/dream_card_color_state_list.xml
+++ b/res/color/dream_card_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimaryContainer"/>
-    <item android:color="?androidprv:attr/materialColorSurfaceBright"/>
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorPrimaryContainer"/>
+    <item android:color="@androidprv:color/materialColorSurfaceBright"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/dream_card_icon_color_state_list.xml b/res/color/dream_card_icon_color_state_list.xml
index ed34ae39357..f3e08721b92 100644
--- a/res/color/dream_card_icon_color_state_list.xml
+++ b/res/color/dream_card_icon_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
-    <item android:color="?androidprv:attr/materialColorPrimary"/>
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>
+    <item android:color="@androidprv:color/materialColorPrimary"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/dream_card_summary_color_state_list.xml b/res/color/dream_card_summary_color_state_list.xml
index a1845f44d95..7252abed0cb 100644
--- a/res/color/dream_card_summary_color_state_list.xml
+++ b/res/color/dream_card_summary_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
-    <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>
+    <item android:color="@androidprv:color/materialColorOnSurfaceVariant"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/dream_card_text_color_state_list.xml b/res/color/dream_card_text_color_state_list.xml
index b39bbed75c9..c4b3ef5f414 100644
--- a/res/color/dream_card_text_color_state_list.xml
+++ b/res/color/dream_card_text_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
-    <item android:color="?androidprv:attr/materialColorOnSurface"/>
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>
+    <item android:color="@androidprv:color/materialColorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/modes_icon_selectable_background.xml b/res/color/modes_icon_selectable_background.xml
index f9280c60d6c..b3b393562d3 100644
--- a/res/color/modes_icon_selectable_background.xml
+++ b/res/color/modes_icon_selectable_background.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
-    <item android:state_pressed="true" android:color="?androidprv:attr/materialColorPrimary" />
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimary" />
-    <item android:color="?androidprv:attr/materialColorSecondaryContainer" />
+    <item android:state_pressed="true" android:color="@androidprv:color/materialColorPrimary" />
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorPrimary" />
+    <item android:color="@androidprv:color/materialColorSecondaryContainer" />
 </selector>
diff --git a/res/color/modes_icon_selectable_icon.xml b/res/color/modes_icon_selectable_icon.xml
index 8a517d5f474..a5ab92b1d5b 100644
--- a/res/color/modes_icon_selectable_icon.xml
+++ b/res/color/modes_icon_selectable_icon.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
-    <item android:state_pressed="true" android:color="?androidprv:attr/materialColorOnPrimary" />
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary" />
-    <item android:color="?androidprv:attr/materialColorOnSecondaryContainer" />
+    <item android:state_pressed="true" android:color="@androidprv:color/materialColorOnPrimary" />
+    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimary" />
+    <item android:color="@androidprv:color/materialColorOnSecondaryContainer" />
 </selector>
diff --git a/res/drawable-night/accessibility_captioning_banner.xml b/res/drawable-night/accessibility_captioning_banner.xml
new file mode 100644
index 00000000000..39b606081ee
--- /dev/null
+++ b/res/drawable-night/accessibility_captioning_banner.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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">
+    <group>
+        <clip-path
+            android:pathData="M0,0h412v300h-412z"/>
+        <path
+            android:pathData="M383.9,300H28.1C12.6,300 0,287.4 0,271.9V28.1C0,12.6 12.6,0 28.1,0H383.9C399.4,0 412,12.6 412,28.1V271.9C412,287.4 399.4,300 383.9,300Z"
+            android:fillColor="#000000"/>
+        <path
+            android:pathData="M132.8,179.6H79.2V188.1H132.8V179.6Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M172.9,179.6H142.5V188.1H172.9V179.6Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M158.4,195.5H79.2V204H158.4V195.5Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M202.2,195.5H168.1V204H202.2V195.5Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M246,195.5H211.9V204H246V195.5Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M255.8,179.6H182.7V188.1H255.8V179.6Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M292.3,179.6H265.5V188.1H292.3V179.6Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M328.9,179.6H302.1V188.1H328.9V179.6Z"
+            android:fillColor="#669DF6"/>
+        <path
+            android:pathData="M142.7,67.9H131.2C129.6,67.9 128.3,69.2 128.3,70.8H67.8C59.9,70.8 53.4,77.3 53.4,85.2V217.6C53.4,225.5 59.9,232 67.8,232H344.2C352.1,232 358.6,225.5 358.6,217.6V85.2C358.6,77.3 352.1,70.8 344.2,70.8H203.1C203.1,69.2 201.8,67.9 200.2,67.9H171.4C169.8,67.9 168.5,69.2 168.5,70.8H145.5C145.5,69.2 144.3,67.9 142.7,67.9ZM344.2,73.7C350.6,73.7 355.7,78.9 355.7,85.2V217.6C355.7,223.9 350.5,229.1 344.2,229.1H67.8C61.4,229.1 56.3,223.9 56.3,217.6V85.2C56.3,78.9 61.5,73.7 67.8,73.7H344.2Z"
+            android:fillColor="#80868B"/>
+    </group>
+</vector>
diff --git a/res/drawable-night/double_tap_power_for_wallet.xml b/res/drawable-night/double_tap_power_for_wallet.xml
new file mode 100644
index 00000000000..9c3de368258
--- /dev/null
+++ b/res/drawable-night/double_tap_power_for_wallet.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright (C) 2024 The Android Open Source Project
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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:viewportHeight="300"
+    android:viewportWidth="412">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M384.2 300H27.8C12.5 300 0 287.2 0 271.5V28.5C0 12.8 12.5 0 27.8 0H384.3C399.5 0 412 12.8 412 28.5V271.7C412 287.2 399.5 300 384.2 300Z" />
+    <path
+        android:fillColor="#D2E3FC"
+        android:pathData="M272.5 77.2V82.9C277.9 82.9 282.3 87.3 282.3 92.7C282.3 98.1 277.9 102.5 272.5 102.5V108.2C281.1 108.2 288 101.2 288 92.7C288 84.2 281 77.2 272.5 77.2Z" />
+    <path
+        android:fillColor="#669DF6"
+        android:pathData="M282.3 92.7C282.3 87.3 277.9 82.9 272.5 82.9V102.6C277.9 102.6 282.3 98.2 282.3 92.7Z" />
+    <path
+        android:fillColor="#80868B"
+        android:pathData="M274.9 97.7V88.2C274.9 86.9 273.8 85.8 272.5 85.8V35.9C272.5 29.3 267.2 24 260.6 24H151.3C144.7 24 139.4 29.3 139.4 35.9V264.1C139.4 270.7 144.7 276 151.3 276H260.7C267.3 276 272.6 270.7 272.6 264.1V147.6C273.9 147.6 275 146.5 275 145.2V121.4C275 120.1 273.9 119 272.6 119V100C273.9 100.1 274.9 99 274.9 97.7ZM270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+    <path
+        android:fillColor="#E8EAED"
+        android:pathData="M270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M194.64 151.3C192.292 151.3 190.281 150.464 188.609 148.791C186.936 147.119 186.1 145.109 186.1 142.76V125.68C186.1 123.332 186.936 121.321 188.609 119.649C190.281 117.976 192.292 117.14 194.64 117.14H220.26C222.608 117.14 224.619 117.976 226.291 119.649C227.964 121.321 228.8 123.332 228.8 125.68V142.76C228.8 145.109 227.964 147.119 226.291 148.791C224.619 150.464 222.608 151.3 220.26 151.3H194.64ZM194.64 126.214H220.26C221.292 126.214 222.253 126.374 223.142 126.694C224.067 127.014 224.886 127.477 225.597 128.082V125.68C225.597 124.186 225.082 122.922 224.05 121.89C223.018 120.858 221.754 120.343 220.26 120.343H194.64C193.145 120.343 191.882 120.858 190.85 121.89C189.818 122.922 189.303 124.186 189.303 125.68V128.082C190.014 127.477 190.815 127.014 191.704 126.694C192.63 126.374 193.608 126.214 194.64 126.214ZM189.463 133.473L214.922 139.611C215.172 139.682 215.421 139.7 215.67 139.664C215.954 139.593 216.186 139.469 216.364 139.291L224.904 132.138C224.441 131.32 223.801 130.662 222.982 130.164C222.164 129.665 221.256 129.416 220.26 129.416H194.64C193.395 129.416 192.292 129.808 191.331 130.591C190.37 131.338 189.747 132.298 189.463 133.473Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable-night/mouse_keys_click.xml b/res/drawable-night/mouse_keys_click.xml
new file mode 100644
index 00000000000..e5e8d5a486e
--- /dev/null
+++ b/res/drawable-night/mouse_keys_click.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#F1B3E6"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/mouse_keys_directional.xml b/res/drawable-night/mouse_keys_directional.xml
new file mode 100644
index 00000000000..fd49f1e33e8
--- /dev/null
+++ b/res/drawable-night/mouse_keys_directional.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M172.4,18h12v12h-12z"/>
+        <path
+            android:pathData="M181.24,27.41L176.46,22.64V26.69H174.99V20.11H181.56V21.59H177.51L182.29,26.36L181.24,27.41Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M194.63,18h12v12h-12z"/>
+        <path
+            android:pathData="M199.89,28.02V22.81L197.66,25.05L196.61,24L200.63,19.98L204.66,24L203.61,25.05L201.37,22.81V28.02H199.89Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M216.86,18h12v12h-12z"/>
+        <path
+            android:pathData="M220.02,27.41L218.98,26.36L223.75,21.59H219.7V20.11H226.27V26.69H224.8V22.64L220.02,27.41Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.66,14 282.77,14H297C298.1,14 299,14.9 299,16V32C299,33.1 298.1,34 297,34H282.77C281.66,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.3,42 121.2,42.9 121.2,44V60C121.2,61.1 120.3,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M180.79,46h12v12h-12z"/>
+        <path
+            android:pathData="M185.6,52.74L187.84,54.97L186.79,56.03L182.76,52L186.79,47.97L187.84,49.03L185.6,51.26H190.81V52.74H185.6Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M231.59,46h12v12h-12z"/>
+        <path
+            android:pathData="M238.77,52.74H233.56V51.26H238.77L236.54,49.03L237.59,47.97L241.61,52L237.59,56.03L236.54,54.97L238.77,52.74Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M187.67,74h12v12h-12z"/>
+        <path
+            android:pathData="M190.09,83.59V78.51H191.56V81.07L196.64,76L197.67,77.04L192.6,82.11H195.16V83.59H190.09Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.44C229.55,70 230.44,70.9 230.44,72V88C230.44,89.1 229.55,90 228.44,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M213.45,74h12v12h-12z"/>
+        <path
+            android:pathData="M218.71,75.97H220.19V81.19L222.43,78.95L223.48,80L219.45,84.03L215.43,80L216.48,78.95L218.71,81.19V75.97Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F1B3E6"/>
+    <group>
+        <clip-path
+            android:pathData="M239.23,74h12v12h-12z"/>
+        <path
+            android:pathData="M243.84,83.69V82.21H246.4L241.21,77.01L242.24,75.97L247.44,81.18V78.61H248.92V83.69H243.84Z"
+            android:fillColor="#4C1F49"/>
+    </group>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.44C243.55,98 244.44,98.9 244.44,100V116C244.44,117.11 243.55,118 242.44,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/mouse_keys_press_hold.xml b/res/drawable-night/mouse_keys_press_hold.xml
new file mode 100644
index 00000000000..eb8560255ff
--- /dev/null
+++ b/res/drawable-night/mouse_keys_press_hold.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F1B3E6"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/mouse_keys_release.xml b/res/drawable-night/mouse_keys_release.xml
new file mode 100644
index 00000000000..4fb7c4ad26f
--- /dev/null
+++ b/res/drawable-night/mouse_keys_release.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F1B3E6"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/mouse_keys_release2.xml b/res/drawable-night/mouse_keys_release2.xml
new file mode 100644
index 00000000000..e844bc9790c
--- /dev/null
+++ b/res/drawable-night/mouse_keys_release2.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F1B3E6"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/mouse_keys_toggle_scroll.xml b/res/drawable-night/mouse_keys_toggle_scroll.xml
new file mode 100644
index 00000000000..3d6cbf3409a
--- /dev/null
+++ b/res/drawable-night/mouse_keys_toggle_scroll.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#171216"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F1B3E6"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#554151"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#4E444B"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#3A3338"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#3A3338"/>
+</vector>
diff --git a/res/drawable-night/satellite_sos_illustration.xml b/res/drawable-night/satellite_sos_illustration.xml
new file mode 100644
index 00000000000..91c86097ecf
--- /dev/null
+++ b/res/drawable-night/satellite_sos_illustration.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="380dp"
+    android:height="276dp"
+    android:viewportWidth="380"
+    android:viewportHeight="276"
+    tools:ignore="all">
+    <path
+        android:pathData="M353.46,276H25.58C11.5,276 0,264.13 0,249.78V26.22C0,11.78 11.5,0 25.58,0H353.56C367.54,0 379.04,11.78 379.04,26.22V249.96C379.04,264.13 367.54,276 353.46,276Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M28,0L351,0A28,28 0,0 1,379 28L379,248A28,28 0,0 1,351 276L28,276A28,28 0,0 1,0 248L0,28A28,28 0,0 1,28 0z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M354.75,228.66H27.08V230.39H354.75V228.66Z"
+        android:fillColor="#3C4043"/>
+    <path
+        android:pathData="M191.82,54.37C190.76,54.37 189.71,54.38 188.66,54.4L188.63,52.58C189.69,52.56 190.75,52.55 191.82,52.55C192.89,52.55 193.95,52.56 195.02,52.58L194.98,54.4C193.93,54.38 192.87,54.37 191.82,54.37ZM182.37,54.64C180.27,54.76 178.17,54.92 176.09,55.12L175.91,53.3C178.02,53.1 180.13,52.94 182.26,52.81L182.36,54.63L182.37,54.64ZM207.57,55.13C205.49,54.93 203.39,54.77 201.28,54.64L201.38,52.82C203.51,52.94 205.63,53.11 207.74,53.31L207.56,55.13H207.57ZM169.83,55.84C167.74,56.12 165.67,56.44 163.61,56.8L163.3,55C165.38,54.64 167.48,54.31 169.59,54.03L169.83,55.84ZM220.07,56.83C218.01,56.47 215.93,56.14 213.84,55.86L214.09,54.05C216.2,54.34 218.3,54.67 220.39,55.03L220.07,56.83ZM157.43,58.01C155.37,58.45 153.33,58.93 151.3,59.45L150.85,57.68C152.9,57.15 154.97,56.67 157.05,56.22L157.43,58V58.01ZM232.4,59.5C230.37,58.97 228.32,58.49 226.26,58.04L226.65,56.26C228.74,56.71 230.8,57.2 232.86,57.74L232.4,59.51V59.5ZM145.23,61.13C143.21,61.73 141.21,62.37 139.23,63.05L138.64,61.32C140.65,60.64 142.67,59.99 144.71,59.38L145.23,61.13ZM244.49,63.14C242.5,62.46 240.5,61.81 238.48,61.2L239.01,59.45C241.05,60.06 243.08,60.72 245.08,61.41L244.49,63.13V63.14ZM133.31,65.2C131.35,65.96 129.4,66.75 127.48,67.58L126.76,65.9C128.71,65.06 130.67,64.26 132.66,63.5L133.32,65.2H133.31ZM256.25,67.71C254.32,66.87 252.38,66.07 250.41,65.31L251.07,63.61C253.06,64.38 255.02,65.19 256.97,66.04L256.24,67.71H256.25ZM121.75,70.18C119.85,71.09 117.98,72.03 116.12,73L115.27,71.39C117.15,70.4 119.04,69.45 120.96,68.53L121.75,70.18ZM267.62,73.18C265.76,72.2 263.89,71.25 261.99,70.33L262.78,68.69C264.7,69.61 266.6,70.57 268.48,71.57L267.62,73.18ZM110.61,76.04C108.79,77.09 106.99,78.17 105.22,79.29L104.25,77.75C106.05,76.62 107.86,75.52 109.7,74.46L110.61,76.04ZM278.53,79.52C276.76,78.39 274.96,77.3 273.14,76.24L274.06,74.66C275.9,75.73 277.72,76.83 279.51,77.97L278.53,79.51V79.52ZM99.95,82.75C98.22,83.94 96.51,85.16 94.82,86.41L93.73,84.95C95.43,83.68 97.16,82.45 98.91,81.25L99.94,82.76L99.95,82.75ZM288.92,86.68C287.24,85.42 285.53,84.19 283.8,83L284.84,81.5C286.59,82.71 288.32,83.95 290.02,85.22L288.93,86.68H288.92ZM89.84,90.26C88.2,91.58 86.59,92.92 85.01,94.3L83.81,92.92C85.41,91.53 87.04,90.16 88.69,88.83L89.83,90.25L89.84,90.26ZM298.72,94.63C297.14,93.24 295.53,91.89 293.89,90.56L295.04,89.14C296.69,90.48 298.32,91.85 299.92,93.25L298.72,94.62V94.63ZM80.34,98.53C78.81,99.97 77.31,101.44 75.84,102.93L74.54,101.65C76.03,100.14 77.55,98.65 79.09,97.2L80.34,98.53ZM307.89,103.3C306.42,101.8 304.92,100.32 303.39,98.87L304.64,97.55C306.18,99.01 307.7,100.5 309.19,102.02L307.89,103.3ZM71.51,107.5C70.1,109.05 68.71,110.63 67.36,112.24L65.97,111.07C67.34,109.45 68.74,107.85 70.17,106.28L71.52,107.51L71.51,107.5ZM316.36,112.65C315.01,111.04 313.63,109.45 312.21,107.89L313.56,106.67C314.99,108.25 316.39,109.85 317.75,111.48L316.35,112.65H316.36ZM63.39,117.13C62.1,118.78 60.84,120.47 59.62,122.17L58.14,121.11C59.38,119.39 60.65,117.68 61.96,116.01L63.4,117.13H63.39ZM324.09,122.63C322.87,120.92 321.61,119.23 320.32,117.57L321.76,116.45C323.06,118.13 324.33,119.84 325.57,121.57L324.09,122.63ZM56.04,127.36C54.88,129.11 53.76,130.88 52.67,132.68L51.11,131.73C52.21,129.91 53.35,128.12 54.52,126.35L56.04,127.36ZM331.02,133.17C329.93,131.37 328.81,129.59 327.65,127.83L329.17,126.83C330.34,128.61 331.47,130.41 332.57,132.23L331.01,133.17H331.02ZM49.51,138.12C48.49,139.95 47.51,141.81 46.56,143.68L44.93,142.86C45.89,140.96 46.88,139.09 47.91,137.23L49.5,138.11L49.51,138.12ZM337.12,144.21C336.17,142.33 335.19,140.47 334.18,138.63L335.78,137.75C336.81,139.61 337.8,141.49 338.76,143.39L337.13,144.21H337.12ZM43.83,149.36C42.96,151.27 42.12,153.19 41.32,155.14L39.63,154.45C40.44,152.48 41.28,150.54 42.16,148.61L43.82,149.37L43.83,149.36ZM342.35,155.7C341.55,153.75 340.72,151.82 339.85,149.91L341.51,149.15C342.39,151.08 343.23,153.04 344.04,155.01L342.35,155.7ZM39.05,161.01C38.33,162.98 37.65,164.96 37,166.97L35.26,166.41C35.91,164.39 36.6,162.38 37.33,160.39L39.04,161.02L39.05,161.01ZM346.66,167.56C346.02,165.55 345.34,163.56 344.62,161.59L346.33,160.97C347.06,162.96 347.74,164.98 348.39,167.01L346.65,167.57L346.66,167.56ZM35.19,172.99C34.91,174 34.64,175.02 34.37,176.03C34.11,177.04 33.84,178.21 33.56,179.55L31.77,179.18C32.05,177.81 32.33,176.61 32.6,175.57C32.87,174.54 33.14,173.51 33.43,172.49L35.19,172.98V172.99ZM349.28,176.65C349.02,175.63 348.75,174.61 348.46,173.6L350.22,173.11C350.5,174.14 350.78,175.16 351.04,176.2C351.29,177.16 351.55,178.36 351.82,179.77L350.03,180.11C349.77,178.73 349.51,177.56 349.28,176.65ZM32.37,186.71C32.08,188.84 31.81,191.25 31.57,193.94L29.75,193.78C29.99,191.06 30.27,188.63 30.56,186.46L32.37,186.7V186.71ZM352.02,194.33C351.76,191.76 351.47,189.36 351.18,187.19L352.99,186.94C353.29,189.13 353.58,191.55 353.84,194.14L352.02,194.32V194.33ZM31.06,201.21C30.93,203.47 30.83,205.9 30.75,208.5L28.93,208.45C29.01,205.84 29.11,203.4 29.24,201.11L31.06,201.21ZM353.05,208.67C352.94,206.2 352.8,203.8 352.63,201.49L354.45,201.36C354.62,203.68 354.76,206.1 354.87,208.59L353.05,208.67ZM30.61,215.79C30.6,216.98 30.59,218.2 30.59,219.45H28.77C28.77,218.19 28.77,216.97 28.79,215.77L30.61,215.79ZM353.29,219.45C353.29,218.24 353.28,217.04 353.26,215.85L355.08,215.82C355.1,217.02 355.11,218.22 355.11,219.44H353.29V219.45Z"
+        android:fillColor="#3C4043"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M298.47,120.96C315.85,120.96 329.94,106.87 329.94,89.48C329.94,72.09 315.85,58 298.47,58C281.09,58 267,72.09 267,89.48C267,106.87 281.09,120.96 298.47,120.96Z"
+        android:fillColor="#000000"/>
+    <group>
+        <clip-path
+            android:pathData="M322,64H274V112H322V64Z"/>
+        <group>
+            <clip-path
+                android:pathData="M317.2,68.8H278.8V107.2H317.2V68.8Z"/>
+            <path
+                android:pathData="M316.32,88H314.57C314.1,88 313.73,88.37 313.71,88.84C313.29,96.86 306.87,103.4 298.86,103.72C298.39,103.74 298.01,104.1 298.01,104.58V106.12C298.01,106.81 298.42,107.22 298.91,107.19C308.79,106.73 316.74,98.78 317.2,88.9C317.22,88.41 316.81,87.99 316.32,87.99V88Z"
+                android:fillColor="#669DF6"/>
+            <path
+                android:pathData="M309.14,88C309.83,88 310.25,88.42 310.21,88.92C309.76,94.95 304.94,99.77 298.91,100.22C298.41,100.26 297.99,99.84 297.99,99.34V97.59C297.99,97.12 298.36,96.76 298.82,96.72C303,96.33 306.5,93.03 306.74,88.88C306.77,88.4 307.13,88.01 307.61,88.01H309.14V88Z"
+                android:fillColor="#669DF6"/>
+            <path
+                android:pathData="M297.38,92.94L293.53,89.09L291.29,91.33L293.45,93.44C294.84,94.8 294.85,97.03 293.48,98.4L290.95,100.94C290.27,101.62 289.37,101.97 288.48,101.97C287.59,101.97 286.69,101.63 286.01,100.94L279.82,94.74C278.47,93.39 278.46,91.21 279.78,89.85L282.17,87.33C282.85,86.62 283.77,86.27 284.68,86.27C285.59,86.27 286.44,86.6 287.12,87.26L289.42,89.51L291.69,87.25L282.91,78.48C282.57,78.14 282.57,77.59 282.91,77.25L287.23,72.93C287.57,72.59 288.12,72.59 288.46,72.93L297.24,81.7L299.46,79.48L297.28,77.3C295.93,75.95 295.92,73.77 297.24,72.41L299.63,69.89C300.31,69.18 301.23,68.83 302.14,68.83C303.05,68.83 303.9,69.16 304.58,69.82L310.91,76.01C312.3,77.37 312.31,79.6 310.94,80.97L308.41,83.51C307.73,84.19 306.83,84.54 305.94,84.54C305.05,84.54 304.15,84.2 303.47,83.51L301.31,81.34L299.09,83.55L302.94,87.4C303.28,87.74 303.28,88.29 302.94,88.63L298.62,92.95C298.28,93.29 297.73,93.29 297.39,92.95L297.38,92.94ZM303.79,78.84L305.33,80.4C305.67,80.74 306.23,80.75 306.57,80.4L307.85,79.11C308.19,78.77 308.19,78.21 307.85,77.87L306.29,76.35L303.8,78.84H303.79ZM300.38,75.39L301.95,76.98L304.41,74.52L302.77,72.92C302.42,72.58 301.86,72.59 301.53,72.95L300.36,74.19C300.04,74.53 300.04,75.07 300.37,75.4L300.38,75.39ZM286.95,91.97L285.31,90.37C284.96,90.03 284.4,90.04 284.07,90.4L282.9,91.64C282.58,91.98 282.58,92.52 282.91,92.85L284.48,94.44L286.95,91.98V91.97ZM290.38,95.32L288.82,93.8L286.33,96.29L287.87,97.85C288.21,98.19 288.77,98.2 289.11,97.85L290.39,96.56C290.73,96.22 290.73,95.66 290.39,95.32H290.38Z"
+                android:fillColor="#669DF6"/>
+        </group>
+    </group>
+    <path
+        android:pathData="M91.98,229.49H124.82L114.81,215.42H122.02L108.01,195.73L93.59,215.42H100.8L91.99,229.49H91.98Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M308.14,193.9H340.98L330.97,179.83H338.18L324.16,160.14L309.74,179.83H316.95L308.14,193.9Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M63.7,207.59H75.56V229.49H63.7V207.59Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M318.48,194H330.48V229H318.48V194Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M240.65,213.97H252.51V229.48H240.65V213.97Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M274.39,229.49H311.79L300.39,214.43H308.6L292.64,193.44L276.22,214.43H284.43L274.4,229.49H274.39Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M50.93,207.59H88.33L76.93,188.88H85.14L69.18,162.87L52.76,188.88H60.97L50.94,207.59H50.93Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M229.7,213.97H262.53L251.13,198H259.34L246.11,177.47L231.52,198H239.73L229.7,213.97Z"
+        android:strokeWidth="1.82"
+        android:fillColor="#00000000"
+        android:strokeColor="#3C4043"/>
+    <path
+        android:pathData="M216.01,229.18L196.69,229.28C195.34,229.28 194.29,228.22 194.29,226.97V217.35H203.04L217.17,224.18C218.04,224.66 218.61,225.53 218.61,226.58C218.71,227.93 217.55,229.18 216.01,229.18Z"
+        android:fillColor="#34373A"/>
+    <path
+        android:pathData="M197.14,229.18L177.82,229.28C176.47,229.28 175.42,228.22 175.42,226.97L177.65,214.62L186.51,216.34L198.3,224.18C199.17,224.66 199.74,225.53 199.74,226.58C199.84,227.93 198.68,229.18 197.14,229.18Z"
+        android:fillColor="#3C4043"/>
+    <path
+        android:pathData="M194.66,149.74C187.64,149.74 182.06,155.32 181.87,162.24L181.49,173.83L175.4,215.77L190.81,218.01L193.58,201.47V217.74H206.44V162.53C206.44,155.51 201.67,149.74 194.65,149.74H194.66Z"
+        android:fillColor="#669DF6"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M190.82,218.01L197,176.75V171.64"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"/>
+    <path
+        android:pathData="M226.47,149.78C226.83,149.39 226.54,148.77 225.61,148.88C225.79,148.81 227.45,149.03 227.38,147.96C227.33,147.48 226.38,147.51 226.17,147.51C226.3,147.51 227.75,147.45 227.55,146.6C227.43,146.05 226.11,146.08 226.24,146.08C226.8,146.08 227.41,145.18 226.92,144.85C226.32,144.45 222.13,144.61 220.98,144.61C221.31,144.54 221.63,144.48 221.95,144.39C222.45,144.23 222.92,144.13 223.33,143.77C223.65,143.47 223.79,142.95 223.37,142.65C223,142.39 222.56,142.63 222.15,142.67C221.89,142.7 221.63,142.71 221.37,142.72C220.77,142.74 220.16,142.76 219.57,142.84C218.33,142.99 217.04,143.38 216.22,144.35C214.29,146.59 214.93,148.88 217.31,149.77C219.16,150.6 224.87,150.87 226.48,149.77V149.79L226.47,149.78Z"
+        android:fillColor="#915A49"/>
+    <path
+        android:pathData="M193.54,124.87L200.85,127.61L198.74,133.23L189.72,131.47L193.54,124.87Z"
+        android:fillColor="#FCC934"/>
+    <path
+        android:pathData="M205.51,124.13C204.96,123.42 205.17,122.88 205.57,121.43C205.61,121.15 205.7,120.95 205.74,120.67C205.51,118.57 202.45,115.76 199.53,114.11C196.55,112.38 193.29,115.02 191.61,117.59C190.01,120.09 190.48,123.64 190.58,123.94C190.89,124.83 191.35,125.75 191.84,126.38C194.21,129.6 198.31,131.48 201.65,130.41C204.99,129.34 205.48,126.05 205.48,126.05C205.54,126.13 205.68,126.15 205.68,126.15C205.77,126.17 205.87,126.18 205.96,126.19C206.04,126.13 206.18,126.15 206.18,126.15C206.26,126.09 206.34,126.03 206.42,125.97C206.71,125.37 206.13,124.94 205.51,124.14V124.13Z"
+        android:fillColor="#A56A53"/>
+    <path
+        android:pathData="M200.59,120.22C202.26,121.07 204.1,121.17 205.8,120.74C205.98,119.34 205.77,117.6 204.71,115.9C203.99,114.81 202.11,113.36 199.77,112.78L199.63,112.76C199.43,112.66 199.21,112.71 199.01,112.61C198.92,112.6 198.82,112.58 198.73,112.57C198.45,112.53 198.31,112.52 198.09,112.56C197.95,112.54 197.81,112.52 197.73,112.59C197.59,112.57 197.37,112.62 197.23,112.59C197.09,112.57 197.01,112.63 196.87,112.62L196.73,112.6C196.29,112.69 195.85,112.77 195.4,113C195.1,113.1 191.69,115.23 188.59,117.26C186.19,118.73 186.37,122.39 188.98,123.65C190.25,124.31 191.77,124.15 192.87,123.29L194.13,122.31C193.67,122.04 193.34,121.78 193.04,121.39C192.73,121 192.59,120.48 192.44,119.96C192.44,119.46 192.43,118.96 192.64,118.42C192.77,117.94 193.11,117.55 193.52,117.11C193.92,116.8 194.37,116.58 194.89,116.43C195.41,116.28 195.91,116.28 196.45,116.49C196.93,116.62 197.4,116.89 197.78,117.23C198.16,117.56 198.39,118.02 198.62,118.48L198.74,118.64C199.03,119.18 199.74,119.76 200.6,120.23L200.59,120.22Z"
+        android:fillColor="#5B3A1C"/>
+    <path
+        android:pathData="M194.25,144.36L199.92,135.27L200.91,137.19C202.76,139.15 202.96,140.84 211.16,141.24L222.49,141.28L222.47,153.25L211.14,153.21C205.12,153.17 199.34,150.66 195.25,146.14L194.25,144.36Z"
+        android:fillColor="#E5B130"/>
+    <path
+        android:pathData="M234.97,144.16L234.88,143.85C234.7,143.22 234.42,142.96 234.24,143.01L223.19,145.56C223.01,145.61 222.92,145.98 223.1,146.61L223.19,146.92C223.37,147.55 223.65,147.81 223.83,147.75L234.88,145.2C235.06,145.15 235.15,144.78 234.97,144.15V144.16Z"
+        android:fillColor="#BDC1C6"/>
+    <path
+        android:pathData="M229.02,151.7C229.3,151.25 228.9,150.69 228.01,150.98C228.17,150.88 229.85,150.79 229.58,149.74C229.45,149.28 228.51,149.48 228.31,149.52C228.44,149.5 229.86,149.17 229.49,148.36C229.26,147.84 227.98,148.12 228.11,148.1C228.66,147.99 229.09,147 228.55,146.77C227.89,146.49 223.8,147.43 222.67,147.64C222.98,147.51 223.29,147.39 223.58,147.24C224.04,146.99 224.48,146.81 224.81,146.37C225.07,146.02 225.11,145.48 224.64,145.27C224.23,145.09 223.84,145.41 223.45,145.52C223.21,145.6 222.95,145.66 222.69,145.71C222.1,145.84 221.51,145.98 220.94,146.17C219.75,146.55 218.56,147.18 217.93,148.28C216.45,150.84 217.5,152.97 220.01,153.4C221.99,153.87 227.65,153.07 229.02,151.68V151.7Z"
+        android:fillColor="#A56A53"/>
+    <path
+        android:pathData="M195.63,130.71C189.53,128.78 182.34,132.99 180.41,139.09C178.57,144.9 181.64,151.11 187.21,153.4L197.79,156.75C201.03,157.78 204.32,157.98 207.51,157.52L221.95,155.28L220.15,143.39L205.61,145.6C205.61,145.6 205.24,145.67 205.03,145.7C204.1,145.85 203.96,145.93 203.27,145.74C205.89,139.16 201.54,132.58 195.63,130.72V130.71Z"
+        android:fillColor="#FCC934"/>
+    <path
+        android:pathData="M281.74,99.83C282.11,100.24 282.08,100.87 281.67,101.24L281.31,101.57C280.9,101.94 280.27,101.91 279.89,101.5C279.52,101.1 279.55,100.46 279.96,100.09L280.33,99.76C280.74,99.39 281.37,99.42 281.74,99.83ZM277.71,103.49C278.08,103.9 278.05,104.53 277.64,104.91L276.91,105.57C276.5,105.94 275.86,105.91 275.49,105.5C275.12,105.1 275.15,104.46 275.56,104.09L276.29,103.43C276.7,103.05 277.33,103.08 277.71,103.49ZM273.31,107.49C273.68,107.9 273.65,108.53 273.24,108.91L272.51,109.57C272.1,109.94 271.46,109.91 271.09,109.5C270.72,109.1 270.75,108.46 271.16,108.09L271.89,107.43C272.3,107.05 272.93,107.08 273.31,107.49ZM268.91,111.49C269.28,111.9 269.25,112.53 268.84,112.91L268.11,113.57C267.7,113.94 267.07,113.91 266.69,113.5C266.32,113.1 266.35,112.46 266.76,112.09L267.49,111.43C267.9,111.05 268.54,111.08 268.91,111.49ZM264.51,115.49C264.88,115.9 264.85,116.53 264.44,116.91L263.71,117.57C263.3,117.94 262.67,117.91 262.29,117.5C261.92,117.1 261.95,116.46 262.36,116.09L263.09,115.43C263.5,115.05 264.14,115.08 264.51,115.49ZM260.11,119.49C260.48,119.9 260.45,120.53 260.04,120.91L259.31,121.57C258.9,121.94 258.27,121.91 257.89,121.5C257.52,121.1 257.55,120.46 257.96,120.09L258.69,119.43C259.1,119.05 259.73,119.08 260.11,119.49ZM255.71,123.49C256.08,123.9 256.05,124.53 255.64,124.91L254.91,125.57C254.5,125.94 253.87,125.91 253.49,125.5C253.12,125.1 253.15,124.46 253.56,124.09L254.29,123.43C254.7,123.05 255.34,123.08 255.71,123.49ZM251.31,127.49C251.68,127.9 251.65,128.53 251.24,128.91L250.51,129.57C250.1,129.94 249.46,129.91 249.09,129.51C248.72,129.1 248.75,128.46 249.16,128.09L249.89,127.43C250.3,127.05 250.93,127.08 251.31,127.49ZM246.91,131.49C247.28,131.9 247.25,132.53 246.84,132.91L246.11,133.57C245.7,133.94 245.07,133.91 244.69,133.51C244.32,133.1 244.35,132.46 244.76,132.09L245.49,131.43C245.9,131.05 246.54,131.09 246.91,131.49ZM242.51,135.49C242.88,135.9 242.85,136.53 242.44,136.91L241.71,137.57C241.3,137.94 240.66,137.91 240.29,137.51C239.92,137.1 239.95,136.46 240.36,136.09L241.09,135.43C241.5,135.05 242.13,135.09 242.51,135.49ZM238.11,139.49C238.48,139.9 238.45,140.53 238.04,140.91L237.67,141.24C237.26,141.61 236.63,141.58 236.26,141.17C235.89,140.76 235.92,140.13 236.33,139.76L236.69,139.43C237.1,139.05 237.74,139.09 238.11,139.49Z"
+        android:fillColor="#EE675C"
+        android:fillType="evenOdd"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/accessibility_contrast_button_background.xml b/res/drawable/accessibility_contrast_button_background.xml
index 281fcef246a..5f0f5ad09ec 100644
--- a/res/drawable/accessibility_contrast_button_background.xml
+++ b/res/drawable/accessibility_contrast_button_background.xml
@@ -22,9 +22,9 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
+                    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />
                     <stroke
-                        android:color="?androidprv:attr/materialColorSecondary"
+                        android:color="@androidprv:color/materialColorSecondary"
                         android:width="@dimen/contrast_button_stroke_width" />
                     <corners android:radius="@dimen/contrast_button_radius"/>
                 </shape>
@@ -32,7 +32,7 @@
             <item
                 android:width="24dp"
                 android:height="24dp"
-                android:left="57dp"
+                android:start="57dp"
                 android:top="57dp">
                 <vector
                     android:width="24dp"
@@ -41,7 +41,7 @@
                     android:viewportHeight="24"
                     android:tint="?attr/colorControlNormal">
                     <path
-                        android:fillColor="?androidprv:attr/materialColorPrimary"
+                        android:fillColor="@androidprv:color/materialColorPrimary"
                         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c5.52,0 10,-4.48 10,-10S17.52,2 12,2zM10.59,16.6l-4.24,-4.24l1.41,-1.41l2.83,2.83l5.66,-5.66l1.41,1.41L10.59,16.6z"/>
                 </vector>
             </item>
@@ -55,7 +55,7 @@
                   android:left="@dimen/contrast_button_stroke_width"
                   android:right="@dimen/contrast_button_stroke_width">
                 <shape android:shape="rectangle">
-                    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
+                    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />
                     <corners android:radius="@dimen/contrast_button_radius"/>
                 </shape>
             </item>
diff --git a/res/drawable/account_circle_24dp.xml b/res/drawable/account_circle_24dp.xml
new file mode 100644
index 00000000000..50004d94495
--- /dev/null
+++ b/res/drawable/account_circle_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M234,684q51,-39 114,-61.5T480,600q69,0 132,22.5T726,684q35,-41 54.5,-93T800,480q0,-133 -93.5,-226.5T480,160q-133,0 -226.5,93.5T160,480q0,59 19.5,111t54.5,93ZM480,520q-59,0 -99.5,-40.5T340,380q0,-59 40.5,-99.5T480,240q59,0 99.5,40.5T620,380q0,59 -40.5,99.5T480,520ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q53,0 100,-15.5t86,-44.5q-39,-29 -86,-44.5T480,680q-53,0 -100,15.5T294,740q39,29 86,44.5T480,800ZM480,440q26,0 43,-17t17,-43q0,-26 -17,-43t-43,-17q-26,0 -43,17t-17,43q0,26 17,43t43,17ZM480,380ZM480,740Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/res/drawable/broadcast_button_outline.xml b/res/drawable/broadcast_button_outline.xml
index c8658a9fccd..1645ad07a25 100644
--- a/res/drawable/broadcast_button_outline.xml
+++ b/res/drawable/broadcast_button_outline.xml
@@ -29,7 +29,7 @@
             <shape android:shape="rectangle">
                 <corners android:radius="24dp"/>
                 <solid android:color="@android:color/transparent"/>
-                <stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
+                <stroke android:color="@androidprv:color/materialColorPrimaryContainer"
                     android:width="1dp"
                     />
                 <padding android:left="16dp"
diff --git a/res/drawable/bt_header_circle_outline.xml b/res/drawable/bt_header_circle_outline.xml
new file mode 100644
index 00000000000..ef7a5326ba0
--- /dev/null
+++ b/res/drawable/bt_header_circle_outline.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/settingslib_materialColorSurfaceBright"/>
+    <stroke
+        android:width="1dp"
+        android:color="@color/settingslib_materialColorOutlineVariant"/>
+</shape>
diff --git a/res/drawable/cloud_off.xml b/res/drawable/cloud_off.xml
new file mode 100644
index 00000000000..cef728faf00
--- /dev/null
+++ b/res/drawable/cloud_off.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19.400000,10.000000c-0.700000,-3.400000 -3.700000,-6.000000 -7.400000,-6.000000c-1.500000,0.000000 -2.900000,0.400000 -4.000000,1.200000l1.500000,1.500000C10.200000,6.200000 11.100000,6.000000 12.000000,6.000000c3.000000,0.000000 5.500000,2.500000 5.500000,5.500000L17.500000,12.000000L19.000000,12.000000c1.700000,0.000000 3.000000,1.300000 3.000000,3.000000c0.000000,1.100000 -0.600000,2.100000 -1.600000,2.600000l1.500000,1.500000c1.300000,-0.900000 2.100000,-2.400000 2.100000,-4.100000C24.000000,12.400000 21.900000,10.200000 19.400000,10.000000zM3.000000,5.300000L5.800000,8.000000C2.600000,8.200000 0.000000,10.800000 0.000000,14.000000c0.000000,3.300000 2.700000,6.000000 6.000000,6.000000l11.700000,0.000000l2.000000,2.000000l1.300000,-1.300000L4.300000,4.000000L3.000000,5.300000zM7.700000,10.000000l8.000000,8.000000L6.000000,18.000000c-2.200000,0.000000 -4.000000,-1.800000 -4.000000,-4.000000c0.000000,-2.200000 1.800000,-4.000000 4.000000,-4.000000L7.700000,10.000000z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/color_contrast_preview_background.xml b/res/drawable/color_contrast_preview_background.xml
index 51d0ade2d73..cc248be5088 100644
--- a/res/drawable/color_contrast_preview_background.xml
+++ b/res/drawable/color_contrast_preview_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <corners android:radius="20dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_bottom_appbar_background.xml b/res/drawable/color_contrast_preview_bottom_appbar_background.xml
index f3392fb01b5..7ffe3742c56 100644
--- a/res/drawable/color_contrast_preview_bottom_appbar_background.xml
+++ b/res/drawable/color_contrast_preview_bottom_appbar_background.xml
@@ -17,7 +17,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainer"/>
     <corners
         android:bottomLeftRadius="20dp"
         android:bottomRightRadius="20dp"
diff --git a/res/drawable/color_contrast_preview_button_background.xml b/res/drawable/color_contrast_preview_button_background.xml
index 8b920874350..ae263f66950 100644
--- a/res/drawable/color_contrast_preview_button_background.xml
+++ b/res/drawable/color_contrast_preview_button_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorTertiaryContainer"/>
+    <solid android:color="@androidprv:color/materialColorTertiaryContainer"/>
     <corners android:radius="7dp" />
 </shape>
diff --git a/res/drawable/color_contrast_preview_dialog_background.xml b/res/drawable/color_contrast_preview_dialog_background.xml
index f60a271ec3d..61219ac36d7 100644
--- a/res/drawable/color_contrast_preview_dialog_background.xml
+++ b/res/drawable/color_contrast_preview_dialog_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainerLow"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainerLow"/>
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_icon_edit_background.xml b/res/drawable/color_contrast_preview_icon_edit_background.xml
index 61fe4fef8f6..b6b2930f134 100644
--- a/res/drawable/color_contrast_preview_icon_edit_background.xml
+++ b/res/drawable/color_contrast_preview_icon_edit_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorPrimaryContainer"/>
+    <solid android:color="@androidprv:color/materialColorPrimaryContainer"/>
     <corners android:radius="24dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_icon_group_background.xml b/res/drawable/color_contrast_preview_icon_group_background.xml
index 46cd40d9acf..284d9caea88 100644
--- a/res/drawable/color_contrast_preview_icon_group_background.xml
+++ b/res/drawable/color_contrast_preview_icon_group_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="oval" >
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <size android:width="36dp" android:height="36dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_icon_inbox_background.xml b/res/drawable/color_contrast_preview_icon_inbox_background.xml
index 45d82852456..b63d9181cfa 100644
--- a/res/drawable/color_contrast_preview_icon_inbox_background.xml
+++ b/res/drawable/color_contrast_preview_icon_inbox_background.xml
@@ -17,7 +17,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorSecondaryContainer"/>
+    <solid android:color="@androidprv:color/materialColorSecondaryContainer"/>
     <corners android:radius="20dp" />
     <size android:height="30dp" android:width="60dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_icon_star_background.xml b/res/drawable/color_contrast_preview_icon_star_background.xml
index 335ee886f7f..027d3e15904 100644
--- a/res/drawable/color_contrast_preview_icon_star_background.xml
+++ b/res/drawable/color_contrast_preview_icon_star_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="oval" >
-    <solid android:color="?androidprv:attr/materialColorPrimary"/>
+    <solid android:color="@androidprv:color/materialColorPrimary"/>
     <size android:width="36dp" android:height="36dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_contrast_preview_tag_background.xml b/res/drawable/color_contrast_preview_tag_background.xml
index a7b051aa280..91b090cd963 100644
--- a/res/drawable/color_contrast_preview_tag_background.xml
+++ b/res/drawable/color_contrast_preview_tag_background.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/contact_emergency_24dp.xml b/res/drawable/contact_emergency_24dp.xml
new file mode 100644
index 00000000000..0f3badcadc3
--- /dev/null
+++ b/res/drawable/contact_emergency_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M690,480h60v-68l59,34 30,-52 -59,-34 59,-34 -30,-52 -59,34v-68h-60v68l-59,-34 -30,52 59,34 -59,34 30,52 59,-34v68ZM80,840q-33,0 -56.5,-23.5T0,760v-560q0,-33 23.5,-56.5T80,120h800q33,0 56.5,23.5T960,200v560q0,33 -23.5,56.5T880,840L80,840ZM636,760h244v-560L80,200v560h4q42,-75 116,-117.5T360,600q86,0 160,42.5T636,760ZM360,560q50,0 85,-35t35,-85q0,-50 -35,-85t-85,-35q-50,0 -85,35t-35,85q0,50 35,85t85,35ZM182,760h356q-34,-38 -80.5,-59T360,680q-51,0 -97,21t-81,59ZM360,480q-17,0 -28.5,-11.5T320,440q0,-17 11.5,-28.5T360,400q17,0 28.5,11.5T400,440q0,17 -11.5,28.5T360,480ZM480,480Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/res/drawable/display_topology_background.xml b/res/drawable/display_topology_background.xml
new file mode 100644
index 00000000000..bd0b94f6977
--- /dev/null
+++ b/res/drawable/display_topology_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
+        <corners android:radius="?android:attr/dialogCornerRadius" />
+        <solid android:color="@color/display_topology_background_color" />
+    </shape>
+</inset>
diff --git a/res/drawable/double_tap_power_for_wallet.xml b/res/drawable/double_tap_power_for_wallet.xml
new file mode 100644
index 00000000000..606c337a24d
--- /dev/null
+++ b/res/drawable/double_tap_power_for_wallet.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright (C) 2024 The Android Open Source Project
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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:viewportHeight="300"
+    android:viewportWidth="412">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M384.2 300H27.8C12.5 300 0 287.2 0 271.5V28.5C0 12.8 12.5 0 27.8 0H384.3C399.5 0 412 12.8 412 28.5V271.7C412 287.2 399.5 300 384.2 300Z" />
+    <path
+        android:fillColor="#8AB4F8"
+        android:pathData="M272.5 77.2V82.9C277.9 82.9 282.3 87.3 282.3 92.7C282.3 98.1 277.9 102.5 272.5 102.5V108.2C281.1 108.2 288 101.2 288 92.7C288 84.2 281 77.2 272.5 77.2Z" />
+    <path
+        android:fillColor="#669DF6"
+        android:pathData="M282.3 92.7C282.3 87.3 277.9 82.9 272.5 82.9V102.6C277.9 102.6 282.3 98.2 282.3 92.7Z" />
+    <path
+        android:fillColor="#DADCE0"
+        android:pathData="M274.9 97.7V88.2C274.9 86.9 273.8 85.8 272.5 85.8V35.9C272.5 29.3 267.2 24 260.6 24H151.3C144.7 24 139.4 29.3 139.4 35.9V264.1C139.4 270.7 144.7 276 151.3 276H260.7C267.3 276 272.6 270.7 272.6 264.1V147.6C273.9 147.6 275 146.5 275 145.2V121.4C275 120.1 273.9 119 272.6 119V100C273.9 100.1 274.9 99 274.9 97.7ZM270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+    <path
+        android:fillColor="#3C4043"
+        android:pathData="M270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M194.64 151.3C192.292 151.3 190.281 150.464 188.609 148.791C186.936 147.119 186.1 145.109 186.1 142.76V125.68C186.1 123.332 186.936 121.321 188.609 119.649C190.281 117.976 192.292 117.14 194.64 117.14H220.26C222.608 117.14 224.619 117.976 226.291 119.649C227.964 121.321 228.8 123.332 228.8 125.68V142.76C228.8 145.109 227.964 147.119 226.291 148.791C224.619 150.464 222.608 151.3 220.26 151.3H194.64ZM194.64 126.214H220.26C221.292 126.214 222.253 126.374 223.142 126.694C224.067 127.014 224.886 127.477 225.597 128.082V125.68C225.597 124.186 225.082 122.922 224.05 121.89C223.018 120.858 221.754 120.343 220.26 120.343H194.64C193.145 120.343 191.882 120.858 190.85 121.89C189.818 122.922 189.303 124.186 189.303 125.68V128.082C190.014 127.477 190.815 127.014 191.704 126.694C192.63 126.374 193.608 126.214 194.64 126.214ZM189.463 133.473L214.922 139.611C215.172 139.682 215.421 139.7 215.67 139.664C215.954 139.593 216.186 139.469 216.364 139.291L224.904 132.138C224.441 131.32 223.801 130.662 222.982 130.164C222.164 129.665 221.256 129.416 220.26 129.416H194.64C193.395 129.416 192.292 129.808 191.331 130.591C190.37 131.338 189.747 132.298 189.463 133.473Z" />
+</vector>
diff --git a/res/drawable/dream_default_preview_icon.xml b/res/drawable/dream_default_preview_icon.xml
index 8989929fdd7..be3f128a39d 100644
--- a/res/drawable/dream_default_preview_icon.xml
+++ b/res/drawable/dream_default_preview_icon.xml
@@ -20,6 +20,6 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <path android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
+    <path android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
           android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/dream_preview_rounded_bg.xml b/res/drawable/dream_preview_rounded_bg.xml
index 7cae599b6c8..c7034e7fbef 100644
--- a/res/drawable/dream_preview_rounded_bg.xml
+++ b/res/drawable/dream_preview_rounded_bg.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
+    <solid android:color="@androidprv:color/materialColorSurfaceContainer" />
     <corners android:radius="@dimen/dream_item_corner_radius"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/ic_article_24dp.xml b/res/drawable/ic_article_24dp.xml
index 0b38daaf643..bf9d2f7f8c7 100644
--- a/res/drawable/ic_article_24dp.xml
+++ b/res/drawable/ic_article_24dp.xml
@@ -22,6 +22,6 @@
         android:tint="?attr/colorControlNormal"
         android:autoMirrored="true">
 <path
-    android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
+    android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
     android:pathData="M19,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
 </vector>
diff --git a/res/drawable/ic_article_filled_24dp.xml b/res/drawable/ic_article_filled_24dp.xml
index e22d151beb7..9e5f24c0aad 100644
--- a/res/drawable/ic_article_filled_24dp.xml
+++ b/res/drawable/ic_article_filled_24dp.xml
@@ -21,6 +21,6 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?androidprv:attr/materialColorOnTertiaryContainer"
+        android:fillColor="@androidprv:color/materialColorOnTertiaryContainer"
         android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM14,17H7v-2h7V17zM17,13H7v-2h10V13zM17,9H7V7h10V9z"/>
 </vector>
diff --git a/res/drawable/ic_brightness_auto.xml b/res/drawable/ic_brightness_auto.xml
deleted file mode 100644
index 7ace52b5f63..00000000000
--- a/res/drawable/ic_brightness_auto.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2024 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT 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="@dimen/accessibility_icon_foreground_size"
-    android:height="@dimen/accessibility_icon_foreground_size"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M312,640L376,640L408,548L554,548L586,640L648,640L512,280L448,280L312,640ZM426,496L478,346L482,346L534,496L426,496ZM480,932L346,800L160,800L160,614L28,480L160,346L160,160L346,160L480,28L614,160L800,160L800,346L932,480L800,614L800,800L614,800L480,932ZM480,820L580,720L720,720L720,580L820,480L720,380L720,240L580,240L480,140L380,240L240,240L240,380L140,480L240,580L240,720L380,720L480,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
diff --git a/res/drawable/ic_brightness_medium.xml b/res/drawable/ic_brightness_medium.xml
deleted file mode 100644
index 3e778857127..00000000000
--- a/res/drawable/ic_brightness_medium.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2024 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT 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="@dimen/accessibility_icon_foreground_size"
-    android:height="@dimen/accessibility_icon_foreground_size"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M480,932L346,800L160,800L160,614L28,480L160,346L160,160L346,160L480,28L614,160L800,160L800,346L932,480L800,614L800,800L614,800L480,932ZM480,680Q563,680 621.5,621.5Q680,563 680,480Q680,397 621.5,338.5Q563,280 480,280L480,680ZM480,820L580,720L720,720L720,580L820,480L720,380L720,240L580,240L480,140L380,240L240,240L240,380L140,480L240,580L240,720L380,720L480,820ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_chat_bubble_24dp.xml b/res/drawable/ic_chat_bubble_24dp.xml
index c7ad6bf28a1..5b6536b9655 100644
--- a/res/drawable/ic_chat_bubble_24dp.xml
+++ b/res/drawable/ic_chat_bubble_24dp.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:tint="?attr/colorControlNormal">
 <path
-    android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
+    android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
     android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L4,16L4,4h16v12z"/>
 </vector>
diff --git a/res/drawable/ic_edit_24dp.xml b/res/drawable/ic_edit_24dp.xml
index e663b5275c0..fdd82f579d3 100644
--- a/res/drawable/ic_edit_24dp.xml
+++ b/res/drawable/ic_edit_24dp.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:tint="?attr/colorControlNormal">
 <path
-    android:fillColor="?androidprv:attr/materialColorOnPrimaryContainer"
+    android:fillColor="@androidprv:color/materialColorOnPrimaryContainer"
     android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0L3,16.82L3,21h4.18L20.41,7.77c0.79,-0.78 0.79,-2.05 0,-2.83zM6.41,19.06L5,19v-1.36l9.82,-9.82 1.41,1.41 -9.82,9.83z"/>
 </vector>
diff --git a/res/drawable/ic_eyeglasses.xml b/res/drawable/ic_eyeglasses.xml
new file mode 100644
index 00000000000..c35d7b30529
--- /dev/null
+++ b/res/drawable/ic_eyeglasses.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="960"
+        android:viewportHeight="960"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M274,600Q305,600 329.5,582Q354,564 364,535L379,489Q395,441 371,400.5Q347,360 302,360L161,360L180,517Q185,552 211.5,576Q238,600 274,600ZM686,600Q722,600 748.5,576Q775,552 780,517L799,360L659,360Q614,360 590,401Q566,442 582,490L596,535Q606,564 630.5,582Q655,600 686,600ZM274,680Q208,680 158.5,636.5Q109,593 101,527L80,360L40,360L40,280L302,280Q346,280 382.5,301.5Q419,323 440,360L521,360Q542,323 578.5,301.5Q615,280 659,280L920,280L920,360L880,360L859,527Q851,593 801.5,636.5Q752,680 686,680Q629,680 583.5,647.5Q538,615 520,561L505,516Q503,509 501,501.5Q499,494 497,480L463,480Q461,492 459,499.5Q457,507 455,514L440,560Q422,614 376.5,647Q331,680 274,680Z"/>
+</vector>
diff --git a/res/drawable/ic_familiar_face_and_zone.xml b/res/drawable/ic_familiar_face_and_zone.xml
new file mode 100644
index 00000000000..dbef199e896
--- /dev/null
+++ b/res/drawable/ic_familiar_face_and_zone.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="960"
+        android:viewportHeight="960"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,800Q346,800 253,707Q160,614 160,480Q160,346 253,253Q346,160 480,160Q614,160 707,253Q800,346 800,480Q800,614 707,707Q614,800 480,800ZM480,720Q580,720 650,650Q720,580 720,480Q720,463 717.5,446.5Q715,430 710,414Q695,417 680,418.5Q665,420 650,420Q587,420 530,396Q473,372 428,326Q400,383 351,425Q302,467 240,486Q243,584 312.5,652Q382,720 480,720ZM256,394Q300,371 323,340.5Q346,310 368,268Q330,288 301,320.5Q272,353 256,394ZM380,560Q363,560 351.5,548.5Q340,537 340,520Q340,503 351.5,491.5Q363,480 380,480Q397,480 408.5,491.5Q420,503 420,520Q420,537 408.5,548.5Q397,560 380,560ZM650,340Q656,340 662,340Q668,340 674,339Q641,294 590.5,267Q540,240 480,240Q474,240 468,240Q462,240 457,241Q496,286 539.5,313Q583,340 650,340ZM580,560Q563,560 551.5,548.5Q540,537 540,520Q540,503 551.5,491.5Q563,480 580,480Q597,480 608.5,491.5Q620,503 620,520Q620,537 608.5,548.5Q597,560 580,560ZM40,240L40,120Q40,87 63.5,63.5Q87,40 120,40L240,40L240,120L120,120Q120,120 120,120Q120,120 120,120L120,240L40,240ZM240,920L120,920Q87,920 63.5,896.5Q40,873 40,840L40,720L120,720L120,840Q120,840 120,840Q120,840 120,840L240,840L240,920ZM720,920L720,840L840,840Q840,840 840,840Q840,840 840,840L840,720L920,720L920,840Q920,873 896.5,896.5Q873,920 840,920L720,920ZM840,240L840,120Q840,120 840,120Q840,120 840,120L720,120L720,40L840,40Q873,40 896.5,63.5Q920,87 920,120L920,240L840,240ZM457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241Q457,241 457,241ZM368,268Q368,268 368,268Q368,268 368,268Q368,268 368,268Q368,268 368,268Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_group_24dp.xml b/res/drawable/ic_group_24dp.xml
index 92815c2cc2f..1c65fc26a4f 100644
--- a/res/drawable/ic_group_24dp.xml
+++ b/res/drawable/ic_group_24dp.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?androidprv:attr/materialColorSecondary"
+        android:fillColor="@androidprv:color/materialColorSecondary"
         android:pathData="M15,8c0,-1.42 -0.5,-2.73 -1.33,-3.76C14.09,4.1 14.53,4 15,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4c-0.43,0 -0.84,-0.09 -1.23,-0.21c-0.03,-0.01 -0.06,-0.02 -0.1,-0.03C14.5,10.73 15,9.42 15,8zM16.66,13.13C18.03,14.06 19,15.32 19,17v3h4v-3C23,14.82 19.42,13.53 16.66,13.13zM9,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4s-4,-1.79 -4,-4S6.79,4 9,4zM9,13c2.67,0 8,1.34 8,4v3H1v-3C1,14.34 6.33,13 9,13z"/>
 </vector>
diff --git a/res/drawable/ic_inbox_24dp.xml b/res/drawable/ic_inbox_24dp.xml
index 7800ea145ef..18cc3e951ae 100644
--- a/res/drawable/ic_inbox_24dp.xml
+++ b/res/drawable/ic_inbox_24dp.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:tint="?attr/colorControlNormal">
 <path
-    android:fillColor="?androidprv:attr/materialColorOnSecondaryContainer"
+    android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"
     android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v9h-4.18c-0.41,1.16 -1.51,2 -2.82,2s-2.4,-0.84 -2.82,-2H5V5H19z"/>
 </vector>
diff --git a/res/drawable/ic_modifier_keys_reset.xml b/res/drawable/ic_modifier_keys_reset.xml
index 5345c2578f9..9fdbab0b53a 100644
--- a/res/drawable/ic_modifier_keys_reset.xml
+++ b/res/drawable/ic_modifier_keys_reset.xml
@@ -21,7 +21,7 @@
         android:height="24.0dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?androidprv:attr/materialColorPrimary">
+        android:tint="@androidprv:color/materialColorPrimary">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>
diff --git a/res/drawable/ic_privacy_tip.xml b/res/drawable/ic_privacy_tip.xml
new file mode 100644
index 00000000000..8f34eb65f22
--- /dev/null
+++ b/res/drawable/ic_privacy_tip.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="960"
+        android:viewportHeight="960"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L520,680L520,440L440,440L440,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q341,845 250.5,720.5Q160,596 160,444L160,200L480,80L800,200L800,444Q800,596 709.5,720.5Q619,845 480,880ZM480,796Q584,763 652,664Q720,565 720,444L720,255L480,165L240,255L240,444Q240,565 308,664Q376,763 480,796ZM480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/res/drawable/ic_security_privacy_safe.xml b/res/drawable/ic_security_privacy_safe.xml
new file mode 100644
index 00000000000..99aeaef2496
--- /dev/null
+++ b/res/drawable/ic_security_privacy_safe.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="960"
+        android:viewportHeight="960"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M426,608L662,376L606,320L426,496L354,426L298,482L426,608ZM480,880Q473,880 466.5,878.5Q460,877 454,874Q306,798 233,685.5Q160,573 160,412L160,248Q160,222 174.5,201Q189,180 213,172L453,86Q460,84 466.5,82Q473,80 480,80Q489,80 507,86L747,172Q771,180 785.5,200.5Q800,221 800,247L800,412Q800,573 725.5,686Q651,799 505,874Q499,877 493,878.5Q487,880 480,880ZM480,797Q601,731 660.5,638.5Q720,546 720,412L720,247Q720,247 720,247Q720,247 720,247L480,161Q480,161 480,161Q480,161 480,161L240,247Q240,247 240,247Q240,247 240,247L240,412Q240,546 299.5,639Q359,732 480,797ZM480,479Q480,479 480,479Q480,479 480,479L480,479Q480,479 480,479Q480,479 480,479L480,479Q480,479 480,479Q480,479 480,479L480,479Q480,479 480,479Q480,479 480,479L480,479Q480,479 480,479Q480,479 480,479Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_star_24dp.xml b/res/drawable/ic_star_24dp.xml
index 667db94e0fd..449067875c4 100644
--- a/res/drawable/ic_star_24dp.xml
+++ b/res/drawable/ic_star_24dp.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="?androidprv:attr/materialColorOnPrimary"
+        android:fillColor="@androidprv:color/materialColorOnPrimary"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z"/>
 </vector>
diff --git a/res/drawable/ic_suw_brightness_auto.xml b/res/drawable/ic_suw_brightness_auto.xml
index a4221c540d1..93f17f54ac6 100644
--- a/res/drawable/ic_suw_brightness_auto.xml
+++ b/res/drawable/ic_suw_brightness_auto.xml
@@ -21,6 +21,15 @@
             android:height="@dimen/accessibility_icon_size"
             android:color="@color/accessibility_feature_background"/>
     </item>
-    <item android:gravity="center"
-        android:drawable="@drawable/ic_brightness_auto"/>
+    <item android:gravity="center">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="@dimen/accessibility_icon_foreground_size"
+            android:height="@dimen/accessibility_icon_foreground_size"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="@android:color/white"
+                android:pathData="M2 15V13H5V15H2ZM6.35 9.75L4.225 7.625L5.625 6.225L7.75 8.35L6.35 9.75ZM7 18V15H17V18H7ZM11 7V4H13V7H11ZM17.65 9.775L16.25 8.35L18.375 6.225L19.775 7.65L17.65 9.775ZM19 15V13H22V15H19Z"/>
+        </vector>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_suw_brightness_level.xml b/res/drawable/ic_suw_brightness_level.xml
index 57bd1883849..4ed6374fbe2 100644
--- a/res/drawable/ic_suw_brightness_level.xml
+++ b/res/drawable/ic_suw_brightness_level.xml
@@ -21,6 +21,15 @@
             android:height="@dimen/accessibility_icon_size"
             android:color="@color/accessibility_feature_background"/>
     </item>
-    <item android:gravity="center"
-        android:drawable="@drawable/ic_brightness_medium"/>
+    <item android:gravity="center">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="@dimen/accessibility_icon_foreground_size"
+            android:height="@dimen/accessibility_icon_foreground_size"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="@android:color/white"
+                android:pathData="M9 14.5V13H15V14.5H9ZM8 11.5V10H16V11.5H8ZM7 23C6.45 23 5.975 22.8083 5.575 22.425C5.19167 22.025 5 21.55 5 21V3C5 2.45 5.19167 1.98333 5.575 1.6C5.975 1.2 6.45 0.999999 7 0.999999H17C17.55 0.999999 18.0167 1.2 18.4 1.6C18.8 1.98333 19 2.45 19 3V21C19 21.55 18.8 22.025 18.4 22.425C18.0167 22.8083 17.55 23 17 23H7ZM7 20V21H17V20H7ZM7 18H17V6H7V18ZM7 4H17V3H7V4ZM7 4V3V4ZM7 20V21V20Z"/>
+        </vector>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_trigger_with_settings.xml b/res/drawable/ic_zen_mode_trigger_with_settings.xml
new file mode 100644
index 00000000000..7dd81f11b4a
--- /dev/null
+++ b/res/drawable/ic_zen_mode_trigger_with_settings.xml
@@ -0,0 +1,26 @@
+<!--
+Copyright (C) 2024 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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:tint="?android:attr/colorControlNormal"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/modifier_key_bordered.xml b/res/drawable/modifier_key_bordered.xml
index 2931679685d..a3c7cc5d318 100644
--- a/res/drawable/modifier_key_bordered.xml
+++ b/res/drawable/modifier_key_bordered.xml
@@ -25,7 +25,7 @@
                 <solid android:color="@android:color/transparent"/>
                 <stroke
                     android:width="1dp"
-                    android:color="?androidprv:attr/materialColorPrimary"/>
+                    android:color="@androidprv:color/materialColorPrimary"/>
             </shape>
         </item>
     </ripple>
diff --git a/res/drawable/modifier_key_colored.xml b/res/drawable/modifier_key_colored.xml
index 995d7336564..4610738127e 100644
--- a/res/drawable/modifier_key_colored.xml
+++ b/res/drawable/modifier_key_colored.xml
@@ -22,7 +22,7 @@
         <item>
             <shape android:shape="rectangle">
                 <corners android:radius="24dp"/>
-                <solid android:color="?androidprv:attr/materialColorPrimary"/>
+                <solid android:color="@androidprv:color/materialColorPrimary"/>
             </shape>
         </item>
     </ripple>
diff --git a/res/drawable/modifier_key_lisetview_background.xml b/res/drawable/modifier_key_lisetview_background.xml
index 3353cfdaab2..a0d8c03bfac 100644
--- a/res/drawable/modifier_key_lisetview_background.xml
+++ b/res/drawable/modifier_key_lisetview_background.xml
@@ -22,7 +22,7 @@
         <item>
             <shape android:shape="rectangle">
                 <corners android:radius="24dp"/>
-                <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
+                <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
             </shape>
         </item>
     </ripple>
diff --git a/res/drawable/mouse_keys_click.xml b/res/drawable/mouse_keys_click.xml
new file mode 100644
index 00000000000..2dd62389d41
--- /dev/null
+++ b/res/drawable/mouse_keys_click.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/mouse_keys_directional.xml b/res/drawable/mouse_keys_directional.xml
new file mode 100644
index 00000000000..ae79563447e
--- /dev/null
+++ b/res/drawable/mouse_keys_directional.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M172.4,18h12v12h-12z"/>
+        <path
+            android:pathData="M181.24,27.41L176.46,22.64V26.69H174.99V20.11H181.56V21.59H177.51L182.29,26.36L181.24,27.41Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M194.63,18h12v12h-12z"/>
+        <path
+            android:pathData="M199.89,28.02V22.81L197.66,25.05L196.61,24L200.63,19.98L204.66,24L203.61,25.05L201.37,22.81V28.02H199.89Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M216.86,18h12v12h-12z"/>
+        <path
+            android:pathData="M220.02,27.41L218.98,26.36L223.75,21.59H219.7V20.11H226.27V26.69H224.8V22.64L220.02,27.41Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.66,14 282.77,14H297C298.1,14 299,14.9 299,16V32C299,33.1 298.1,34 297,34H282.77C281.66,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.3,42 121.2,42.9 121.2,44V60C121.2,61.1 120.3,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M180.79,46h12v12h-12z"/>
+        <path
+            android:pathData="M185.6,52.74L187.84,54.97L186.79,56.03L182.76,52L186.79,47.97L187.84,49.03L185.6,51.26H190.81V52.74H185.6Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M231.59,46h12v12h-12z"/>
+        <path
+            android:pathData="M238.77,52.74H233.56V51.26H238.77L236.54,49.03L237.59,47.97L241.61,52L237.59,56.03L236.54,54.97L238.77,52.74Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M187.67,74h12v12h-12z"/>
+        <path
+            android:pathData="M190.09,83.59V78.51H191.56V81.07L196.64,76L197.67,77.04L192.6,82.11H195.16V83.59H190.09Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.44C229.55,70 230.44,70.9 230.44,72V88C230.44,89.1 229.55,90 228.44,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M213.45,74h12v12h-12z"/>
+        <path
+            android:pathData="M218.71,75.97H220.19V81.19L222.43,78.95L223.48,80L219.45,84.03L215.43,80L216.48,78.95L218.71,81.19V75.97Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#804D7A"/>
+    <group>
+        <clip-path
+            android:pathData="M239.23,74h12v12h-12z"/>
+        <path
+            android:pathData="M243.84,83.69V82.21H246.4L241.21,77.01L242.24,75.97L247.44,81.18V78.61H248.92V83.69H243.84Z"
+            android:fillColor="#ffffff"/>
+    </group>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.44C243.55,98 244.44,98.9 244.44,100V116C244.44,117.11 243.55,118 242.44,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#F2E5EB"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/mouse_keys_press_hold.xml b/res/drawable/mouse_keys_press_hold.xml
new file mode 100644
index 00000000000..af20290c053
--- /dev/null
+++ b/res/drawable/mouse_keys_press_hold.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/mouse_keys_release.xml b/res/drawable/mouse_keys_release.xml
new file mode 100644
index 00000000000..232d5e721e8
--- /dev/null
+++ b/res/drawable/mouse_keys_release.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/mouse_keys_release2.xml b/res/drawable/mouse_keys_release2.xml
new file mode 100644
index 00000000000..88422cbd80e
--- /dev/null
+++ b/res/drawable/mouse_keys_release2.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/mouse_keys_toggle_scroll.xml b/res/drawable/mouse_keys_toggle_scroll.xml
new file mode 100644
index 00000000000..1a1a55084ac
--- /dev/null
+++ b/res/drawable/mouse_keys_toggle_scroll.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="348dp"
+        android:height="160dp"
+        android:viewportWidth="348"
+        android:viewportHeight="160">
+    <path
+        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
+        android:fillColor="#FFF7F9"/>
+    <path
+        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
+        android:fillColor="#804D7A"/>
+    <path
+        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
+        android:fillColor="#F8DAEE"/>
+    <path
+        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
+        android:fillColor="#D1C2CB"/>
+    <path
+        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
+        android:fillColor="#ECDFE5"/>
+    <path
+        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#ECDFE5"/>
+</vector>
diff --git a/res/drawable/pointer_icon_fill_container_background.xml b/res/drawable/pointer_icon_fill_container_background.xml
index ca930a74540..7f6bf533073 100644
--- a/res/drawable/pointer_icon_fill_container_background.xml
+++ b/res/drawable/pointer_icon_fill_container_background.xml
@@ -18,5 +18,5 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
     <corners android:radius="20dp" />
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
+    <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
 </shape>
diff --git a/res/drawable/preference_background_highlighted.xml b/res/drawable/preference_background_highlighted.xml
new file mode 100644
index 00000000000..1d98ced4cce
--- /dev/null
+++ b/res/drawable/preference_background_highlighted.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:tint="@color/preference_highlight_color">
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/preference_circular_icons_plus_item_background.xml b/res/drawable/preference_circular_icons_plus_item_background.xml
index faaa1fd11fe..e261c76af46 100644
--- a/res/drawable/preference_circular_icons_plus_item_background.xml
+++ b/res/drawable/preference_circular_icons_plus_item_background.xml
@@ -21,5 +21,5 @@
     <size
         android:width="@dimen/zen_mode_circular_icon_diameter"
         android:height="@dimen/zen_mode_circular_icon_diameter" />
-    <solid android:color="?androidprv:attr/materialColorSecondaryContainer" />
+    <solid android:color="@androidprv:color/materialColorSecondaryContainer" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/rounded_bg.xml b/res/drawable/rounded_bg.xml
index ae12af895dc..0e2743de1c3 100644
--- a/res/drawable/rounded_bg.xml
+++ b/res/drawable/rounded_bg.xml
@@ -17,7 +17,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
+    <solid android:color="@androidprv:color/materialColorSurfaceContainer" />
     <corners
         android:bottomLeftRadius="?android:attr/dialogCornerRadius"
         android:topLeftRadius="?android:attr/dialogCornerRadius"
diff --git a/res/drawable/sim_confirm_dialog_btn_outline.xml b/res/drawable/sim_confirm_dialog_btn_outline.xml
index 816174ab26a..070d73a0e54 100644
--- a/res/drawable/sim_confirm_dialog_btn_outline.xml
+++ b/res/drawable/sim_confirm_dialog_btn_outline.xml
@@ -29,7 +29,7 @@
             <shape android:shape="rectangle">
                 <corners android:radius="24dp"/>
                 <solid android:color="@android:color/transparent"/>
-                <stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
+                <stroke android:color="@androidprv:color/materialColorPrimaryContainer"
                         android:width="1dp" />
                 <padding android:left="16dp"
                          android:top="8dp"
diff --git a/res/drawable/trackpad_bordered.xml b/res/drawable/trackpad_bordered.xml
index 940be8ffb30..276b3acd537 100644
--- a/res/drawable/trackpad_bordered.xml
+++ b/res/drawable/trackpad_bordered.xml
@@ -25,7 +25,7 @@
                 <solid android:color="@android:color/transparent"/>
                 <stroke
                     android:width="1dp"
-                    android:color="?androidprv:attr/materialColorPrimary"/>
+                    android:color="@androidprv:color/materialColorPrimary"/>
             </shape>
         </item>
     </ripple>
diff --git a/res/drawable/trackpad_button_done_colored.xml b/res/drawable/trackpad_button_done_colored.xml
index 995d7336564..4610738127e 100644
--- a/res/drawable/trackpad_button_done_colored.xml
+++ b/res/drawable/trackpad_button_done_colored.xml
@@ -22,7 +22,7 @@
         <item>
             <shape android:shape="rectangle">
                 <corners android:radius="24dp"/>
-                <solid android:color="?androidprv:attr/materialColorPrimary"/>
+                <solid android:color="@androidprv:color/materialColorPrimary"/>
             </shape>
         </item>
     </ripple>
diff --git a/res/drawable/user_select_background.xml b/res/drawable/user_select_background.xml
index 7b75160213d..490246c49fe 100644
--- a/res/drawable/user_select_background.xml
+++ b/res/drawable/user_select_background.xml
@@ -19,13 +19,13 @@
     android:color="@color/settingslib_ripple_color">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
+            <solid android:color="@androidprv:color/materialColorSurfaceContainer"/>
             <corners android:radius="20dp"/>
         </shape>
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <stroke android:color="?androidprv:attr/materialColorPrimaryContainer" android:width="1dp"/>
+            <stroke android:color="@androidprv:color/materialColorPrimaryContainer" android:width="1dp"/>
             <corners android:radius="20dp"/>
         </shape>
     </item>
diff --git a/res/drawable/volume_dialog_button_background_outline.xml b/res/drawable/volume_dialog_button_background_outline.xml
index 36ffb93f7a4..f8df90e604b 100644
--- a/res/drawable/volume_dialog_button_background_outline.xml
+++ b/res/drawable/volume_dialog_button_background_outline.xml
@@ -21,7 +21,7 @@
     <shape
            android:shape="rectangle">
         <stroke
-            android:color="?androidprv:attr/materialColorPrimaryContainer"
+            android:color="@androidprv:color/materialColorPrimaryContainer"
             android:width="1dp"/>
         <corners android:radius="24dp"/>
         <padding
diff --git a/res/layout/accessibility_color_contrast_preview.xml b/res/layout/accessibility_color_contrast_preview.xml
index 16035496e3f..988a3dff758 100644
--- a/res/layout/accessibility_color_contrast_preview.xml
+++ b/res/layout/accessibility_color_contrast_preview.xml
@@ -31,7 +31,7 @@
         android:id="@+id/preview_background"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?androidprv:attr/materialColorSurface"
+        android:background="@androidprv:color/materialColorSurface"
         app:layout_constraintBottom_toTopOf="@+id/bottom_appbar_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +96,7 @@
             android:maxLines="1"
             android:paddingEnd="10dp"
             android:text="@string/color_contrast_preview_sender_name"
-            android:textColor="?androidprv:attr/materialColorOnSurface"
+            android:textColor="@androidprv:color/materialColorOnSurface"
             android:textSize="12sp"
             app:layout_constraintEnd_toStartOf="@+id/email_tag"
             app:layout_constraintHorizontal_bias="0"
@@ -116,7 +116,7 @@
             android:maxLines="1"
             android:paddingHorizontal="4dp"
             android:text="@string/color_contrast_preview_email_badge"
-            android:textColor="?androidprv:attr/materialColorOnSurface"
+            android:textColor="@androidprv:color/materialColorOnSurface"
             android:textSize="11sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/sender_name"
@@ -134,7 +134,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/color_contrast_preview_email_send_date"
-        android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+        android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
         android:textSize="11sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="@+id/email_background"
@@ -173,7 +173,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/color_contrast_preview_email_title"
-        android:textColor="?androidprv:attr/materialColorOnSurface"
+        android:textColor="@androidprv:color/materialColorOnSurface"
         android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -189,7 +189,7 @@
         android:maxLines="2"
         android:paddingBottom="8dp"
         android:text="@string/color_contrast_preview_email_body"
-        android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+        android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
         android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -228,7 +228,7 @@
         android:maxLines="1"
         android:paddingEnd="10dp"
         android:text="@string/color_contrast_preview_email_attachment_name"
-        android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"
+        android:textColor="@androidprv:color/materialColorOnTertiaryContainer"
         android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@+id/attachment_background"
diff --git a/res/layout/accessibility_color_contrast_selector.xml b/res/layout/accessibility_color_contrast_selector.xml
index 18b085ac7c0..dde0940477a 100644
--- a/res/layout/accessibility_color_contrast_selector.xml
+++ b/res/layout/accessibility_color_contrast_selector.xml
@@ -72,7 +72,7 @@
                 android:singleLine="true"
                 android:textSize="@dimen/contrast_button_text_size"
                 android:text="@string/contrast_default"
-                android:textColor="?androidprv:attr/materialColorOnSurface"/>
+                android:textColor="@androidprv:color/materialColorOnSurface"/>
         </LinearLayout>
 
         <Space
@@ -107,7 +107,7 @@
                 android:singleLine="true"
                 android:textSize="@dimen/contrast_button_text_size"
                 android:text="@string/contrast_medium"
-                android:textColor="?androidprv:attr/materialColorOnSurface"/>
+                android:textColor="@androidprv:color/materialColorOnSurface"/>
         </LinearLayout>
 
         <Space
@@ -142,7 +142,7 @@
                 android:singleLine="true"
                 android:textSize="@dimen/contrast_button_text_size"
                 android:text="@string/contrast_high"
-                android:textColor="?androidprv:attr/materialColorOnSurface"/>
+                android:textColor="@androidprv:color/materialColorOnSurface"/>
         </LinearLayout>
 
         <Space
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index dd8e43a0f73..252ab47f98b 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -34,7 +34,7 @@
             android:layout_height="72dp"
             android:layout_gravity="center"
             android:antialias="true"
-            android:background="@drawable/circle_outline"
+            android:background="@drawable/bt_header_circle_outline"
             android:padding="8dp"
             android:scaleType="fitCenter" />
 
diff --git a/res/layout/audio_sharing_password_dialog.xml b/res/layout/audio_sharing_password_dialog.xml
index 2bdf505290d..a862f3b5110 100644
--- a/res/layout/audio_sharing_password_dialog.xml
+++ b/res/layout/audio_sharing_password_dialog.xml
@@ -35,6 +35,17 @@
             android:layout_marginEnd="20dp"
             android:minHeight="48dp" />
 
+        <TextView
+            android:id="@+id/edit_alert_message"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:visibility="gone"
+            android:text="@string/audio_streams_main_page_password_dialog_format_alert"
+            android:textColor="?android:attr/colorError" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/biometrics_glif_compact.xml b/res/layout/biometrics_glif_compact.xml
new file mode 100644
index 00000000000..5de78dae724
--- /dev/null
+++ b/res/layout/biometrics_glif_compact.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2024 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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.setupcompat.view.StatusBarBackgroundLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/suc_layout_status"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/biometrics_glif_content" />
+
+</com.google.android.setupcompat.view.StatusBarBackgroundLayout>
diff --git a/res/layout/biometrics_glif_content.xml b/res/layout/biometrics_glif_content.xml
new file mode 100644
index 00000000000..6cddccb4da1
--- /dev/null
+++ b/res/layout/biometrics_glif_content.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2024 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sud_layout_template_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="true"
+    android:clipToPadding="true"
+    android:orientation="vertical">
+
+    <ViewStub
+        android:id="@+id/sud_layout_sticky_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.google.android.setupdesign.view.BottomScrollView
+        android:id="@+id/sud_header_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/biometrics_glif_header_height"
+        android:fillViewport="true"
+        android:orientation="vertical"
+        tools:ignore="UnusedAttribute">
+
+        <include layout="@layout/sud_glif_header" />
+
+    </com.google.android.setupdesign.view.BottomScrollView>
+
+
+    <com.google.android.setupdesign.view.BottomScrollView
+        android:id="@+id/sud_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollIndicators="?attr/sudScrollIndicators"
+        tools:ignore="UnusedAttribute">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ViewStub
+                android:id="@+id/sud_layout_illustration_progress_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/sud_layout_progress_illustration"
+                android:layout="@layout/sud_progress_illustration_layout" />
+
+            <FrameLayout
+                android:id="@+id/sud_layout_content"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+    </com.google.android.setupdesign.view.BottomScrollView>
+
+    <ViewStub
+        android:id="@+id/suc_layout_footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/layout/dialog_custom_body_audio_sharing.xml b/res/layout/dialog_custom_body_audio_sharing.xml
index ba7f6431baa..5e9f2394041 100644
--- a/res/layout/dialog_custom_body_audio_sharing.xml
+++ b/res/layout/dialog_custom_body_audio_sharing.xml
@@ -64,7 +64,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="4dp"
             android:textColor="?androidprv:attr/textColorOnAccent"
-            android:background="@drawable/audio_sharing_rounded_bg_ripple"
+            android:background="@drawable/audio_sharing_rounded_bg_ripple_top"
             android:visibility="gone" />
 
         <Button
@@ -75,7 +75,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="4dp"
             android:textColor="?androidprv:attr/textColorOnAccent"
-            android:background="@drawable/audio_sharing_rounded_bg_ripple"
+            android:background="@drawable/audio_sharing_rounded_bg_ripple_bottom"
             android:visibility="gone" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/dialog_custom_title_audio_sharing.xml b/res/layout/dialog_custom_title_audio_sharing.xml
index 692cbc79a51..db55088cf8f 100644
--- a/res/layout/dialog_custom_title_audio_sharing.xml
+++ b/res/layout/dialog_custom_title_audio_sharing.xml
@@ -23,8 +23,8 @@
 
     <ImageView
         android:id="@+id/title_icon"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_gravity="center"
         android:contentDescription="@null"
         android:tint="?android:attr/colorControlNormal" />
diff --git a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
new file mode 100644
index 00000000000..dfa3c46603d
--- /dev/null
+++ b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/input_setting_keys_dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textSize="20sp"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+    />
+
+    <TextView
+        android:id="@+id/input_setting_keys_dialog_subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="26dp"
+        android:layout_marginTop="8dp"
+        android:textSize="16sp"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorSecondary"
+    />
+
+    <RadioGroup
+        android:id="@+id/input_setting_keys_value_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp">
+
+        <RadioButton
+            android:id="@+id/input_setting_keys_value_200"
+            android:text="@string/input_setting_keys_dialog_option_200"
+            android:paddingStart="12dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:background="@null"/>
+        <RadioButton
+            android:id="@+id/input_setting_keys_value_400"
+            android:text="@string/input_setting_keys_dialog_option_400"
+            android:paddingStart="12dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginTop="12dp"
+            android:background="@null"/>
+        <RadioButton
+            android:id="@+id/input_setting_keys_value_600"
+            android:text="@string/input_setting_keys_dialog_option_600"
+            android:paddingStart="12dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginTop="12dp"
+            android:background="@null"/>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="12dp">
+            <RadioButton
+                android:id="@+id/input_setting_keys_value_custom"
+                android:paddingStart="12dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:background="@null"/>
+            <LinearLayout
+                android:id="@+id/input_setting_keys_custom_value_option"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:paddingEnd="16dp">
+                <TextView
+                    android:id="@+id/input_setting_keys_value_custom_title"
+                    android:text="@string/input_setting_keys_custom_title"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"/>
+                <TextView
+                    android:id="@+id/input_setting_keys_value_custom_value"
+                    android:text="@string/input_setting_keys_custom_value"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone"/>
+                <SeekBar
+                    android:id="@+id/input_setting_keys_value_custom_slider"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="36dp"
+                    android:min="1"
+                    android:max="50"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone"
+                    android:background="@null"/>
+            </LinearLayout>
+        </LinearLayout>
+    </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/display_topology_preference.xml b/res/layout/display_topology_preference.xml
new file mode 100644
index 00000000000..d2e430027a5
--- /dev/null
+++ b/res/layout/display_topology_preference.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:importantForAccessibility="no"
+    android:layout_height="160dp"
+    android:layout_width="match_parent"
+    android:paddingHorizontal="@dimen/display_topology_pane_margin"
+    android:orientation="horizontal">
+    <ImageView
+        android:importantForAccessibility="no"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:src="@drawable/display_topology_background"/>
+    <FrameLayout
+        android:id="@+id/display_topology_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/topology_hint"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="top|center_horizontal"
+        android:paddingTop="10dp"
+        android:text="@string/external_display_topology_hint"/>
+</FrameLayout>
diff --git a/res/layout/face_enroll_introduction_2.xml b/res/layout/face_enroll_introduction_2.xml
new file mode 100644
index 00000000000..cbc14bce15b
--- /dev/null
+++ b/res/layout/face_enroll_introduction_2.xml
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:sudDescriptionText="@string/security_settings_face_enroll_introduction_message">
+
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="vertical">
+
+        <com.google.android.setupdesign.view.RichTextView
+            android:id="@+id/error_text"
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                style="@style/SudContentIllustration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@null"
+                android:src="@drawable/face_enroll_intro_illustration"
+                android:layout_marginBottom="@dimen/face_enroll_intro_illustration_margin_bottom"/>
+
+        </FrameLayout>
+
+        <!-- Contains the extra information text at the bottom -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- Secure and helpful -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/BiometricEnrollIntroTitle"
+                android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_3"/>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_security_privacy_safe"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:background="@drawable/ic_security_privacy_safe"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/footer_message_7"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_face_enroll_introduction_secure_and_helpful_message_1"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_privacy_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:background="@drawable/ic_privacy_tip"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/footer_message_8"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_face_enroll_introduction_secure_and_helpful_message_2"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <!-- Keep in mind -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/BiometricEnrollIntroTitle"
+                android:text="@string/security_settings_face_enroll_introduction_info_title" />
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_glasses"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_eyeglasses"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/info_message_glasses"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_looking"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_face_enroll_introduction_visibility"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/info_message_looking"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:id="@+id/info_row_less_secure"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/icon_less_secure"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_info_outline_24dp"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/info_message_less_secure"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage"
+                    android:text="@string/security_settings_face_enroll_introduction_info_less_secure" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/info_row_require_eyes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/icon_require_eyes"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ic_settings_24dp"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/info_message_require_eyes"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <!-- How it works -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/BiometricEnrollIntroTitle"
+                android:text="@string/security_settings_face_enroll_introduction_how_title" />
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_familiar_face_and_zone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:background="@drawable/ic_familiar_face_and_zone"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/how_message"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <!-- You're in control -->
+            <TextView
+                android:id="@+id/title_in_control"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/BiometricEnrollIntroTitle" />
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_trash_can"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:background="@drawable/ic_trash_can"/>
+                <Space
+                    android:layout_width="16dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/message_in_control"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage"
+                    android:paddingBottom="0dp" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/icon_link"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:background="@drawable/ic_info_outline_24dp"/>
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="4dp"/>
+                <TextView
+                    android:id="@+id/message_learn_more"
+                    android:linksClickable="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/BiometricEnrollIntroMessage"
+                    android:paddingBottom="0dp"
+                    android:text="@string/security_settings_face_enroll_introduction_learn_more_message" />
+            </LinearLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml
index 38cb4910d81..5f106c7e093 100644
--- a/res/layout/homepage_preference.xml
+++ b/res/layout/homepage_preference.xml
@@ -78,7 +78,7 @@
             android:layout_gravity="start"
             android:textAlignment="viewStart"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
             android:maxLines="4"
             android:hyphenationFrequency="normalFast"
             android:lineBreakWordStyle="phrase"
diff --git a/res/layout/homepage_preference_v2.xml b/res/layout/homepage_preference_v2.xml
index ebb7ca9dae6..76eb4032d88 100644
--- a/res/layout/homepage_preference_v2.xml
+++ b/res/layout/homepage_preference_v2.xml
@@ -78,7 +78,7 @@
             android:layout_gravity="start"
             android:textAlignment="viewStart"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
             android:maxLines="4"
             android:hyphenationFrequency="normalFast"
             android:lineBreakWordStyle="phrase"
diff --git a/res/layout/modes_edit_name.xml b/res/layout/modes_edit_name.xml
index 0b086c746ed..78b5b463c39 100644
--- a/res/layout/modes_edit_name.xml
+++ b/res/layout/modes_edit_name.xml
@@ -15,21 +15,38 @@
   limitations under the License.
   -->
 
+<!-- Theme.AppCompat.DayNight is in the parent View so that it's merged with the Theme.Settings
+     theme below. An AppCompat descendant (which Theme.Settings isn't) is necessary to inflate
+     TextInputLayout. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:theme="@style/Theme.AppCompat.DayNight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
-    <EditText
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/edit_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@android:id/edit"
-        android:maxLines="1"
-        android:inputType="text|textCapSentences"
-        android:imeOptions="actionDone"
-        android:selectAllOnFocus="true"
-        android:hint="@string/zen_mode_edit_name_hint" />
+        android:theme="@style/Theme.Settings"
+        style="?attr/textInputFilledStyle"
+        app:endIconMode="clear_text"
+        app:errorEnabled="true"
+        android:hint="@string/zen_mode_edit_name_hint">
 
-</LinearLayout>
\ No newline at end of file
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@android:id/edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:maxLines="1"
+            android:inputType="text|textCapSentences"
+            android:imeOptions="actionDone"
+            android:selectAllOnFocus="true" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>
diff --git a/res/layout/modes_icon_list.xml b/res/layout/modes_icon_list.xml
index f6f220262ff..b189ce661bd 100644
--- a/res/layout/modes_icon_list.xml
+++ b/res/layout/modes_icon_list.xml
@@ -28,8 +28,7 @@
         android:layout_height="wrap_content"
         android:clipToPadding="true"
         android:nestedScrollingEnabled="false"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:padding="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/res/layout/modes_set_schedule_layout.xml b/res/layout/modes_set_schedule_layout.xml
index e90dc7c5420..6b7ebc843fb 100644
--- a/res/layout/modes_set_schedule_layout.xml
+++ b/res/layout/modes_set_schedule_layout.xml
@@ -127,7 +127,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingHorizontal="8dp"
-            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Small" />
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Small"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <!-- right side line divider -->
         <View
diff --git a/res/layout/modifier_key_item.xml b/res/layout/modifier_key_item.xml
index 683f631f14a..00190367569 100644
--- a/res/layout/modifier_key_item.xml
+++ b/res/layout/modifier_key_item.xml
@@ -31,7 +31,7 @@
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"
         android:src="@drawable/ic_check_24dp"
-        android:tint="?androidprv:attr/materialColorPrimary"/>
+        android:tint="@androidprv:color/materialColorPrimary"/>
 
     <TextView
         android:id="@+id/modifier_key_text"
diff --git a/res/layout/modifier_key_picker_dialog.xml b/res/layout/modifier_key_picker_dialog.xml
index fd4d75e6125..b4b05a36bfe 100644
--- a/res/layout/modifier_key_picker_dialog.xml
+++ b/res/layout/modifier_key_picker_dialog.xml
@@ -107,7 +107,7 @@
                 android:paddingVertical="14dp"
                 android:drawablePadding="9dp"
                 style="@style/ModifierKeyButtonDone"
-                android:textColor="?androidprv:attr/materialColorOnPrimary"
+                android:textColor="@androidprv:color/materialColorOnPrimary"
                 android:text="@string/modifier_keys_done"/>
 
         </RelativeLayout>
diff --git a/res/layout/mouse_keys_image_item.xml b/res/layout/mouse_keys_image_item.xml
new file mode 100644
index 00000000000..36b999201f3
--- /dev/null
+++ b/res/layout/mouse_keys_image_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/layout_description"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="16dp"
+          android:layout_marginEnd="20dp"
+          android:layout_marginBottom="20dp"
+          android:textAppearance="?android:attr/textAppearanceListItemSmall"
+          android:drawablePadding="8dp"/>
diff --git a/res/layout/mouse_keys_image_list.xml b/res/layout/mouse_keys_image_list.xml
new file mode 100644
index 00000000000..f111736f085
--- /dev/null
+++ b/res/layout/mouse_keys_image_list.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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.constraintlayout.widget.ConstraintLayout
+    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">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/mouse_keys_image_recycler_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clipToPadding="true"
+        android:nestedScrollingEnabled="false"
+        android:padding="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/notification_ls_minimalism_selector.xml b/res/layout/notification_ls_minimalism_selector.xml
new file mode 100644
index 00000000000..cf34561082d
--- /dev/null
+++ b/res/layout/notification_ls_minimalism_selector.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/notif_ls_style_desc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/settingslib_illustration_padding"
+        android:paddingEnd="48dp"
+        android:paddingStart="48dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:focusable="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:orientation="horizontal">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <LinearLayout
+            android:id="@+id/button_compact"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="@dimen/contrast_button_total_size"
+                android:layout_height="@dimen/contrast_button_total_size"
+                android:background="@drawable/accessibility_contrast_button_background">
+
+                <ImageView
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_contrast_standard"/>
+            </FrameLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/contrast_button_text_spacing"
+                android:gravity="center_horizontal|top"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textSize="@dimen/contrast_button_text_size"
+                android:text="@string/lock_screen_notifs_show_compact"
+                android:textColor="@androidprv:color/materialColorOnSurface"/>
+        </LinearLayout>
+
+        <Space
+            android:layout_width="@dimen/contrast_button_horizontal_spacing"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:id="@+id/button_full"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="@dimen/contrast_button_total_size"
+                android:layout_height="@dimen/contrast_button_total_size"
+                android:background="@drawable/accessibility_contrast_button_background">
+
+                <ImageView
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_contrast_high"/>
+            </FrameLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/contrast_button_text_spacing"
+                android:gravity="center_horizontal|top"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textSize="@dimen/contrast_button_text_size"
+                android:text="@string/lock_screen_notifs_show_full_list"
+                android:textColor="@androidprv:color/materialColorOnSurface"/>
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/pointer_icon_fill_style_layout.xml b/res/layout/pointer_icon_fill_style_layout.xml
index 63c8ebde7db..aba57a6fe6d 100644
--- a/res/layout/pointer_icon_fill_style_layout.xml
+++ b/res/layout/pointer_icon_fill_style_layout.xml
@@ -32,7 +32,7 @@
         android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"
         android:text="@string/pointer_fill_style"
         android:textSize="14sp"
-        android:textColor="?androidprv:attr/materialColorPrimary"
+        android:textColor="@androidprv:color/materialColorPrimary"
         android:textAlignment="viewStart"
         android:fontWeight="500" />
 
diff --git a/res/layout/pointer_icon_stroke_style_layout.xml b/res/layout/pointer_icon_stroke_style_layout.xml
index 01b58b294ce..a68b5967357 100644
--- a/res/layout/pointer_icon_stroke_style_layout.xml
+++ b/res/layout/pointer_icon_stroke_style_layout.xml
@@ -31,7 +31,7 @@
         android:layout_marginTop="@dimen/pointer_stroke_style_padding"
         android:text="@string/pointer_stroke_style"
         android:textSize="14sp"
-        android:textColor="?androidprv:attr/materialColorPrimary"
+        android:textColor="@androidprv:color/materialColorPrimary"
         android:textAlignment="viewStart"
         android:fontWeight="500"
         android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/preference_background.xml b/res/layout/preference_background.xml
index 51718b8fd5c..1c69be4ac7e 100644
--- a/res/layout/preference_background.xml
+++ b/res/layout/preference_background.xml
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceListItem"
-                android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
+                android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:hyphenationFrequency="normalFast"
@@ -78,7 +78,7 @@
                 android:layout_alignStart="@android:id/title"
                 android:layout_alignLeft="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
+                android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
                 android:hyphenationFrequency="normalFast"
                 android:lineBreakWordStyle="phrase"
                 android:maxLines="4"
diff --git a/res/layout/preference_battery_header_text.xml b/res/layout/preference_battery_header_text.xml
new file mode 100644
index 00000000000..616984e9c80
--- /dev/null
+++ b/res/layout/preference_battery_header_text.xml
@@ -0,0 +1,33 @@
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:layout_marginTop="-6dp"
+    android:paddingBottom="16dp">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
+        android:textSize="14sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_category_bluetooth_no_padding.xml b/res/layout/preference_category_bluetooth_no_padding.xml
new file mode 100644
index 00000000000..9868eb4d63f
--- /dev/null
+++ b/res/layout/preference_category_bluetooth_no_padding.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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:gravity="center_vertical"
+              android:orientation="horizontal"
+              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+              android:paddingTop="0dp"
+              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+</LinearLayout>
diff --git a/res/layout/preference_circular_icons_plus_item.xml b/res/layout/preference_circular_icons_plus_item.xml
index 98820863410..352708806b7 100644
--- a/res/layout/preference_circular_icons_plus_item.xml
+++ b/res/layout/preference_circular_icons_plus_item.xml
@@ -26,7 +26,7 @@
     android:padding="4dp"
     android:drawablePadding="0dp"
     android:background="@drawable/preference_circular_icons_plus_item_background"
-    android:textColor="?androidprv:attr/materialColorOnSecondaryContainer"
+    android:textColor="@androidprv:color/materialColorOnSecondaryContainer"
     android:maxLines="1"
     android:autoSizeTextType="uniform"
     android:autoSizeMinTextSize="6sp" />
\ No newline at end of file
diff --git a/res/layout/preference_credential_manager_with_buttons.xml b/res/layout/preference_credential_manager_with_buttons.xml
index 24096f7e0c8..e27bd50f758 100644
--- a/res/layout/preference_credential_manager_with_buttons.xml
+++ b/res/layout/preference_credential_manager_with_buttons.xml
@@ -18,6 +18,7 @@
 <!-- Based off preference_single_target.xml with buttons added below text. -->
 <LinearLayout
     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:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -95,18 +96,29 @@
         android:gravity="center"
         android:orientation="vertical" />
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/credman_button_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"
         android:minWidth="56dp"
-        android:orientation="horizontal"
         android:clipToPadding="false"
         android:paddingTop="4dp"
         android:paddingLeft="76dp"
         android:paddingBottom="4dp">
 
+        <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/button_flow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="change_button, open_button"
+            app:flow_horizontalStyle="spread_inside"
+            app:flow_wrapMode="chain"
+            app:flow_verticalGap = "16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
             <Button
                 android:id="@+id/change_button"
                 android:layout_width="match_parent"
@@ -122,6 +134,6 @@
                 android:visibility="gone"
                 android:text="@string/credman_button_open"/>
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 33772317564..50095f4f188 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -42,6 +42,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:singleLine="true"
+                android:textAlignment="viewStart"
                 android:textAppearance="?android:attr/textAppearanceListItem"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"/>
diff --git a/res/layout/preference_widget_arrow.xml b/res/layout/preference_widget_arrow.xml
index f36f693f012..50edb3c0bd6 100644
--- a/res/layout/preference_widget_arrow.xml
+++ b/res/layout/preference_widget_arrow.xml
@@ -23,5 +23,5 @@
     android:layout_gravity="center_vertical"
     android:contentDescription="@null"
     android:scaleType="center"
-    android:tint="?androidprv:attr/materialColorOnPrimaryContainer"
+    android:tint="@androidprv:color/materialColorOnPrimaryContainer"
     android:src="@drawable/ic_arrow_forward" />
\ No newline at end of file
diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
index 626ecc3b22d..59f92631af1 100644
--- a/res/layout/reset_esim_checkbox.xml
+++ b/res/layout/reset_esim_checkbox.xml
@@ -49,7 +49,7 @@
             android:text="@string/reset_esim_title"/>
 
         <TextView
-            style="?android:attr/textAppearanceSmall"
+            style="@style/TextAppearanceSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/reset_esim_desc"/>
diff --git a/res/layout/sfps_enroll_finish_base.xml b/res/layout/sfps_enroll_finish_base.xml
index 9e65c833f03..768fe346d9f 100644
--- a/res/layout/sfps_enroll_finish_base.xml
+++ b/res/layout/sfps_enroll_finish_base.xml
@@ -35,7 +35,7 @@
                 android:id="@+id/sfps_enrollment_finish_content_layout"
                 android:layout_width="@dimen/sfps_enrollment_finished_icon_max_size"
                 android:layout_height="@dimen/sfps_enrollment_finished_icon_max_size"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/sfps_enroll_finish_icon_margin_top"
                 android:paddingTop="0dp"
                 android:paddingBottom="0dp"
                 android:layout_gravity="center">
diff --git a/res/layout/touchpad_three_finger_tap_layout.xml b/res/layout/touchpad_three_finger_tap_layout.xml
new file mode 100644
index 00000000000..7f96bf3d1ea
--- /dev/null
+++ b/res/layout/touchpad_three_finger_tap_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+
+    <RadioGroup
+        android:id="@+id/button_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="@dimen/radio_group_style_padding"
+        android:layout_marginBottom="@dimen/radio_group_style_padding"
+        tools:ignore="UselessParent">
+        <RadioButton android:id="@+id/middle_click"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/radio_group_style_padding"
+            android:paddingStart="@dimen/radio_group_style_text_padding"
+            android:paddingEnd="@dimen/radio_group_style_text_padding"
+            android:text="@string/three_finger_tap_middle_click"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+        <RadioButton android:id="@+id/launch_gemini"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/radio_group_style_padding"
+            android:paddingStart="@dimen/radio_group_style_text_padding"
+            android:paddingEnd="@dimen/radio_group_style_text_padding"
+            android:text="@string/three_finger_tap_launch_gemini"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+        <RadioButton android:id="@+id/go_home"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/radio_group_style_padding"
+            android:paddingStart="@dimen/radio_group_style_text_padding"
+            android:paddingEnd="@dimen/radio_group_style_text_padding"
+            android:text="@string/three_finger_tap_go_home"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+        <RadioButton android:id="@+id/go_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/radio_group_style_padding"
+            android:paddingStart="@dimen/radio_group_style_text_padding"
+            android:paddingEnd="@dimen/radio_group_style_text_padding"
+            android:text="@string/three_finger_tap_go_back"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+        <RadioButton android:id="@+id/recent_apps"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/radio_group_style_padding"
+            android:paddingStart="@dimen/radio_group_style_text_padding"
+            android:paddingEnd="@dimen/radio_group_style_text_padding"
+            android:text="@string/three_finger_tap_recent_apps"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+    </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/trackpad_gesture_preview.xml b/res/layout/trackpad_gesture_preview.xml
index 15cc743196d..978da06319c 100644
--- a/res/layout/trackpad_gesture_preview.xml
+++ b/res/layout/trackpad_gesture_preview.xml
@@ -82,7 +82,7 @@
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
             style="@style/TrackpadButtonDone"
-            android:textColor="?androidprv:attr/materialColorOnPrimary"
+            android:textColor="@androidprv:color/materialColorOnPrimary"
             android:text="@string/gesture_button_next"/>
 
         <Button
@@ -96,7 +96,7 @@
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
             style="@style/TrackpadButtonDone"
-            android:textColor="?androidprv:attr/materialColorOnPrimary"
+            android:textColor="@androidprv:color/materialColorOnPrimary"
             android:text="@string/gesture_button_done"/>
     </RelativeLayout>
 
diff --git a/res/layout/udfps_enroll_enrolling.xml b/res/layout/udfps_enroll_enrolling.xml
index 366a87c4740..ef8cb71729d 100644
--- a/res/layout/udfps_enroll_enrolling.xml
+++ b/res/layout/udfps_enroll_enrolling.xml
@@ -24,58 +24,66 @@
     android:layout_height="match_parent"
     style="?attr/fingerprint_layout_theme">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/SudContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:clipChildren="false"
-        android:orientation="vertical">
+        android:clipChildren="false">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/illustration_lottie"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            app:layout_constraintTop_toTopOf="@id/udfps_view"
+            android:scaleType="centerInside"
+            android:visibility="gone"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            app:lottie_speed=".85" />
 
         <LinearLayout
+            style="@style/SudContentFrame"
+            android:id="@+id/udfps_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="center|bottom"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:clipChildren="false"
             android:orientation="vertical">
 
-          <FrameLayout
-              android:id="@+id/layout_container"
-              android:layout_width="match_parent"
-              android:layout_height="0dp"
-              android:clipChildren="false"
-              android:clipToPadding="false"
-              android:layout_gravity="center_horizontal|bottom"
-              tools:ignore="Suspicious0dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center|bottom"
+                android:orientation="vertical">
 
-              <!-- Animation res MUST be set in code -->
-              <com.airbnb.lottie.LottieAnimationView
-                  android:id="@+id/illustration_lottie"
-                  android:layout_width="match_parent"
-                  android:layout_height="200dp"
-                  android:layout_marginTop="@dimen/udfps_lottie_translate_y"
-                  android:scaleType="centerInside"
-                  android:visibility="gone"
-                  app:lottie_autoPlay="true"
-                  app:lottie_loop="true"
-                  android:clipChildren="false"
-                  android:clipToPadding="false"
-                  app:lottie_speed=".85" />
+                <FrameLayout
+                    android:id="@+id/layout_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:layout_gravity="center_horizontal|bottom"
+                    tools:ignore="Suspicious0dp">
 
-              <include layout="@layout/udfps_enroll_view" />
+                    <include layout="@layout/udfps_enroll_view" />
 
-          </FrameLayout>
+                </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:accessibilityLiveRegion="polite"
-              android:gravity="center_horizontal"
-              android:visibility="invisible" />
-      </LinearLayout>
-    </LinearLayout>
+                <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:accessibilityLiveRegion="polite"
+                    android:gravity="center_horizontal"
+                    android:visibility="invisible" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.android.settings.biometrics.fingerprint.UdfpsEnrollEnrollingView>
diff --git a/res/layout/udfps_enroll_enrolling_non_scroll.xml b/res/layout/udfps_enroll_enrolling_non_scroll.xml
new file mode 100644
index 00000000000..deb90919a0d
--- /dev/null
+++ b/res/layout/udfps_enroll_enrolling_non_scroll.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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.UdfpsEnrollEnrollingView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="?attr/fingerprint_layout_theme">
+
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center|bottom"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/layout_container"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:layout_gravity="center_horizontal|bottom"
+                tools:ignore="Suspicious0dp">
+
+                <!-- Animation res MUST be set in code -->
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/illustration_lottie"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    android:layout_marginTop="@dimen/udfps_lottie_translate_y"
+                    android:scaleType="centerInside"
+                    android:visibility="gone"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="true"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    app:lottie_speed=".85" />
+
+                <include layout="@layout/udfps_enroll_view" />
+
+            </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:accessibilityLiveRegion="polite"
+                android:gravity="center_horizontal"
+                android:visibility="invisible" />
+        </LinearLayout>
+    </LinearLayout>
+
+</com.android.settings.biometrics.fingerprint.UdfpsEnrollEnrollingView>
diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml
deleted file mode 100644
index 27922c60c84..00000000000
--- a/res/layout/zen_onboarding.xml
+++ /dev/null
@@ -1,138 +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.
--->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/zen_onboarding_choices"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
-        android:paddingTop="18dp">
-
-        <TextView
-            android:id="@+id/header"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
-            android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />
-
-        <LinearLayout
-            android:id="@+id/zen_onboarding_new_setting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/header"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="22dp"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/zen_onboarding_new_setting_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="8dp"
-                android:minHeight="48dp"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/zen_onboarding_new_setting_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/zen_onboarding_new_setting_title"
-                    android:textAppearance="?android:attr/textAppearanceListItem" />
-
-                <TextView
-                    android:id="@+id/zen_onboarding_new_setting_summary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/zen_onboarding_new_setting_summary" />
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/zen_onboarding_current_setting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/zen_onboarding_new_setting"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/zen_onboarding_current_setting_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="8dp"
-                android:minHeight="48dp"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/zen_onboarding_current_setting_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/zen_onboarding_current_setting_title"
-                    android:textAppearance="?android:attr/textAppearanceListItem" />
-
-                <TextView
-                    android:id="@+id/zen_onboarding_current_setting_summary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/zen_onboarding_current_setting_summary" />
-            </LinearLayout>
-        </LinearLayout>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/zen_onboarding_choices"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="10dp">
-
-        <Button
-            android:id="@+id/settings"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/zen_onboarding_settings"
-            android:layout_alignParentStart="true"
-            style="@style/TextAppearance.ZenOnboardingButton"
-            android:onClick="launchSettings" />
-
-        <Button
-            android:id="@+id/ok"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:text="@string/zen_onboarding_ok"
-            style="@style/TextAppearance.ZenOnboardingButton"
-            android:onClick="save" />
-    </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/language_selection_list.xml b/res/menu/language_selection_list.xml
new file mode 100644
index 00000000000..799d3c97c4a
--- /dev/null
+++ b/res/menu/language_selection_list.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/locale_search_menu"
+        android:title="@string/locale_search_menu"
+        android:icon="@drawable/ic_search_24dp"
+        android:showAsAction="always|collapseActionView"
+        android:actionViewClass="android.widget.SearchView" />
+
+</menu>
diff --git a/res/raw/accessibility_shortcut_type_2finger_doubletap.json b/res/raw/accessibility_shortcut_type_2finger_doubletap.json
index 73299d5f313..d9cdb0895b9 100644
--- a/res/raw/accessibility_shortcut_type_2finger_doubletap.json
+++ b/res/raw/accessibility_shortcut_type_2finger_doubletap.json
@@ -2,10 +2,10 @@
   "v": "5.12.1",
   "fr": 60,
   "ip": 0,
-  "op": 120,
+  "op": 86,
   "w": 412,
   "h": 300,
-  "nm": "Accessibility_Two_Tap_v5_export",
+  "nm": "Accessibility_Two_Tap_v5_export 2",
   "ddd": 0,
   "assets": [],
   "layers": [
@@ -21,428 +21,184 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 2.473,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 8.406,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 11.865,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 17.135,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 19.609,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 25.539,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 29,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 59.727,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 62.199,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 68.133,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 71.592,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 76.861,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 79.336,
+              "s": [50]
+            },
+            { "t": 85.265625, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            290.932,
-            149.932,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [290.932, 149.932, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 4.943,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 8.406,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 11.865,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 17.135,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 22.078,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 25.539,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 29,
-              "s": [
-                150,
-                150,
-                100
-              ]
-            }
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 59.727,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 64.67,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 68.133,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 71.592,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 76.861,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 81.805,
+              "s": [100, 100, 100]
+            },
+            { "t": 85.265625, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -461,58 +217,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ],
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ]
+                    [-20.621, 0],
+                    [0, 20.621],
+                    [20.621, 0],
+                    [0, -20.621]
                   ],
                   "o": [
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ],
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ]
+                    [20.621, 0],
+                    [0, -20.621],
+                    [-20.621, 0],
+                    [0, 20.621]
                   ],
                   "v": [
-                    [
-                      0,
-                      37.338
-                    ],
-                    [
-                      37.338,
-                      0
-                    ],
-                    [
-                      0,
-                      -37.338
-                    ],
-                    [
-                      -37.338,
-                      0
-                    ]
+                    [0, 37.338],
+                    [37.338, 0],
+                    [0, -37.338],
+                    [-37.338, 0]
                   ],
                   "c": true
                 },
@@ -526,24 +246,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -556,19 +263,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -577,50 +275,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -651,428 +312,184 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 2.473,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 8.406,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 11.865,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 17.135,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 19.609,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 25.539,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 29,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 59.727,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 62.199,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 68.133,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 71.592,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 76.861,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 79.336,
+              "s": [50]
+            },
+            { "t": 85.265625, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            290.934,
-            149.934,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [290.934, 149.934, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 4.943,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 8.406,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 11.865,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 17.135,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 22.078,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 25.539,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 29,
-              "s": [
-                90,
-                90,
-                100
-              ]
-            }
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 59.727,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 64.67,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 68.133,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 71.592,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 76.861,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 81.805,
+              "s": [100, 100, 100]
+            },
+            { "t": 85.265625, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -1091,58 +508,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ],
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ]
+                    [-31.444, 0],
+                    [0, 31.444],
+                    [31.444, 0],
+                    [0, -31.444]
                   ],
                   "o": [
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ],
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ]
+                    [31.444, 0],
+                    [0, -31.444],
+                    [-31.444, 0],
+                    [0, 31.444]
                   ],
                   "v": [
-                    [
-                      0,
-                      56.934
-                    ],
-                    [
-                      56.934,
-                      0
-                    ],
-                    [
-                      0,
-                      -56.934
-                    ],
-                    [
-                      -56.934,
-                      0
-                    ]
+                    [0, 56.934],
+                    [56.934, 0],
+                    [0, -56.934],
+                    [-56.934, 0]
                   ],
                   "c": true
                 },
@@ -1156,24 +537,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -1186,19 +554,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -1207,50 +566,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -1281,428 +603,184 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0.273,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 2.746,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 8.68,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 12.137,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 17.135,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 19.607,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 25.541,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 29,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 60,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 62.473,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 68.406,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 71.863,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 76.861,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 79.334,
+              "s": [50]
+            },
+            { "t": 85.267578125, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            121.932,
-            149.932,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [121.932, 149.932, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0.273,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 5.219,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 8.68,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 12.137,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 17.135,
-              "s": [
-                150,
-                150,
-                100
-              ]
+              "s": [150, 150, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 22.08,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 25.541,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 29,
-              "s": [
-                150,
-                150,
-                100
-              ]
-            }
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 60,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 64.945,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 68.406,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 71.863,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 76.861,
+              "s": [150, 150, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 81.807,
+              "s": [100, 100, 100]
+            },
+            { "t": 85.267578125, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -1721,58 +799,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ],
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ]
+                    [-20.621, 0],
+                    [0, 20.621],
+                    [20.621, 0],
+                    [0, -20.621]
                   ],
                   "o": [
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ],
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ]
+                    [20.621, 0],
+                    [0, -20.621],
+                    [-20.621, 0],
+                    [0, 20.621]
                   ],
                   "v": [
-                    [
-                      0,
-                      37.338
-                    ],
-                    [
-                      37.338,
-                      0
-                    ],
-                    [
-                      0,
-                      -37.338
-                    ],
-                    [
-                      -37.338,
-                      0
-                    ]
+                    [0, 37.338],
+                    [37.338, 0],
+                    [0, -37.338],
+                    [-37.338, 0]
                   ],
                   "c": true
                 },
@@ -1786,24 +828,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -1816,19 +845,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -1837,50 +857,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -1911,428 +894,184 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0.273,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 2.746,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 8.68,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 12.137,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 17.135,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 19.607,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 25.541,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 29,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 60,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 62.473,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 68.406,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 71.863,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 76.861,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 79.334,
+              "s": [50]
+            },
+            { "t": 85.267578125, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            121.934,
-            149.934,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [121.934, 149.934, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0.273,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 5.219,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 8.68,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 12.137,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 17.135,
-              "s": [
-                90,
-                90,
-                100
-              ]
+              "s": [90, 90, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 22.08,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 25.541,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 29,
-              "s": [
-                90,
-                90,
-                100
-              ]
-            }
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 60,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 64.945,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 68.406,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 71.863,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 76.861,
+              "s": [90, 90, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 81.807,
+              "s": [100, 100, 100]
+            },
+            { "t": 85.267578125, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -2351,58 +1090,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ],
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ]
+                    [-31.444, 0],
+                    [0, 31.444],
+                    [31.444, 0],
+                    [0, -31.444]
                   ],
                   "o": [
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ],
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ]
+                    [31.444, 0],
+                    [0, -31.444],
+                    [-31.444, 0],
+                    [0, 31.444]
                   ],
                   "v": [
-                    [
-                      0,
-                      56.934
-                    ],
-                    [
-                      56.934,
-                      0
-                    ],
-                    [
-                      0,
-                      -56.934
-                    ],
-                    [
-                      -56.934,
-                      0
-                    ]
+                    [0, 56.934],
+                    [56.934, 0],
+                    [0, -56.934],
+                    [-56.934, 0]
                   ],
                   "c": true
                 },
@@ -2416,24 +1119,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -2446,19 +1136,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -2467,50 +1148,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -2537,46 +1181,11 @@
       "cl": "black",
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 100,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206,
-            150,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
-        "s": {
-          "a": 0,
-          "k": [
-            100,
-            100,
-            100
-          ],
-          "ix": 6,
-          "l": 2
-        }
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
       },
       "ao": 0,
       "shapes": [
@@ -2591,106 +1200,34 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.5
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.2,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.5],
+                    [0, 0],
+                    [15.2, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0]
                   ],
                   "o": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.7
-                    ]
+                    [0, 0],
+                    [15.3, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0],
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.7]
                   ],
                   "v": [
-                    [
-                      -178.2,
-                      150
-                    ],
-                    [
-                      178.2,
-                      150
-                    ],
-                    [
-                      206,
-                      121.7
-                    ],
-                    [
-                      206,
-                      -121.5
-                    ],
-                    [
-                      178.3,
-                      -150
-                    ],
-                    [
-                      -178.2,
-                      -150
-                    ],
-                    [
-                      -206,
-                      -121.5
-                    ],
-                    [
-                      -206,
-                      121.5
-                    ]
+                    [-178.2, 150],
+                    [178.2, 150],
+                    [206, 121.7],
+                    [206, -121.5],
+                    [178.3, -150],
+                    [-178.2, -150],
+                    [-206, -121.5],
+                    [-206, 121.5]
                   ],
                   "c": true
                 },
@@ -2702,21 +1239,8 @@
             },
             {
               "ty": "fl",
-              "c": {
-                "a": 0,
-                "k": [
-                  0,
-                  0,
-                  0,
-                  1
-                ],
-                "ix": 4
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -2725,50 +1249,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -2789,16 +1276,8 @@
     }
   ],
   "markers": [
-    {
-      "tm": 119,
-      "cm": "2",
-      "dr": 0
-    },
-    {
-      "tm": 240,
-      "cm": "1",
-      "dr": 0
-    }
+    { "tm": 119, "cm": "2", "dr": 0 },
+    { "tm": 240, "cm": "1", "dr": 0 }
   ],
   "props": {}
-}
\ No newline at end of file
+}
diff --git a/res/raw/accessibility_shortcut_type_fab.json b/res/raw/accessibility_shortcut_type_fab.json
index 6029d918cf1..8623ac0c852 100644
--- a/res/raw/accessibility_shortcut_type_fab.json
+++ b/res/raw/accessibility_shortcut_type_fab.json
@@ -2,10 +2,10 @@
   "v": "5.12.1",
   "fr": 60,
   "ip": 0,
-  "op": 181,
+  "op": 330,
   "w": 412,
   "h": 300,
-  "nm": "Accessibility_Shortcut_export",
+  "nm": "Accessibility_Shortcut_v2_export 2",
   "ddd": 0,
   "assets": [],
   "layers": [
@@ -16,342 +16,175 @@
       "nm": "Null 1",
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 0,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
+        "o": { "a": 0, "k": 0, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
         "p": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": 0.8,
-                "y": 0.15
-              },
-              "o": {
-                "x": 0.3,
-                "y": 0
-              },
+              "i": { "x": 0.8, "y": 0.15 },
+              "o": { "x": 0.3, "y": 0 },
               "t": 30,
-              "s": [
-                412,
-                154,
-                0
-              ],
-              "to": [
-                0,
-                0.609,
-                0
-              ],
-              "ti": [
-                0,
-                0,
-                0
-              ]
+              "s": [412, 154, 0],
+              "to": [0, 0.609, 0],
+              "ti": [0, 0, 0]
             },
             {
-              "i": {
-                "x": 0.1,
-                "y": 1
-              },
-              "o": {
-                "x": 0.05,
-                "y": 0.7
-              },
+              "i": { "x": 0.1, "y": 1 },
+              "o": { "x": 0.05, "y": 0.7 },
               "t": 35,
-              "s": [
-                412,
-                178.4,
-                0
-              ],
-              "to": [
-                0,
-                0,
-                0
-              ],
-              "ti": [
-                0,
-                -5.757,
-                0
-              ]
+              "s": [412, 178.4, 0],
+              "to": [0, 0, 0],
+              "ti": [0, -5.757, 0]
             },
             {
-              "i": {
-                "x": 0.833,
-                "y": 0.833
-              },
-              "o": {
-                "x": 0.167,
-                "y": 0.167
-              },
+              "i": { "x": 0.833, "y": 0.833 },
+              "o": { "x": 0.167, "y": 0.167 },
               "t": 60,
-              "s": [
-                412,
-                215,
-                0
-              ],
-              "to": [
-                0,
-                0,
-                0
-              ],
-              "ti": [
-                0,
-                0,
-                0
-              ]
+              "s": [412, 215, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
             },
             {
-              "i": {
-                "x": 0.8,
-                "y": 0.15
-              },
-              "o": {
-                "x": 0.3,
-                "y": 0
-              },
+              "i": { "x": 0.8, "y": 0.15 },
+              "o": { "x": 0.3, "y": 0 },
               "t": 120,
-              "s": [
-                412,
-                215,
-                0
-              ],
-              "to": [
-                0,
-                -0.609,
-                0
-              ],
-              "ti": [
-                0,
-                0,
-                0
-              ]
+              "s": [412, 215, 0],
+              "to": [0, -0.609, 0],
+              "ti": [0, 0, 0]
             },
             {
-              "i": {
-                "x": 0.1,
-                "y": 1
-              },
-              "o": {
-                "x": 0.05,
-                "y": 0.7
-              },
+              "i": { "x": 0.1, "y": 1 },
+              "o": { "x": 0.05, "y": 0.7 },
               "t": 125,
-              "s": [
-                412,
-                190.6,
-                0
-              ],
-              "to": [
-                0,
-                0,
-                0
-              ],
-              "ti": [
-                0,
-                5.757,
-                0
-              ]
+              "s": [412, 190.6, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 5.757, 0]
             },
             {
+              "i": { "x": 0.99, "y": 0.99 },
+              "o": { "x": 0.01, "y": 0.01 },
               "t": 150,
-              "s": [
-                412,
-                154,
-                0
-              ]
-            }
+              "s": [412, 154, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.8, "y": 0.15 },
+              "o": { "x": 0.3, "y": 0 },
+              "t": 210,
+              "s": [412, 154, 0],
+              "to": [0, 0.203, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.1, "y": 1 },
+              "o": { "x": 0.05, "y": 0.7 },
+              "t": 215,
+              "s": [412, 178.4, 0],
+              "to": [0, 0, 0],
+              "ti": [0, -0.588, 0]
+            },
+            {
+              "i": { "x": 0.833, "y": 0.833 },
+              "o": { "x": 0.167, "y": 0.167 },
+              "t": 240,
+              "s": [412, 215, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.8, "y": 0.15 },
+              "o": { "x": 0.3, "y": 0 },
+              "t": 300,
+              "s": [412, 215, 0],
+              "to": [0, -0.609, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.1, "y": 1 },
+              "o": { "x": 0.05, "y": 0.7 },
+              "t": 305,
+              "s": [412, 190.6, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 5.757, 0]
+            },
+            { "t": 330, "s": [412, 154, 0] }
           ],
           "ix": 2,
           "l": 2
         },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.8,
-                  0.8,
-                  0.8
-                ],
-                "y": [
-                  0.15,
-                  0.15,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.3,
-                  0.3,
-                  0.3
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+              "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
               "t": 30,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.1,
-                  0.1,
-                  0.1
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.05,
-                  0.05,
-                  0.05
-                ],
-                "y": [
-                  0.7,
-                  0.7,
-                  0
-                ]
-              },
+              "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+              "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
               "t": 35,
-              "s": [
-                79.2,
-                79.2,
-                100
-              ]
+              "s": [79.2, 79.2, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 60,
-              "s": [
-                48,
-                48,
-                100
-              ]
+              "s": [48, 48, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.8,
-                  0.8,
-                  0.8
-                ],
-                "y": [
-                  0.15,
-                  0.15,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.3,
-                  0.3,
-                  0.3
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+              "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
               "t": 120,
-              "s": [
-                48,
-                48,
-                100
-              ]
+              "s": [48, 48, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.1,
-                  0.1,
-                  0.1
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.05,
-                  0.05,
-                  0.05
-                ],
-                "y": [
-                  0.7,
-                  0.7,
-                  0
-                ]
-              },
+              "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+              "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
               "t": 125,
-              "s": [
-                68.8,
-                68.8,
-                100
-              ]
+              "s": [68.8, 68.8, 100]
             },
             {
+              "i": { "x": [0.99, 0.99, 0.99], "y": [1, 1, 1] },
+              "o": { "x": [0.01, 0.01, 0.01], "y": [0, 0, 0] },
               "t": 150,
-              "s": [
-                100,
-                100,
-                100
-              ]
-            }
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+              "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
+              "t": 210,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+              "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
+              "t": 215,
+              "s": [79.2, 79.2, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 240,
+              "s": [48, 48, 100]
+            },
+            {
+              "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+              "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
+              "t": 300,
+              "s": [48, 48, 100]
+            },
+            {
+              "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+              "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
+              "t": 305,
+              "s": [68.8, 68.8, 100]
+            },
+            { "t": 330, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -372,46 +205,11 @@
       "parent": 3,
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 100,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            -3,
-            -1,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
-        "s": {
-          "a": 0,
-          "k": [
-            100,
-            100,
-            100
-          ],
-          "ix": 6,
-          "l": 2
-        }
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [-3, -1, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
       },
       "ao": 0,
       "shapes": [
@@ -426,130 +224,40 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -12.194,
-                      8.13
-                    ],
-                    [
-                      -14.642,
-                      -0.049
-                    ],
-                    [
-                      -13.858,
-                      -13.91
-                    ],
-                    [
-                      0,
-                      -19.64
-                    ],
-                    [
-                      8.129,
-                      -12.146
-                    ],
-                    [
-                      13.516,
-                      -5.632
-                    ],
-                    [
-                      14.348,
-                      2.841
-                    ],
-                    [
-                      10.333,
-                      10.334
-                    ],
-                    [
-                      2.889,
-                      14.35
-                    ],
-                    [
-                      -5.583,
-                      13.518
-                    ]
+                    [-12.194, 8.13],
+                    [-14.642, -0.049],
+                    [-13.858, -13.91],
+                    [0, -19.64],
+                    [8.129, -12.146],
+                    [13.516, -5.632],
+                    [14.348, 2.841],
+                    [10.333, 10.334],
+                    [2.889, 14.35],
+                    [-5.583, 13.518]
                   ],
                   "o": [
-                    [
-                      12.194,
-                      -8.13
-                    ],
-                    [
-                      19.637,
-                      0
-                    ],
-                    [
-                      13.858,
-                      13.861
-                    ],
-                    [
-                      0,
-                      14.595
-                    ],
-                    [
-                      -8.129,
-                      12.195
-                    ],
-                    [
-                      -13.516,
-                      5.583
-                    ],
-                    [
-                      -14.348,
-                      -2.89
-                    ],
-                    [
-                      -10.333,
-                      -10.383
-                    ],
-                    [
-                      -2.889,
-                      -14.35
-                    ],
-                    [
-                      5.583,
-                      -13.518
-                    ]
+                    [12.194, -8.13],
+                    [19.637, 0],
+                    [13.858, 13.861],
+                    [0, 14.595],
+                    [-8.129, 12.195],
+                    [-13.516, 5.583],
+                    [-14.348, -2.89],
+                    [-10.333, -10.383],
+                    [-2.889, -14.35],
+                    [5.583, -13.518]
                   ],
                   "v": [
-                    [
-                      -41.079,
-                      -61.559
-                    ],
-                    [
-                      0.055,
-                      -74
-                    ],
-                    [
-                      52.355,
-                      -52.303
-                    ],
-                    [
-                      74,
-                      0.005
-                    ],
-                    [
-                      61.513,
-                      41.097
-                    ],
-                    [
-                      28.311,
-                      68.377
-                    ],
-                    [
-                      -14.44,
-                      72.589
-                    ],
-                    [
-                      -52.343,
-                      52.313
-                    ],
-                    [
-                      -72.567,
-                      14.404
-                    ],
-                    [
-                      -68.356,
-                      -28.353
-                    ]
+                    [-41.079, -61.559],
+                    [0.055, -74],
+                    [52.355, -52.303],
+                    [74, 0.005],
+                    [61.513, 41.097],
+                    [28.311, 68.377],
+                    [-14.44, 72.589],
+                    [-52.343, 52.313],
+                    [-72.567, 14.404],
+                    [-68.356, -28.353]
                   ],
                   "c": true
                 },
@@ -567,154 +275,46 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      1.322,
-                      1.469
-                    ],
-                    [
-                      1.959,
-                      0.147
-                    ],
-                    [
-                      1.028,
-                      -0.343
-                    ],
-                    [
-                      0.784,
-                      -0.735
-                    ],
-                    [
-                      0.441,
-                      -0.98
-                    ],
-                    [
-                      0,
-                      -1.077
-                    ],
-                    [
-                      -0.441,
-                      -0.98
-                    ],
-                    [
-                      -0.784,
-                      -0.735
-                    ],
-                    [
-                      -1.028,
-                      -0.343
-                    ],
-                    [
-                      -1.077,
-                      0.049
-                    ],
-                    [
-                      -1.322,
-                      1.42
-                    ],
-                    [
-                      0,
-                      1.959
-                    ]
+                    [1.322, 1.469],
+                    [1.959, 0.147],
+                    [1.028, -0.343],
+                    [0.784, -0.735],
+                    [0.441, -0.98],
+                    [0, -1.077],
+                    [-0.441, -0.98],
+                    [-0.784, -0.735],
+                    [-1.028, -0.343],
+                    [-1.077, 0.049],
+                    [-1.322, 1.42],
+                    [0, 1.959]
                   ],
                   "o": [
-                    [
-                      -1.322,
-                      -1.42
-                    ],
-                    [
-                      -1.077,
-                      -0.098
-                    ],
-                    [
-                      -1.028,
-                      0.343
-                    ],
-                    [
-                      -0.784,
-                      0.735
-                    ],
-                    [
-                      -0.392,
-                      0.98
-                    ],
-                    [
-                      0,
-                      1.077
-                    ],
-                    [
-                      0.441,
-                      0.98
-                    ],
-                    [
-                      0.784,
-                      0.735
-                    ],
-                    [
-                      1.028,
-                      0.392
-                    ],
-                    [
-                      1.959,
-                      -0.196
-                    ],
-                    [
-                      1.322,
-                      -1.42
-                    ],
-                    [
-                      0,
-                      -1.959
-                    ]
+                    [-1.322, -1.42],
+                    [-1.077, -0.098],
+                    [-1.028, 0.343],
+                    [-0.784, 0.735],
+                    [-0.392, 0.98],
+                    [0, 1.077],
+                    [0.441, 0.98],
+                    [0.784, 0.735],
+                    [1.028, 0.392],
+                    [1.959, -0.196],
+                    [1.322, -1.42],
+                    [0, -1.959]
                   ],
                   "v": [
-                    [
-                      5.148,
-                      -35.895
-                    ],
-                    [
-                      0.055,
-                      -38.344
-                    ],
-                    [
-                      -3.128,
-                      -37.952
-                    ],
-                    [
-                      -5.87,
-                      -36.336
-                    ],
-                    [
-                      -7.731,
-                      -33.741
-                    ],
-                    [
-                      -8.367,
-                      -30.605
-                    ],
-                    [
-                      -7.731,
-                      -27.471
-                    ],
-                    [
-                      -5.87,
-                      -24.875
-                    ],
-                    [
-                      -3.128,
-                      -23.259
-                    ],
-                    [
-                      0.055,
-                      -22.819
-                    ],
-                    [
-                      5.148,
-                      -25.317
-                    ],
-                    [
-                      7.205,
-                      -30.605
-                    ]
+                    [5.148, -35.895],
+                    [0.055, -38.344],
+                    [-3.128, -37.952],
+                    [-5.87, -36.336],
+                    [-7.731, -33.741],
+                    [-8.367, -30.605],
+                    [-7.731, -27.471],
+                    [-5.87, -24.875],
+                    [-3.128, -23.259],
+                    [0.055, -22.819],
+                    [5.148, -25.317],
+                    [7.205, -30.605]
                   ],
                   "c": true
                 },
@@ -732,166 +332,49 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -7.688,
-                      1.959
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      21.645,
-                      5.143
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -7.835,
-                      -0.637
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [-7.688, 1.959],
+                    [0, 0],
+                    [21.645, 5.143],
+                    [0, 0],
+                    [-7.835, -0.637],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0]
                   ],
                   "o": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      7.933,
-                      -0.588
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -21.645,
-                      5.143
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      7.639,
-                      1.959
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [0, 0],
+                    [0, 0],
+                    [7.933, -0.588],
+                    [0, 0],
+                    [-21.645, 5.143],
+                    [0, 0],
+                    [7.639, 1.959],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0],
+                    [0, 0]
                   ],
                   "v": [
-                    [
-                      11.661,
-                      39.187
-                    ],
-                    [
-                      11.661,
-                      -11.211
-                    ],
-                    [
-                      11.465,
-                      -11.211
-                    ],
-                    [
-                      34.922,
-                      -15.08
-                    ],
-                    [
-                      33.012,
-                      -22.819
-                    ],
-                    [
-                      -32.901,
-                      -22.819
-                    ],
-                    [
-                      -34.86,
-                      -15.08
-                    ],
-                    [
-                      -11.6,
-                      -11.211
-                    ],
-                    [
-                      -11.6,
-                      39.138
-                    ],
-                    [
-                      -3.862,
-                      39.138
-                    ],
-                    [
-                      -3.862,
-                      15.874
-                    ],
-                    [
-                      3.924,
-                      15.874
-                    ],
-                    [
-                      3.924,
-                      39.187
-                    ]
+                    [11.661, 39.187],
+                    [11.661, -11.211],
+                    [11.465, -11.211],
+                    [34.922, -15.08],
+                    [33.012, -22.819],
+                    [-32.901, -22.819],
+                    [-34.86, -15.08],
+                    [-11.6, -11.211],
+                    [-11.6, 39.138],
+                    [-3.862, 39.138],
+                    [-3.862, 15.874],
+                    [3.924, 15.874],
+                    [3.924, 39.187]
                   ],
                   "c": true
                 },
@@ -905,19 +388,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.909803921569,
-                  0.917647058824,
-                  0.929411764706,
-                  1
-                ],
+                "k": [0.909803921569, 0.917647058824, 0.929411764706, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -926,50 +400,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -997,46 +434,11 @@
       "parent": 1,
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 100,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            98,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
-        "s": {
-          "a": 0,
-          "k": [
-            100,
-            100,
-            100
-          ],
-          "ix": 6,
-          "l": 2
-        }
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [0, 0, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [98, 0, 0], "ix": 1, "l": 2 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
       },
       "ao": 0,
       "shapes": [
@@ -1051,94 +453,31 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      17.884,
-                      17.997
-                    ],
-                    [
-                      0,
-                      25.479
-                    ],
-                    [
-                      -17.884,
-                      17.997
-                    ],
-                    [
-                      -25.32,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [0, 0],
+                    [0, 0],
+                    [17.884, 17.997],
+                    [0, 25.479],
+                    [-17.884, 17.997],
+                    [-25.32, 0],
+                    [0, 0]
                   ],
                   "o": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -25.32,
-                      0
-                    ],
-                    [
-                      -17.884,
-                      -17.997
-                    ],
-                    [
-                      0,
-                      -25.479
-                    ],
-                    [
-                      17.884,
-                      -18.046
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [0, 0],
+                    [-25.32, 0],
+                    [-17.884, -17.997],
+                    [0, -25.479],
+                    [17.884, -18.046],
+                    [0, 0],
+                    [0, 0]
                   ],
                   "v": [
-                    [
-                      98,
-                      96
-                    ],
-                    [
-                      -2.6,
-                      96
-                    ],
-                    [
-                      -70.056,
-                      67.88
-                    ],
-                    [
-                      -98,
-                      0.001
-                    ],
-                    [
-                      -70.056,
-                      -67.88
-                    ],
-                    [
-                      -2.6,
-                      -96
-                    ],
-                    [
-                      98,
-                      -96
-                    ]
+                    [98, 96],
+                    [-2.6, 96],
+                    [-70.056, 67.88],
+                    [-98, 0.001],
+                    [-70.056, -67.88],
+                    [-2.6, -96],
+                    [98, -96]
                   ],
                   "c": false
                 },
@@ -1152,24 +491,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.909803921569,
-                  0.917647058824,
-                  0.929411764706,
-                  1
-                ],
+                "k": [0.909803921569, 0.917647058824, 0.929411764706, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 4,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 4, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -1180,50 +506,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -1250,46 +539,11 @@
       "cl": "black",
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 100,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206,
-            150,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
-        "s": {
-          "a": 0,
-          "k": [
-            100,
-            100,
-            100
-          ],
-          "ix": 6,
-          "l": 2
-        }
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
       },
       "ao": 0,
       "shapes": [
@@ -1304,106 +558,34 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.5
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.2,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.5],
+                    [0, 0],
+                    [15.2, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0]
                   ],
                   "o": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.7
-                    ]
+                    [0, 0],
+                    [15.3, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0],
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.7]
                   ],
                   "v": [
-                    [
-                      -178.2,
-                      150
-                    ],
-                    [
-                      178.2,
-                      150
-                    ],
-                    [
-                      206,
-                      121.7
-                    ],
-                    [
-                      206,
-                      -121.5
-                    ],
-                    [
-                      178.3,
-                      -150
-                    ],
-                    [
-                      -178.2,
-                      -150
-                    ],
-                    [
-                      -206,
-                      -121.5
-                    ],
-                    [
-                      -206,
-                      121.5
-                    ]
+                    [-178.2, 150],
+                    [178.2, 150],
+                    [206, 121.7],
+                    [206, -121.5],
+                    [178.3, -150],
+                    [-178.2, -150],
+                    [-206, -121.5],
+                    [-206, 121.5]
                   ],
                   "c": true
                 },
@@ -1415,21 +597,8 @@
             },
             {
               "ty": "fl",
-              "c": {
-                "a": 0,
-                "k": [
-                  0,
-                  0,
-                  0,
-                  1
-                ],
-                "ix": 4
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -1438,50 +607,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -1503,4 +635,4 @@
   ],
   "markers": [],
   "props": {}
-}
\ No newline at end of file
+}
diff --git a/res/raw/accessibility_shortcut_type_tripletap.json b/res/raw/accessibility_shortcut_type_tripletap.json
index 18f1736ae17..c74c66b8268 100644
--- a/res/raw/accessibility_shortcut_type_tripletap.json
+++ b/res/raw/accessibility_shortcut_type_tripletap.json
@@ -2,10 +2,10 @@
   "v": "5.12.1",
   "fr": 60,
   "ip": 0,
-  "op": 135,
+  "op": 126,
   "w": 412,
   "h": 300,
-  "nm": "Accessibility_Triple_Tap_v5_export",
+  "nm": "Accessibility_Triple_Tap_v5_export 2",
   "ddd": 0,
   "assets": [],
   "layers": [
@@ -21,644 +21,274 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 1.832,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 9.623,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 11.91,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 16.543,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 18.377,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 26.164,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 28.457,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 33.09,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 34.922,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 42.711,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 45,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 85,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 86.832,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 94.623,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 96.91,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 101.543,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 103.377,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 111.164,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 113.457,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 118.09,
+              "s": [0]
+            },
+            { "t": 119.921875, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206.01,
-            150.01,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206.01, 150.01, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0,
-              "s": [
-                120,
-                120,
-                100
-              ]
+              "s": [120, 120, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 5.498,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 7.328,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 11.91,
-              "s": [
-                120,
-                120,
-                100
-              ]
+              "s": [120, 120, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 16.543,
-              "s": [
-                120,
-                120,
-                100
-              ]
+              "s": [120, 120, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 22.043,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 23.873,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 28.457,
-              "s": [
-                120,
-                120,
-                100
-              ]
+              "s": [120, 120, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 33.09,
-              "s": [
-                120,
-                120,
-                100
-              ]
+              "s": [120, 120, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 38.588,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 40.418,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 45,
-              "s": [
-                120,
-                120,
-                100
-              ]
-            }
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 85,
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 90.498,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 92.328,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 96.91,
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 101.543,
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 107.043,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 108.873,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 113.457,
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 118.09,
+              "s": [120, 120, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 123.588,
+              "s": [100, 100, 100]
+            },
+            { "t": 125.41796875, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -677,58 +307,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ],
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ]
+                    [-20.621, 0],
+                    [0, 20.621],
+                    [20.621, 0],
+                    [0, -20.621]
                   ],
                   "o": [
-                    [
-                      20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      -20.621
-                    ],
-                    [
-                      -20.621,
-                      0
-                    ],
-                    [
-                      0,
-                      20.621
-                    ]
+                    [20.621, 0],
+                    [0, -20.621],
+                    [-20.621, 0],
+                    [0, 20.621]
                   ],
                   "v": [
-                    [
-                      0,
-                      37.338
-                    ],
-                    [
-                      37.338,
-                      0
-                    ],
-                    [
-                      0,
-                      -37.338
-                    ],
-                    [
-                      -37.338,
-                      0
-                    ]
+                    [0, 37.338],
+                    [37.338, 0],
+                    [0, -37.338],
+                    [-37.338, 0]
                   ],
                   "c": true
                 },
@@ -742,24 +336,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -772,19 +353,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -793,50 +365,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -867,644 +402,274 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 1.832,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 9.623,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 11.91,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 16.543,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 18.377,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 26.164,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 28.457,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 33.09,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 34.922,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 42.711,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 45,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 85,
+              "s": [1]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 86.832,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 94.623,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 96.91,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 101.543,
+              "s": [1]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 103.377,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 111.164,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 113.457,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 118.09,
+              "s": [1]
+            },
+            { "t": 119.921875, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206.012,
-            150.012,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206.012, 150.012, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0,
-              "s": [
-                80,
-                80,
-                100
-              ]
+              "s": [80, 80, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 5.498,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 7.328,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 11.91,
-              "s": [
-                80,
-                80,
-                100
-              ]
+              "s": [80, 80, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 16.543,
-              "s": [
-                80,
-                80,
-                100
-              ]
+              "s": [80, 80, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 22.043,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 23.873,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 28.457,
-              "s": [
-                80,
-                80,
-                100
-              ]
+              "s": [80, 80, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 33.09,
-              "s": [
-                80,
-                80,
-                100
-              ]
+              "s": [80, 80, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 38.588,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 40.418,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 45,
-              "s": [
-                80,
-                80,
-                100
-              ]
-            }
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 85,
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 90.498,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 92.328,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 96.91,
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 101.543,
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 107.043,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 108.873,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 113.457,
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 118.09,
+              "s": [80, 80, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 123.588,
+              "s": [100, 100, 100]
+            },
+            { "t": 125.41796875, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -1523,58 +688,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ],
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ]
+                    [-31.444, 0],
+                    [0, 31.444],
+                    [31.444, 0],
+                    [0, -31.444]
                   ],
                   "o": [
-                    [
-                      31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      -31.444
-                    ],
-                    [
-                      -31.444,
-                      0
-                    ],
-                    [
-                      0,
-                      31.444
-                    ]
+                    [31.444, 0],
+                    [0, -31.444],
+                    [-31.444, 0],
+                    [0, 31.444]
                   ],
                   "v": [
-                    [
-                      0,
-                      56.934
-                    ],
-                    [
-                      56.934,
-                      0
-                    ],
-                    [
-                      0,
-                      -56.934
-                    ],
-                    [
-                      -56.934,
-                      0
-                    ]
+                    [0, 56.934],
+                    [56.934, 0],
+                    [0, -56.934],
+                    [-56.934, 0]
                   ],
                   "c": true
                 },
@@ -1588,24 +717,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -1618,19 +734,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -1639,50 +746,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -1713,644 +783,274 @@
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 0,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 1.832,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 9.623,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 11.91,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 16.543,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 18.377,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 26.164,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 28.457,
-              "s": [
-                0
-              ]
+              "s": [0]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 33.09,
-              "s": [
-                1
-              ]
+              "s": [1]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 34.922,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
-              "i": {
-                "x": [
-                  0.833
-                ],
-                "y": [
-                  0.833
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167
-                ],
-                "y": [
-                  0.167
-                ]
-              },
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 42.711,
-              "s": [
-                50
-              ]
+              "s": [50]
             },
             {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
               "t": 45,
-              "s": [
-                0
-              ]
-            }
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 85,
+              "s": [1]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 86.832,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 94.623,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 96.91,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 101.543,
+              "s": [1]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 103.377,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 111.164,
+              "s": [50]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 113.457,
+              "s": [0]
+            },
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 118.09,
+              "s": [1]
+            },
+            { "t": 119.921875, "s": [50] }
           ],
           "ix": 11
         },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206,
-            150,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
         "s": {
           "a": 1,
           "k": [
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 0,
-              "s": [
-                60,
-                60,
-                100
-              ]
+              "s": [60, 60, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 5.498,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 7.328,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 11.91,
-              "s": [
-                60,
-                60,
-                100
-              ]
+              "s": [60, 60, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 16.543,
-              "s": [
-                60,
-                60,
-                100
-              ]
+              "s": [60, 60, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 22.043,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 23.873,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 28.457,
-              "s": [
-                60,
-                60,
-                100
-              ]
+              "s": [60, 60, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 33.09,
-              "s": [
-                60,
-                60,
-                100
-              ]
+              "s": [60, 60, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.833,
-                  0.833,
-                  0.833
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.333,
-                  0.333,
-                  0.333
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
               "t": 38.588,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
-              "i": {
-                "x": [
-                  0.667,
-                  0.667,
-                  0.667
-                ],
-                "y": [
-                  1,
-                  1,
-                  1
-                ]
-              },
-              "o": {
-                "x": [
-                  0.167,
-                  0.167,
-                  0.167
-                ],
-                "y": [
-                  0,
-                  0,
-                  0
-                ]
-              },
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 40.418,
-              "s": [
-                100,
-                100,
-                100
-              ]
+              "s": [100, 100, 100]
             },
             {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
               "t": 45,
-              "s": [
-                60,
-                60,
-                100
-              ]
-            }
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 85,
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 90.498,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 92.328,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 96.91,
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 101.543,
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 107.043,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 108.873,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+              "t": 113.457,
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 118.09,
+              "s": [60, 60, 100]
+            },
+            {
+              "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 123.588,
+              "s": [100, 100, 100]
+            },
+            { "t": 125.41796875, "s": [100, 100, 100] }
           ],
           "ix": 6,
           "l": 2
@@ -2369,58 +1069,22 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -41.974,
-                      0
-                    ],
-                    [
-                      0,
-                      41.974
-                    ],
-                    [
-                      41.974,
-                      0
-                    ],
-                    [
-                      0,
-                      -41.974
-                    ]
+                    [-41.974, 0],
+                    [0, 41.974],
+                    [41.974, 0],
+                    [0, -41.974]
                   ],
                   "o": [
-                    [
-                      41.974,
-                      0
-                    ],
-                    [
-                      0,
-                      -41.974
-                    ],
-                    [
-                      -41.974,
-                      0
-                    ],
-                    [
-                      0,
-                      41.974
-                    ]
+                    [41.974, 0],
+                    [0, -41.974],
+                    [-41.974, 0],
+                    [0, 41.974]
                   ],
                   "v": [
-                    [
-                      0,
-                      76
-                    ],
-                    [
-                      76,
-                      0
-                    ],
-                    [
-                      0,
-                      -76
-                    ],
-                    [
-                      -76,
-                      0
-                    ]
+                    [0, 76],
+                    [76, 0],
+                    [0, -76],
+                    [-76, 0]
                   ],
                   "c": true
                 },
@@ -2434,24 +1098,11 @@
               "ty": "st",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 3
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 4
-              },
-              "w": {
-                "a": 0,
-                "k": 2.764,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 2.764, "ix": 5 },
               "lc": 1,
               "lj": 1,
               "ml": 4,
@@ -2464,19 +1115,10 @@
               "ty": "fl",
               "c": {
                 "a": 0,
-                "k": [
-                  0.40000000596,
-                  0.615686297417,
-                  0.964705884457,
-                  1
-                ],
+                "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
                 "ix": 4
               },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -2485,50 +1127,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -2555,46 +1160,11 @@
       "cl": "black",
       "sr": 1,
       "ks": {
-        "o": {
-          "a": 0,
-          "k": 100,
-          "ix": 11
-        },
-        "r": {
-          "a": 0,
-          "k": 0,
-          "ix": 10
-        },
-        "p": {
-          "a": 0,
-          "k": [
-            206,
-            150,
-            0
-          ],
-          "ix": 2,
-          "l": 2
-        },
-        "a": {
-          "a": 0,
-          "k": [
-            0,
-            0,
-            0
-          ],
-          "ix": 1,
-          "l": 2
-        },
-        "s": {
-          "a": 0,
-          "k": [
-            100,
-            100,
-            100
-          ],
-          "ix": 6,
-          "l": 2
-        }
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
       },
       "ao": 0,
       "shapes": [
@@ -2609,106 +1179,34 @@
                 "a": 0,
                 "k": {
                   "i": [
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.5
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.2,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ]
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.5],
+                    [0, 0],
+                    [15.2, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0]
                   ],
                   "o": [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      -15.7
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -15.3,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      15.7
-                    ]
+                    [0, 0],
+                    [15.3, 0],
+                    [0, 0],
+                    [0, -15.7],
+                    [0, 0],
+                    [-15.3, 0],
+                    [0, 0],
+                    [0, 15.7]
                   ],
                   "v": [
-                    [
-                      -178.2,
-                      150
-                    ],
-                    [
-                      178.2,
-                      150
-                    ],
-                    [
-                      206,
-                      121.7
-                    ],
-                    [
-                      206,
-                      -121.5
-                    ],
-                    [
-                      178.3,
-                      -150
-                    ],
-                    [
-                      -178.2,
-                      -150
-                    ],
-                    [
-                      -206,
-                      -121.5
-                    ],
-                    [
-                      -206,
-                      121.5
-                    ]
+                    [-178.2, 150],
+                    [178.2, 150],
+                    [206, 121.7],
+                    [206, -121.5],
+                    [178.3, -150],
+                    [-178.2, -150],
+                    [-206, -121.5],
+                    [-206, 121.5]
                   ],
                   "c": true
                 },
@@ -2720,21 +1218,8 @@
             },
             {
               "ty": "fl",
-              "c": {
-                "a": 0,
-                "k": [
-                  0,
-                  0,
-                  0,
-                  1
-                ],
-                "ix": 4
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 5
-              },
+              "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+              "o": { "a": 0, "k": 100, "ix": 5 },
               "r": 1,
               "bm": 0,
               "nm": "Fill 1",
@@ -2743,50 +1228,13 @@
             },
             {
               "ty": "tr",
-              "p": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 2
-              },
-              "a": {
-                "a": 0,
-                "k": [
-                  0,
-                  0
-                ],
-                "ix": 1
-              },
-              "s": {
-                "a": 0,
-                "k": [
-                  100,
-                  100
-                ],
-                "ix": 3
-              },
-              "r": {
-                "a": 0,
-                "k": 0,
-                "ix": 6
-              },
-              "o": {
-                "a": 0,
-                "k": 100,
-                "ix": 7
-              },
-              "sk": {
-                "a": 0,
-                "k": 0,
-                "ix": 4
-              },
-              "sa": {
-                "a": 0,
-                "k": 0,
-                "ix": 5
-              },
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
               "nm": "Transform"
             }
           ],
@@ -2806,12 +1254,6 @@
       "bm": 0
     }
   ],
-  "markers": [
-    {
-      "tm": 135,
-      "cm": "1",
-      "dr": 0
-    }
-  ],
+  "markers": [{ "tm": 211, "cm": "1", "dr": 0 }],
   "props": {}
-}
\ No newline at end of file
+}
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 4b517265cb8..01f6f3aaa10 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Sneeuvlokkie"</item>
     <item msgid="7952183800501346803">"Strandsambreel"</item>
     <item msgid="799139025758265891">"Werkswinkelgereedskap"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Klavier"</item>
     <item msgid="3861584909935022342">"Filmspoel"</item>
     <item msgid="5827426100157335512">"Boek"</item>
     <item msgid="8585828346253128384">"Egiptiese waterlelie"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 851a3bbf97d..af14d4b11fa 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bind nuwe toestel saam"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Skakel dit môre outomaties aan"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"As jy Bluetooth afskakel, skakel dit die dag daarna weer aan"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Bind regteroor saam"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Bind linkeroor saam"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Bind jou ander oor saam"</string>
@@ -100,8 +101,8 @@
     <string name="device_picker" msgid="2427027896389445414">"Kies Bluetooth-toestel"</string>
     <string name="bluetooth_ask_enablement" msgid="1529030199895339199">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel"</string>
     <string name="bluetooth_ask_disablement" msgid="1879788777942714761">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth afskakel"</string>
-    <string name="bluetooth_ask_enablement_no_name" msgid="5091401961637405417">"\'n Program wil Bluetooth aanskakel"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="382299750909188822">"\'n Program wil Bluetooth afskakel"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="5091401961637405417">"\'n App wil Bluetooth aanskakel"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="382299750909188822">"\'n App wil Bluetooth afskakel"</string>
     <string name="bluetooth_turning_on" msgid="3842613808709024730">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_turning_off" msgid="7406309124247701148">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"Bluetooth-verbindingsversoek"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Deaktiveer Bluetooth LE-oudio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Deaktiveer Bluetooth LE-oudio-kenmerk as die toestel LE oudiohardewarevermoëns ondersteun."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE-oudiomodus"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Aktiveer Bluetooth LE-oudio-uitsending se UI-voorskou"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Aktiveer die LE-oudiodeling se UI-voorskou, insluitend persoonlike oudiodeling en privaat uitsending"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Wys LE-oudiowisselaar in Toestelbesonderhede"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omseil Bluetooth LE-oudiotoelaatlys"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Gebruik LE-oudio by verstek, selfs as LE-oudio se randtoestel nie geverifieer is vir voldoening aan toelaatlyskriteria nie."</string>
@@ -130,7 +133,7 @@
     <string name="connected_device_fast_pair_device_title" msgid="543124539265592392">"Word met rekening geassosieer"</string>
     <string name="connected_device_previously_associated_fast_pair_device_title" msgid="8353405823992023457">"Voorheen met rekening gebruik"</string>
     <string name="connected_device_add_device_summary" msgid="8671009879957120802">"Bluetooth sal aangeskakel word om saam te bind"</string>
-    <string name="connected_device_connections_title" msgid="4164120115341579170">"Verbindingvoorkeure"</string>
+    <string name="connected_device_connections_title" msgid="4164120115341579170">"VerbindingU+00ADvoorkeure"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Voorheen gekoppel"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth is aangeskakel"</string>
     <string name="previous_connected_see_all" msgid="7759413145713251328">"Sien alles"</string>
@@ -175,10 +178,14 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Programtaal"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Voorgestelde tale"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alle tale"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Voorgestel"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alle tale"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alle streke"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alle nommerstelsels"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Stelseltaal"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Stelselverstek"</string>
-    <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Taalkeuse vir hierdie program is nie in Instellings beskikbaar nie."</string>
-    <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"Taal kan verskil van tale wat in die program beskikbaar is. Sommige programme steun dalk nie hierdie instelling nie."</string>
+    <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Taalkeuse vir hierdie app is nie in Instellings beskikbaar nie."</string>
+    <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"Taal kan verskil van tale wat in die app beskikbaar is. Sommige apps steun dalk nie hierdie instelling nie."</string>
     <string name="desc_app_locale_selection_supported" msgid="6744909281573556379">"Stel die taal vir elke app."</string>
     <string name="desc_introduction_of_language_picker" msgid="4012265379885200083">"Jou toestel, apps en webwerwe gebruik die eerste gesteunde taal uit jou voorkeurtaallys.\n\nBaie apps sal ook die streek van jou voorkeurtaal gebruik om datums, getalle en eenhede te formateer. Voeg ’n taal by en kies dan jou voorkeurstreek as jy jou streek wil verander."</string>
     <string name="desc_notice_of_language_picker" msgid="3449290526457925447">"Gaan na apptaalinstellings vir elke app om ’n taal te kies."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Verander"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s is nie beskikbaar nie"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Hierdie taal kan nie as ’n stelseltaal gebruik word nie, maar jy het apps en webwerwe ingelig dat jy hierdie taal verkies."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Soek"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Voeg ’n taal by"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Streekvoorkeur"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Voer taalnaam in"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Meer taalinstellings"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Streeksvoorkeure"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Stel eenheid- en nommervoorkeure"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Lig apps in oor jou streekvoorkeure sodat hulle jou ervaring kan personaliseer."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps sal waar moontlik jou streekvoorkeure gebruik."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Streeksvoorkeure"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatuur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Eerste dag van die week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Nommervoorkeure"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Verbind aan datadienste tydens swerwing"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Verbind aan datadienste tydens swerwing"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Swerwingheffings kan geld."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Stel tyd outomaties"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Stel outomaties"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Ligging sal gebruik word om die tydsone te stel wanneer hierdie wisselaar aan is"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Outomatiese datum en tyd"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Stel outomaties deur jou netwerk- en draadloosinstellings"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Outomatiese tydsone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Stel outomaties op grond van mobiele netwerke naby jou"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Stel outomaties met jou toestelligging, indien beskikbaar"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gebruik verstek vir locale"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gebruik 24-uur-formaat"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tyd"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lig vinger op en raak sensor dan weer"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Kan nie vingerafdruksensor gebruik nie"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Besoek ’n verskaffer wat herstelwerk doen."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Skerm-af-vingerafdrukslot"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Gebruik Vingerafdrukslot selfs wanneer die skerm af is"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Skerm-af, ontsluit"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Meer sekuriteitinstellings"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Werkprofielslot, enkripsie, en meer"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Enkripsie, eiebewyse, en meer"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Stel \'n patroon vir jou privaat ruimte"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Sluit"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Versteek"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Bevestig jou privaatruimtepatroon"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Voer weer die PIN vir jou privaat ruimte in"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Voer weer die wagwoord vir jou privaat ruimte in"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> vingerafdrukke byvoeg"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Jy het die maksimum aantal vingerafdrukke bygevoeg"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan nie nog vingerafdrukke byvoeg nie"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aan"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Af"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Eksterne skerm"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Gebruik eksterne skerm"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Skermresolusie"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Eksterne skerm is ontkoppel"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"As jy rotasie of resolusie verander, kan dit enige apps stop wat tans gebruik word"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Jou toestel moet aan ’n eksterne skerm gekoppel wees om jou skerm te weerspieël"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Meer opsies"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hou en sleep om skerms te herrangskik."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Saai uit"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"weerspieël"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktiveer draadlose skermdeling"</string>
@@ -924,7 +948,7 @@
     <string name="android_beam_on_summary" msgid="6067720758437490896">"Gereed om programinhoud te stuur via NFC"</string>
     <string name="android_beam_off_summary" msgid="5693961375631325042">"Af"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"Nie beskikbaar nie want NFC is afgeskakel"</string>
-    <string name="android_beam_explained" msgid="5684416131846701256">"Wanneer hierdie kenmerk aangeskakel is, kan jy programinhoud na \'n ander toestel met NFC-vermoë straal deur die toestelle na aan mekaar te hou. Jy kan byvoorbeeld webbladsye, YouTube-video\'s, kontakte en meer straal.\n\nHou eenvoudig die toestelle bymekaar (gewoonlik rug aan rug) en tik dan op jou skerm. Die program bepaal wat gestraal word."</string>
+    <string name="android_beam_explained" msgid="5684416131846701256">"Wanneer hierdie kenmerk aangeskakel is, kan jy appinhoud na \'n ander toestel met NFC-vermoë straal deur die toestelle na aan mekaar te hou. Jy kan byvoorbeeld webbladsye, YouTube-video\'s, kontakte en meer straal.\n\nHou eenvoudig die toestelle bymekaar (gewoonlik rug aan rug) en tik dan op jou skerm. Die app bepaal wat gestraal word."</string>
     <string name="wifi_settings" msgid="8313301946393559700">"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>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Gaan die wagwoord na en probeer weer"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontak die toestelvervaardiger"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Gaan verbinding na en probeer weer"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Hierdie wi-fi-netwerk is nie tans beskikbaar nie"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Daar is ’n probleem met hierdie QR-kode. Probeer op ’n ander manier koppel."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Kies netwerk"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Kies \'n netwerk om jou toestel te koppel"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Voeg hierdie toestel by “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1055,7 +1081,7 @@
     <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>
     <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"\'n Onbekende program wil netwerkskandering aanskakel om liggingakkuraatheid te verbeter en vir ander doeleindes, selfs wanneer Wi‑Fi af is.\n\nLaat dit toe vir alle programme wat wil skandeer?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"\'n Onbekende app wil netwerkskandering aanskakel om liggingakkuraatheid te verbeter en vir ander doeleindes, selfs wanneer Wi‑Fi af is.\n\nLaat dit toe vir alle apps wat wil skandeer?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Laat toe"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Weier"</string>
     <string name="no_internet_access_text" msgid="3611993143350310936">"Hierdie netwerk het nie internettoegang nie. Bly gekoppel?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Meer inligting oor outodraai"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Skermresolusie"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Hoë resolusie"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Volle resolusie"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Volle resolusie gebruik meer van jou battery. As jy jou resolusie oorskakel, sal sommige programme dalk herbegin."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Gekies"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kleure"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natuurlik"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Aanpasbaar"</string>
     <string name="brightness" msgid="6216871641021779698">"Helderheidsvlak"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Aanpasbare helderheid"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Meer oor aanpasbare helderheid"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Jou skermhelderheid sal outomaties by jou omgewing en aktiwiteite aanpas. Jy kan die glyer self skuif om aanpasbare helderheid te help om te leer wat jy verkies."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aan"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Af"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Slaaptydmodus-instellings"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modusse kan ook donkertema aktiveer}=1{{mode_1} aktiveer ook donkertema}=2{{mode_1} en {mode_2} aktiveer ook donkertema}=3{{mode_1}, {mode_2} en {mode_3} aktiveer ook donkertema}other{{mode_1}, {mode_2} en nog # aktiveer ook donkertema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modusinstellings"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Nog dowwer"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ekstra donker"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Laat toestel toe om dowwer as gewoonlik te word"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skermuitteltyd"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1452,10 +1479,10 @@
     <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl dit geformateer word nie."</string>
     <string name="storage_wizard_ready_title" msgid="3631022511474086605">"<xliff:g id="NAME">^1</xliff:g> is geformateer"</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Skuif <xliff:g id="APP">^1</xliff:g>"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Dit sal \'n kort rukkie vat om <xliff:g id="APP">^1</xliff:g> en sy data na <xliff:g id="NAME_0">^2</xliff:g> te skuif. Jy sal nie die program kan gebruik voordat dit klaar geskuif is nie. \n\nMoenie die <xliff:g id="NAME_1">^2</xliff:g> verwyder terwyl daar geskuif word nie."</string>
+    <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Dit sal \'n kort rukkie vat om <xliff:g id="APP">^1</xliff:g> en sy data na <xliff:g id="NAME_0">^2</xliff:g> te skuif. Jy sal nie die app kan gebruik voordat dit klaar geskuif is nie. \n\nMoenie die <xliff:g id="NAME_1">^2</xliff:g> verwyder terwyl daar geskuif word nie."</string>
     <string name="storage_wizard_move_unlock" msgid="14651384927767749">"Jy moet gebruiker <xliff:g id="APP">^1</xliff:g> ontsluit om data te skuif."</string>
     <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Skuif tans <xliff:g id="APP">^1</xliff:g> …"</string>
-    <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl daar geskuif word nie. \n\nDie <xliff:g id="APP">^2</xliff:g>-program in hierdie toestel sal nie beskikbaar wees voordat dit klaar geskuif is nie."</string>
+    <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl daar geskuif word nie. \n\nDie <xliff:g id="APP">^2</xliff:g>-app in hierdie toestel sal nie beskikbaar wees voordat dit klaar geskuif is nie."</string>
     <string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"Hoe sal jy hierdie <xliff:g id="NAME">^1</xliff:g> gebruik?"</string>
     <string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"Of"</string>
     <string name="storage_wizard_init_v2_external_title" msgid="2786416384217054112">"Formateer SD-kaart vir draagbare berging"</string>
@@ -1598,9 +1625,9 @@
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobiele netwerk"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"SMS-app"</string>
-    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Verander SMS-program?"</string>
-    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-program?"</string>
+    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Verander SMS-app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-app?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-app?"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Verander Wi-Fi-assistent?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> om jou netwerkverbindings te bestuur?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> om jou netwerkverbindings te bestuur?"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Liggingdienste"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Liggingdienste"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Gebruik ligging"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Gebruik ligging vir tydsone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Kan nie die tydsone outomaties stel nie"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Ligging of Liggingdienste is af"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Ligginginstellings"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Maak dit reg"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Kanselleer"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Outomatiese tydsone is af"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nie beskikbaar wanneer outomatiese tydsone af is nie"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Ligging kan gebruik word om tydsone te stel"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"As jou toestel se ligging beskikbaar is, kan dit gebruik word om jou tydsone te stel"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Sien regsinligting, status, sagteware-weergawe"</string>
     <string name="legal_information" msgid="7509900979811934843">"Regsinligting"</string>
     <string name="manual" msgid="3651593989906084868">"Handleiding"</string>
@@ -1765,7 +1792,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Dieselfde as toestelskermslot"</string>
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"Bestuur programme"</string>
     <string name="applications_settings" msgid="1941993743933425622">"Appinligting"</string>
-    <string name="applications_settings_header" msgid="3154670675856048015">"Program-instellings"</string>
+    <string name="applications_settings_header" msgid="3154670675856048015">"App-instellings"</string>
     <string name="install_applications" msgid="3921609656584369901">"Onbekende bronne"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"Laat alle programbronne toe"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"Apps wat onlangs oopgemaak is"</string>
@@ -1795,7 +1822,7 @@
     <string name="restoring_step_four" msgid="8966846882470446209">"Stel tans terug …"</string>
     <string name="total_size_label" msgid="2052185048749658866">"Totaal"</string>
     <string name="application_size_label" msgid="6407051020651716729">"Programgrootte"</string>
-    <string name="external_code_size_label" msgid="7375146402660973743">"USB-berging-program"</string>
+    <string name="external_code_size_label" msgid="7375146402660973743">"USB-berging-app"</string>
     <string name="data_size_label" msgid="7814478940141255234">"Gebruikerdata"</string>
     <string name="uninstall_text" msgid="315764653029060126">"Verwyder"</string>
     <string name="uninstall_all_users_text" msgid="5924715251087176474">"Deïnstalleer vir alle gebruikers"</string>
@@ -1806,10 +1833,10 @@
     <string name="app_factory_reset" msgid="8974044931667015201">"Deïnstalleer opdaterings"</string>
     <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Laat beperkte instellings toe"</string>
     <string name="auto_launch_enable_text" msgid="8912714475823807798">"Sommige aktiwiteite wat jy gekies het, maak by verstek in hierdie program oop."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Jy het gekies om toe te laat dat hierdie program legstukke skep en by hulle data ingaan."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Jy het gekies om toe te laat dat hierdie app legstukke skep en by hulle data ingaan."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Verstek instellings nie opgestel nie."</string>
     <string name="clear_activities" msgid="488089228657585700">"Vee verstekvoorkeure uit"</string>
-    <string name="screen_compatibility_text" msgid="5915767835411020274">"Hierdie program is dalk nie vir jou skerm ontwerp nie; jy kan hier beheer hoe dit by jou skerm aanpas."</string>
+    <string name="screen_compatibility_text" msgid="5915767835411020274">"Hierdie app is dalk nie vir jou skerm ontwerp nie; jy kan hier beheer hoe dit by jou skerm aanpas."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Vra wanneer laat loop word"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaleer app"</string>
     <string name="unknown" msgid="8192160131923461175">"Onbekend"</string>
@@ -1836,12 +1863,12 @@
     <string name="internal_storage" msgid="999496851424448809">"Interne berging"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Herbereken tans grootte…"</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Vee programdata uit?"</string>
-    <string name="clear_data_dlg_text" msgid="3440011276559762619">"Hierdie program se data, insluitend lêers en instellings, sal permanent op hierdie toestel uitgevee word"</string>
+    <string name="clear_data_dlg_text" msgid="3440011276559762619">"Hierdie app se data, insluitend lêers en instellings, sal permanent op hierdie toestel uitgevee word"</string>
     <string name="dlg_ok" msgid="1421350367857960997">"OK"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"Kanselleer"</string>
     <string name="dlg_delete" msgid="1790919205039397659">"Vee uit"</string>
-    <string name="app_not_found_dlg_text" msgid="8634675268730513704">"Die program is nie in die lys geïnstalleerde programme gevind nie."</string>
-    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Kon nie berging vir program uitvee nie."</string>
+    <string name="app_not_found_dlg_text" msgid="8634675268730513704">"Die app is nie in die lys geïnstalleerde apps gevind nie."</string>
+    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Kon nie berging vir app uitvee nie."</string>
     <string name="computing_size" msgid="4915310659841174866">"Bereken tans..."</string>
     <string name="invalid_size_value" msgid="7017371543563259201">"Kon nie pakketgrootte bereken nie."</string>
     <string name="version_text" msgid="7628938665256107608">"weergawe <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
@@ -1852,14 +1879,14 @@
     <string name="restoring_in_progress" msgid="7787443682651146115">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> word teruggestel"</string>
     <string name="another_migration_already_in_progress" msgid="6550546307856052261">"\'n Ander migrasie is reeds aan die gang."</string>
     <string name="insufficient_storage" msgid="8115088042669030558">"Nie genoeg stoorplek nie."</string>
-    <string name="does_not_exist" msgid="6499163879348776120">"Program bestaan ​​nie."</string>
+    <string name="does_not_exist" msgid="6499163879348776120">"App bestaan ​​nie."</string>
     <string name="invalid_location" msgid="8013853455355520557">"Installeer-ligging is nie geldig nie."</string>
     <string name="system_package" msgid="7559476279008519360">"Stelselopdaterings kan nie op eksterne media geïnstalleer word nie."</string>
     <string name="move_error_device_admin" msgid="1561502976834303626">"Toesteladministrasieprogram kan nie op eksterne media geïnstalleer word nie"</string>
     <string name="force_stop_dlg_title" msgid="86745852555490146">"Verplig stop?"</string>
     <string name="force_stop_dlg_text" msgid="1527286468544457368">"As jy ’n app verplig om te stop, kan dit verkeerd optree."</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Deaktiveer app"</string>
-    <string name="app_disable_dlg_text" msgid="2449382902751908916">"As jy hierdie program deaktiveer, sal Android en ander programme dalk nie meer soos bedoel werk nie. Hou in gedagte dat jy nie hierdie program kan uitvee nie, want dit is vooraf op jou toestel geïnstalleer. Deur dit te deaktiveer, skakel jy hierdie program af en versteek jy dit op jou toestel."</string>
+    <string name="app_disable_dlg_text" msgid="2449382902751908916">"As jy hierdie app deaktiveer, sal Android en ander apps dalk nie meer soos bedoel werk nie. Hou in gedagte dat jy nie hierdie app kan uitvee nie, want dit is vooraf op jou toestel geïnstalleer. Deur dit te deaktiveer, skakel jy hierdie app af en versteek jy dit op jou toestel."</string>
     <string name="app_install_details_group_title" msgid="1172114479073704677">"Winkel"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"Appbesonderhede"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"App is vanaf <xliff:g id="APP_STORE">%1$s</xliff:g> geïnstalleer"</string>
@@ -1871,7 +1898,7 @@
     <string name="service_restarting" msgid="5104563288155809226">"Begin weer"</string>
     <string name="cached" msgid="5379485147573438201">"Gekaste agtergrondprosesse"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Niks loop nie."</string>
-    <string name="service_started_by_app" msgid="6845028506417670179">"Begin deur program"</string>
+    <string name="service_started_by_app" msgid="6845028506417670179">"Begin deur app"</string>
     <!-- no translation found for service_client_name (2210898622981598861) -->
     <skip />
     <string name="service_background_processes" msgid="2800539421534521948">"<xliff:g id="MEMORY">%1$s</xliff:g> beskikbaar"</string>
@@ -1886,7 +1913,7 @@
     <string name="running_processes_item_description_p_s" msgid="8957061449107822282">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
     <string name="running_processes_item_description_p_p" msgid="3292999232897469679">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> dienste"</string>
     <string name="running_processes_header_title" msgid="558961782589967366">"Toestelberging"</string>
-    <string name="running_processes_header_footer" msgid="2726092156680487584">"Program se RAM-gebruik"</string>
+    <string name="running_processes_header_footer" msgid="2726092156680487584">"App se RAM-gebruik"</string>
     <string name="running_processes_header_system_prefix" msgid="8819527769608555124">"Stelsel"</string>
     <string name="running_processes_header_apps_prefix" msgid="4151874328324238133">"Apps"</string>
     <string name="running_processes_header_free_prefix" msgid="4271100378295864738">"Gratis"</string>
@@ -1899,8 +1926,8 @@
     <string name="runningservicedetails_processes_title" msgid="5292271587797234038">"Prosesse"</string>
     <string name="service_stop" msgid="5712522600201308795">"Stop"</string>
     <string name="service_manage" msgid="3896322986828332075">"Instellings"</string>
-    <string name="service_stop_description" msgid="6327742632400026677">"Hierdie diens is deur sy program begin. As dit gestop word, kan die program misluk."</string>
-    <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Hierdie program kan nie met veiligheid gestop word nie. As jy dit stop, kan jy sommige van jou huidige werk verloor."</string>
+    <string name="service_stop_description" msgid="6327742632400026677">"Hierdie diens is deur sy app begin. As dit gestop word, kan die app misluk."</string>
+    <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Hierdie app kan nie met veiligheid gestop word nie. As jy dit stop, kan jy sommige van jou huidige werk verloor."</string>
     <string name="background_process_stop_description" msgid="4792038933517438037">"Dit is \'n ou programproses wat nog steeds loop ingeval dit weer benodig word. Daar is gewoonlik geen rede om dit te stop nie."</string>
     <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: word tans gebruik. Tik op Instellings om dit te beheer."</string>
     <string name="main_running_process_description" msgid="6685973937935027773">"Hoofproses wat gebruik word."</string>
@@ -1927,7 +1954,7 @@
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"Druk spasie-sleutel twee keer om \".\" in te voeg"</string>
     <string name="show_password" msgid="7101900779571040117">"Wys wagwoorde"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"Wys karakters kortliks terwyl jy tik"</string>
-    <string name="spellchecker_security_warning" msgid="2016059050608271820">"Hierdie speltoetser is dalk in staat om al die teks wat jy invoer te versamel, insluitend persoonlike inligting soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>-program. Gebruik hierdie speltoetser?"</string>
+    <string name="spellchecker_security_warning" msgid="2016059050608271820">"Hierdie speltoetser is dalk in staat om al die teks wat jy invoer te versamel, insluitend persoonlike inligting soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>-app. Gebruik hierdie speltoetser?"</string>
     <string name="spellchecker_quick_settings" msgid="6449414356743946577">"Instellings"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"Taal"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"Sleutelborde"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opsies"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Toeganklikheid"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fisiese sleutelbord"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Hopsleutels"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Die sleutelbord ignoreer drukke van dieselfde sleutel wat binne <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms vinnig herhaal word"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Die sleutelbord ignoreer vinnig herhaalde drukke van dieselfde sleutel"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bonssleuteldrempel"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Kies vir hoe lank jou sleutelbord herhaalde sleuteldrukke ignoreer"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2s."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4s."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6s."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Gepasmaak"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"gepasmaakte waarde"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Stadige sleutels"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Dit verstel die tyd wat dit neem vir ’n sleuteldruk om geaktiveer te word na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms toe"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Verstel die tyd wat dit neem vir ’n sleuteldruk om geaktiveer te word"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taaisleutels"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Druk een sleutel op ’n slag vir kortpaaie pleks van om die sleutels saam in te hou"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Muissleutels"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Gebruik die fisieke sleutelbord om die muis te beheer."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Gebruik muissleutels"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gebruik jou sleutelbord om die wyser te beheer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Muis – omgekeerde rollees"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rollees op om die bladsy af te beweeg"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Ruil linker- en regterknoppies om"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gebruik die muis se linkerknoppie as jou regterknoppie"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Muissleutels vir <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Gebruik die <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>-sleutels om die muiswyser te beweeg"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Gebruik die <xliff:g id="CLICK_LABEL">%s</xliff:g>-sleutel om die primêre muisknoppie te klik"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Gebruik die <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>-sleutel om die primêre muisknoppie te druk en hou"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Gebruik die <xliff:g id="RELEASE_LABEL">%s</xliff:g>-sleutel om die primêre muisknoppie te laat gaan"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Gebruik die <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>-sleutel om rolleesmodus te wissel. Dit sal die <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>-sleutels die aansig na bo, onder links of regs laat rollees."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Gebruik die <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>-sleutel om die sekondêre muisknoppie te klik"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Kortpadsleutels"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Wys lys met kortpaaie"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Werkprofielsleutelborde en -nutsgoed"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Verstek"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Raakpaneel"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Raakpaneel en muis"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Muis"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Wyserspoed, gebare"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tik om te klik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tiksleep"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik onder regs"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klik op die raakpaneel se hoek onder regs vir meer opsies"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Wyserspoed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Gebruik drievingertik"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Wyserkleur"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Verander wyserinvulstyl na swart"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Verander wyserinvulstyl na groen"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Leer raakpaneelgebare"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"stuurpaneel, stuurpaneel, muis, skermpyltjie, rollees, swiep, regsklik, klik, wyser"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"regsklik, tik"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Middelklik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Begin Assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Gaan na tuisskerm"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Gaan terug"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Bekyk onlangse apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Gaan na tuisskerm"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swiep op met drie vingers enige plek op jou raakpaneel"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Gaan terug"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies ’n nuwe sleutel vir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Toeganklikheid vir fisieke sleutelbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taaisleutels, hopsleutels, muissleutels"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Herhaalsleutels"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Vertraging voor herhaling"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Herhaalkoers"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hou ’n sleutel in om sy karakter te herhaal totdat die sleutel gelos word"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-uitleg"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Verstek"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Outomaties: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Voorskou"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standaardopsies"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Taal"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Teksgrootte"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Onderskrifgrootte"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Onderskrifstyl"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Gepasmaakte opsies"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Agtergrondkleur"</string>
@@ -2446,7 +2505,7 @@
     <string name="color_yellow" msgid="5957551912912679058">"Geel"</string>
     <string name="color_magenta" msgid="8943538189219528423">"Magenta"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
-    <string name="touch_filtered_warning" msgid="4225815157460318241">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
+    <string name="touch_filtered_warning" msgid="4225815157460318241">"Instellings kan nie jou antwoord verifieer nie omdat \'n app \'n toestemmingversoek verberg."</string>
     <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"Laat toe"</string>
     <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"Weier"</string>
     <string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"Skakel af"</string>
@@ -2515,10 +2574,10 @@
     <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Skermtyd"</string>
     <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Agtergrondtyd"</string>
     <string name="low_battery_summary" msgid="4458925347316501953">"Lae battery"</string>
-    <string name="background_activity_summary" msgid="3817376868497046016">"Laat die program toe om in die agtergrond te loop"</string>
+    <string name="background_activity_summary" msgid="3817376868497046016">"Laat die app toe om in die agtergrond te loop"</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>
+    <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"As jy agtergrondaktiwiteit vir \'n app beperk, kan dit verkeerd werk"</string>
+    <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hierdie app is nie gestel om batterykrag te optimeer nie en daarom kan jy dit nie beperk nie.\n\nOm die app te beperk, moet jy eers batterykrag-optimering aanskakel."</string>
     <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Bestuur batterygebruik"</string>
     <string name="manager_battery_usage_allow_background_usage_settings_title" msgid="8150026934645052635">"Laat agtergrondgebruik toe"</string>
     <string name="manager_battery_usage_allow_background_usage_title" msgid="6294649996820358852">"Laat agtergrondgebruik toe"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Verstel kraggebruik"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Ingeslote pakkette"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Programme werk normaal"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Batteryvervanging word aanbeveel"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batterykapasiteit en -laaiprestasie is verminder en batteryvervanging word aanbeveel."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Batteryvlak is laag"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Skakel Batterybespaarder aan om batterylewe te verleng"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Verbeter batterylewe"</string>
@@ -2566,12 +2627,12 @@
     <string name="battery_tip_restrict_summary" msgid="7539469590829235277">"{count,plural, =1{{label} se agtergrondbatterygebruik is hoog}other{# apps se agtergrondbatterygebruik is hoog}}"</string>
     <string name="battery_tip_restrict_handled_summary" msgid="3535697154547199190">"{count,plural, =1{Hierdie app kan nie op die agtergrond loop nie}other{Hierdie apps kan nie op die agtergrond loop nie}}"</string>
     <string name="battery_tip_restrict_app_dialog_title" msgid="1649476357343160240">"{count,plural, =1{Beperk app?}other{Beperk # apps?}}"</string>
-    <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Verhoed <xliff:g id="APP">%1$s</xliff:g> om die battery op die agtergrond te gebruik om so batterykrag te bespaar. Hierdie program sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>
+    <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Verhoed <xliff:g id="APP">%1$s</xliff:g> om die battery op die agtergrond te gebruik om so batterykrag te bespaar. Hierdie app sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Verhoed hierdie programme om die battery op die agtergrond te gebruik om so batterykrag te bespaar. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word.\n\nProgramme:"</string>
     <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="4546838397423565138">"Verhoed hierdie programme om die battery op die agtergrond te gebruik om so batterykrag te bespaar. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word.\n\nProgramme:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
     <string name="battery_tip_restrict_app_dialog_ok" msgid="7025027696689301916">"Beperk"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="5501997201160532301">"Verwyder beperking?"</string>
-    <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Hierdie program sal batterykrag op die agtergrond kan gebruik. Jou battery sal dalk gouer as verwag afloop."</string>
+    <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Hierdie app sal batterykrag op die agtergrond kan gebruik. Jou battery sal dalk gouer as verwag afloop."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Verwyder"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Kanselleer"</string>
     <string name="battery_tip_charge_to_full_button" msgid="9172893341338732733">"Ignoreer"</string>
@@ -2722,7 +2783,7 @@
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Steminvoerdienste"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Volle aktiveerwoord en interaksie"</string>
     <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Eenvoudige spraak na teks"</string>
-    <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Hierdie steminvoerdiens sal altyd-aan-stemmonitering kan verrig en stemgeaktiveerde programme namens jou kan beheer. Dit kom van die <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>-program af. Wil jy die gebruik van hierdie diens aktiveer?"</string>
+    <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Hierdie steminvoerdiens sal altyd-aan-stemmonitering kan verrig en stemgeaktiveerde apps namens jou kan beheer. Dit kom van die <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>-app af. Wil jy die gebruik van hierdie diens aktiveer?"</string>
     <string name="on_device_recognition_settings" msgid="6503160369314598069">"Herkenninginstellings op toestel"</string>
     <string name="on_device_recognition_settings_title" msgid="7137599722039096545">"Herkenning op toestel"</string>
     <string name="on_device_recognition_settings_summary" msgid="3292736423223499348">"Spraakherkenning op toestel"</string>
@@ -2733,7 +2794,7 @@
     <string name="tts_install_voice_title" msgid="5133545696447933812">"Stemme"</string>
     <string name="tts_spoken_language" msgid="4652894245474520872">"Gesproke taal"</string>
     <string name="tts_install_voices_title" msgid="6505257816336165782">"Installeer stemme"</string>
-    <string name="tts_install_voices_text" msgid="902408506519246362">"Gaan voort na die <xliff:g id="TTS_APP_NAME">%s</xliff:g>-program om stemme te installeer"</string>
+    <string name="tts_install_voices_text" msgid="902408506519246362">"Gaan voort na die <xliff:g id="TTS_APP_NAME">%s</xliff:g>-app om stemme te installeer"</string>
     <string name="tts_install_voices_open" msgid="919034855418197668">"Maak app oop"</string>
     <string name="tts_install_voices_cancel" msgid="5179154684379560628">"Kanselleer"</string>
     <string name="tts_reset" msgid="9047681050813970031">"Stel terug"</string>
@@ -2808,17 +2869,17 @@
     <string name="backup_data_management_title" msgid="6596830198441939702">"Bestuur rugsteunrekening"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Sluit programdata in"</string>
     <string name="auto_restore_title" msgid="4124345897936637561">"Outomatiese teruglaai"</string>
-    <string name="auto_restore_summary" msgid="6830198851045584001">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
+    <string name="auto_restore_summary" msgid="6830198851045584001">"Wanneer \'n app weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
     <string name="backup_inactive_title" msgid="6753265378043349277">"Rugsteundiens is nie aktief nie"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Geen rekening stoor tans gerugsteunde data nie"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Hou op om jou Wi-Fi-wagwoorde, boekmerke, ander instellings en programdata te rugsteun en vee al die kopieë op Google-bedieners uit?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Staak die rugsteun van toesteldata (soos Wi-Fi-wagwoorde en oproepgeskiedenis) en programdata (soos instellings en lêers wat deur programme geberg is), en vee ook alle kopieë op afgeleë bedieners uit?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Rugsteun toesteldata (soos Wi-Fi-wagwoorde en oproepgeskiedenis) en programdata (soos instellings en lêers wat deur programme geberg is) outomaties oor \'n afstand.\n\nWanneer jy outomatiese rugsteun aanskakel, word toestel- en programdata van tyd tot tyd oor \'n afstand gestoor. Programdata kan enige data wees wat \'n program gestoor het (op grond van ontwikkelaarinstellings), insluitend potensieel sensitiewe data, soos kontakte, boodskappe en foto\'s."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Rugsteun toesteldata (soos Wi-Fi-wagwoorde en oproepgeskiedenis) en appdata (soos instellings en lêers wat deur apps geberg is) outomaties oor \'n afstand.\n\nWanneer jy outomatiese rugsteun aanskakel, word toestel- en appdata van tyd tot tyd oor \'n afstand gestoor. Appdata kan enige data wees wat \'n app gestoor het (op grond van ontwikkelaarinstellings), insluitend potensieel sensitiewe data, soos kontakte, boodskappe en foto\'s."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Toesteladministrateurinstellings"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Toesteladministrasie-app"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Deaktiveer hierdie toesteladministrasie-app"</string>
-    <string name="uninstall_device_admin" msgid="4481095209503956916">"Deïnstalleer program"</string>
+    <string name="uninstall_device_admin" msgid="4481095209503956916">"Deïnstalleer app"</string>
     <string name="remove_and_uninstall_device_admin" msgid="707912012681691559">"Deaktiveer en deïnstalleer"</string>
     <string name="select_device_admin_msg" msgid="5501360309040114486">"Toesteladministrateurprogramme"</string>
     <string name="no_device_admins" msgid="8888779888103079854">"Geen toesteladministrateurprogramme beskikbaar nie"</string>
@@ -2828,7 +2889,7 @@
     <string name="device_admin_add_title" msgid="6087481040932322289">"Toesteladministrateur"</string>
     <string name="device_admin_warning" msgid="1889160106787280321">"As hierdie toesteladministrasie-app geaktiveer word, sal die app <xliff:g id="APP_NAME">%1$s</xliff:g> toegelaat word om die volgende bewerkings uit te voer."</string>
     <string name="device_admin_warning_simplified" msgid="2715756519899116115">"Hierdie toestel sal deur <xliff:g id="APP_NAME">%1$s</xliff:g> bestuur en gemonitor word."</string>
-    <string name="device_admin_status" msgid="6332571781623084064">"Hierdie administrasieprogram is aktief en laat die program <xliff:g id="APP_NAME">%1$s</xliff:g> toe om die volgende bewerkings uit te voer:"</string>
+    <string name="device_admin_status" msgid="6332571781623084064">"Hierdie administrasie-app is aktief en laat die app <xliff:g id="APP_NAME">%1$s</xliff:g> toe om die volgende bewerkings uit te voer:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"Aktiveer profielbestuurder?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Laat toesig toe?"</string>
     <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Deur voort te gaan, sal jou gebruiker deur jou administrateur bestuur word, wat moontlik in staat sal wees om benewens jou persoonlike data ook geassosieerde data te berg.\n\nJou administrateur het die vermoë om instellings, toegang, programme en data wat met hierdie gebruiker geassosieer word, insluitend netwerkaktiwiteit en jou toestel se ligginginligting, te monitor en te bestuur."</string>
@@ -2916,9 +2977,9 @@
     <string name="data_usage_app_settings" msgid="5693524672522122485">"Programinstellings"</string>
     <string name="data_usage_app_restrict_background" msgid="5728840276368097276">"Agtergronddata"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2997942775999602794">"Aktiveer die gebruik van mobiele data op die agtergrond"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"Om agtergronddata vir hierdie program te beperk, moet jy eers \'n mobieldatalimiet stel."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"Om agtergronddata vir hierdie app te beperk, moet jy eers \'n mobieldatalimiet stel."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"Beperk agtergronddata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is.\n\nJy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Hierdie funksie kan veroorsaak dat \'n app wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is.\n\nJy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die app self beskikbaar is."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"Agtergronddata kan net beperk word as jy \'n mobieldatalimiet gestel het."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Moet die outomatiese sinkronisering van data aangeskakel word?"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Moet die outomatiese sinkronisering van data afgeskakel word?"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ontkoppel hierdie VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ontkoppel"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Weergawe"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Weergawe <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Vergeet VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vervang bestaande VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Stel altyd-aan VPN?"</string>
@@ -2971,7 +3033,7 @@
     <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Jy is reeds aan \'n VPN gekoppel. As jy aan \'n ander een koppel, sal jou bestaande VPN vervang word."</string>
     <string name="vpn_turn_on" msgid="3568307071295211187">"Skakel aan"</string>
     <string name="vpn_cant_connect_title" msgid="5670787575925519386">"<xliff:g id="VPN_NAME">%1$s</xliff:g> kan nie koppel nie"</string>
-    <string name="vpn_cant_connect_message" msgid="2139148820719163694">"Hierdie program steun nie altyd-aan VPN nie"</string>
+    <string name="vpn_cant_connect_message" msgid="2139148820719163694">"Hierdie app steun nie altyd-aan-VPN nie"</string>
     <string name="vpn_title" msgid="3068868814145870274">"VPN"</string>
     <string name="vpn_create" msgid="7546073242936894638">"Voeg VPN-profiel by"</string>
     <string name="vpn_menu_edit" msgid="5100387853773792379">"Redigeer profiel"</string>
@@ -2979,7 +3041,7 @@
     <string name="vpn_menu_lockdown" msgid="5284041663859541007">"Altydaan-VPN"</string>
     <string name="vpn_no_vpns_added" msgid="7387080769821533728">"Geen VPN\'e is bygevoeg nie"</string>
     <string name="vpn_always_on_summary" msgid="2171252372476858166">"Bly te alle tye aan VPN gekoppel"</string>
-    <string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"Nie gesteun deur hierdie program nie"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"Nie gesteun deur hierdie app nie"</string>
     <string name="vpn_always_on_summary_active" msgid="175877594406330387">"Altyd aan"</string>
     <string name="vpn_insecure_summary" msgid="4450920215186742859">"Nie veilig nie"</string>
     <string name="vpn_require_connection" msgid="1027347404470060998">"Blokkeer verbindings sonder VPN"</string>
@@ -3076,7 +3138,7 @@
     <string name="open_app_button" msgid="5025229765547191710">"Maak <xliff:g id="APP_NAME">%1$s</xliff:g> oop"</string>
     <string name="application_restrictions" msgid="276179173572729205">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Programme met beperkings"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Brei instellings vir program uit"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Brei instellings vir app uit"</string>
     <string name="user_choose_copy_apps_to_another_user" msgid="5914037067347012870">"Kies programme om te installeer"</string>
     <string name="user_copy_apps_menu_title" msgid="5354300105759670300">"Installeer beskikbare programme"</string>
     <string name="nfc_payment_settings_title" msgid="2043139180030485500">"Kontaklose betalings"</string>
@@ -3148,12 +3210,12 @@
     <string name="auto_data_switch_title" msgid="5862200603753603464">"Skakel outomaties oor na mobiele data"</string>
     <string name="auto_data_switch_summary" msgid="1934340931995429057">"Gebruik hierdie netwerk wanneer dit meer beskikbaar is"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"Werk-SIM"</string>
-    <string name="user_restrictions_title" msgid="4068914244980335993">"Program- en inhoudtoegang"</string>
+    <string name="user_restrictions_title" msgid="4068914244980335993">"App- en inhoudtoegang"</string>
     <string name="user_rename" msgid="8735940847878484249">"HERNOEM"</string>
-    <string name="app_restrictions_custom_label" msgid="6949268049087435132">"Stel program-beperkings"</string>
+    <string name="app_restrictions_custom_label" msgid="6949268049087435132">"Stel appbeperkings"</string>
     <string name="user_restrictions_controlled_by" msgid="2821526006742851624">"Beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Hierdie program kan toegang tot jou rekeninge kry"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Hierdie program het toegang tot jou rekeninge. Word beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Hierdie app kan toegang tot jou rekeninge kry"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Hierdie app het toegang tot jou rekeninge. Word beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="2630656989926554685">"Wi‑Fi en selfoon"</string>
     <string name="restriction_wifi_config_summary" msgid="920419010472168694">"Laat die wysiging van Wi‑Fi en mobiele instellings toe"</string>
     <string name="restriction_bluetooth_config_title" msgid="220586273589093821">"Bluetooth"</string>
@@ -3341,7 +3403,7 @@
     <string name="notification_volume_disabled_summary" msgid="8679988555852056079">"Onbeskikbaar omdat luitoon gedemp is"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"Foonluitoon"</string>
     <string name="notification_ringtone_title" msgid="6924501621312095512">"Verstekkennisgewingklank"</string>
-    <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Klank deur program verskaf"</string>
+    <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Klank deur app verskaf"</string>
     <string name="notification_sound_default" msgid="8630353701915294299">"Verstekkennisgewingklank"</string>
     <string name="alarm_ringtone_title" msgid="6680761007731764726">"Verstekwekkerklank"</string>
     <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Vibreer eers en lui dan geleidelik"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00-17:00 weeksdae\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalendergeleenthede"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is aktief}=2{{mode_1} en {mode_2} is aktief}=3{{mode_1}, {mode_2} en {mode_3} is aktief}other{{mode_1}, {mode_2} en nog # is aktief}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modus kan outomaties aanskakel}other{# modusse kan outomaties aanskakel}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Moenie Steur Nie}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2} {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AAN"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nie gestel nie"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Gedeaktiveer"</string>
@@ -3484,7 +3546,7 @@
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"Moenie Steur Nie bly aan tot <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"Moenie Steur Nie sal aan bly totdat jy dit afskakel"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"\'n Skedule (<xliff:g id="RULE_NAME">%s</xliff:g>) het Moenie Steur Nie outomaties aangeskakel"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"\'n Program <xliff:g id="APP_NAME">%s</xliff:g> het Moenie Steur Nie outomaties aangeskakel"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"\'n App <xliff:g id="APP_NAME">%s</xliff:g> het Moenie Steur Nie outomaties aangeskakel"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"Moenie Steur Nie is aan vir <xliff:g id="RULE_NAMES">%s</xliff:g> met gepasmaakte instellings."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="8255159194653341835">" "<annotation id="link">"Bekyk gepasmaakte instellings"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Net prioriteit"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Het dit"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Kennisgewings"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Tydsduur"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Boodskappe, geleenthede en onthounotas"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Klaar"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Instellings"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Geen visuele elemente of klank van kennisgewings af nie"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Geen klank van kennisgewings af nie"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Jy sal nie kennisgewings sien of hoor nie. Oproepe vanaf gesterde kontakte en herhaalbellers word toegelaat."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Huidige instelling)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Verander Moenie Steur Nie-kennisgewinginstellings?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Werkprofielklanke"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Gebruik persoonlike profiel se klanke"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Gebruik dieselfde klanke as jou persoonlike profiel"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Gaan ná ontsluiting direk na die skerm wat laas gebruik is. Kennisgewings sal nie op sluitskerm wys nie. Swiep van bo af na onder om hulle te sien."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sluitskerm, sluit skerm, slaan oor, systap"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Wanneer werkprofiel gesluit is"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalisme van sluitskermkennisgewing"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Wys minder kennisgewings op sluitskerm"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Wys net nuwe kennisgewings op sluitskerm"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Verwyder kennisgewings wat voorheen bekyk is outomaties van die sluitskerm"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Kennisgewings op sluitskerm"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Wys gesprekke, verstek en demp"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Wys gesprekke, verstek en stil"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Wys alle werkkennisgewinginhoud"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Versteek sensitiewe werkinhoud"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hoe wil jy hê moet profielkennisgewings wys wanneer jou toestel gesluit is?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profielkennisgewings"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Kennisgewings"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Appkennisgewings"</string>
@@ -3637,7 +3708,7 @@
     <string name="notification_silence_title" msgid="4085829874452944989">"Stil"</string>
     <string name="notification_alert_title" msgid="1632401211722199217">"Verstek"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Laat onderbrekings toe"</string>
-    <string name="allow_interruption_summary" msgid="9044131663518112543">"Laat die program \'n geluid maak, vibreer en/of kennisgewings op die skerm wys"</string>
+    <string name="allow_interruption_summary" msgid="9044131663518112543">"Laat die app \'n geluid maak, vibreer en/of kennisgewings op die skerm wys"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioriteit"</string>
     <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Wys boaan die gespreksafdeling, verskyn as \'n swewende borrel, wys profielfoto op sluitskerm"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> steun nie die meeste gesprekskenmerke nie. Jy kan nie \'n gesprek as prioriteit stel nie, en gesprekke sal nie as swewende borrels verskyn nie."</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Wanneer jy binne ’n kort tydperk baie kennisgewings kry, sal jou toestel vir tot 2 minute die volume sagter stel en waarskuwings minimeer. Oproepe, wekkers en prioriteitgesprekke word nie geraak nie. \n\nKennisgewings wat jy tydens demping kry, kan gekry word deur van die bokant van die skerm af te trek."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Pas toe op werkprofiele"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Pas toe op werkprofielapps"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Gebondelde kennisgewings"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aan"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Af"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Gebruik kennisgewingbondeling"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Kennisgewings met soortgelyke temas sal gedemp en saam gegroepeer word vir ’n stiller ervaring. Bondeling sal ’n app se eie kennisgewinginstellings tersydestel."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Geen geïnstalleerde apps het versoek om as VR-helperdienste te werk nie."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Gee <xliff:g id="SERVICE">%1$s</xliff:g> toegang tot VR-diens?"</string>
@@ -3703,7 +3779,7 @@
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"Verminder wasigheid (aanbeveel)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"Verminder flikker"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"Beeld-in-beeld"</string>
-    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Geen geïnstalleerde program steun beeld-in-beeld nie"</string>
+    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Geen geïnstalleerde app steun beeld-in-beeld nie"</string>
     <string name="picture_in_picture_keywords" msgid="3605379820551656253">"beeld-in-beeld-prent in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"Beeld-in-beeld"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Laat beeld-in-beeld toe"</string>
@@ -3741,7 +3817,7 @@
     <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Hierdie app stuur nie kennisgewings nie"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorieë"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Ander"</string>
-    <string name="no_channels" msgid="4716199078612071915">"Hierdie program het nie enige kennisgewings geplaas nie"</string>
+    <string name="no_channels" msgid="4716199078612071915">"Hierdie app het nie enige kennisgewings geplaas nie"</string>
     <string name="no_recent_channels" msgid="5068574296267584043">"Wys ongebruikte kategorieë"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"Bykomende instellings in die app"</string>
     <string name="show_unused_channels" msgid="4956292847964439078">"Wys ongebruikte kategorieë"</string>
@@ -3772,8 +3848,8 @@
     <string name="zen_mode_choose_rule_type" msgid="7656308563653982975">"Kies soort skedule"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"Vee \"<xliff:g id="RULE">%1$s</xliff:g>\"-reël uit?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"Vee uit"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Hierdie instellings kan nie nou onmiddellik verander word nie. \'n Program (<xliff:g id="APP_NAME">%1$s</xliff:g>) het Moenie Steur Nie outomaties aangeskakel met gepasmaakte gedrag."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Hierdie instellings kan nie nou onmiddellik verander word nie. \'n Program het Moenie Steur Nie outomaties aangeskakel met gepasmaakte gedrag."</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Hierdie instellings kan nie nou onmiddellik verander word nie. \'n App (<xliff:g id="APP_NAME">%1$s</xliff:g>) het Moenie Steur Nie outomaties aangeskakel met gepasmaakte gedrag."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Hierdie instellings kan nie nou onmiddellik verander word nie. \'n App het Moenie Steur Nie outomaties aangeskakel met gepasmaakte gedrag."</string>
     <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"Hierdie instellings kan nie nou onmiddellik verander word nie. Moenie Steur Nie is self aangeskakel met gepasmaakte gedrag."</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"Tyd"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"Geleentheid"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriteitgesprekke"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekke}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Gesprekke-instellings"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie kan onderbreek"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Selfs al kan boodskap- of oproepapps jou nie in kennis stel nie, kan mense wat jy hier kies jou steeds deur daardie apps bereik"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepe"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontakte-instellings"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Gesterde Kontakte-instellings"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Geen"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Geen"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Wekkers"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Geen apps 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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Werk)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Bereken tans …"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Appsinstellings"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Laat programme toe om te ignoreer"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps wat kan onderbreek"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Skep ’n modus"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Gepasmaakte modus"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Modusnaam"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Modusnaam kan nie leeg wees nie"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Kies ‘n ikoon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendergeleenthede"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Slaaptydroetine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Terwyl jy bestuur"</string>
@@ -4123,20 +4205,20 @@
     <string name="memory_maximum_usage" msgid="2047013391595835607">"Maksimum gebruik"</string>
     <string name="no_data_usage" msgid="4665617440434654132">"Geen data is gebruik nie"</string>
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"Laat toegang tot Moenie Steur Nie vir <xliff:g id="APP">%1$s</xliff:g> toe?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Die program sal Moenie Steur Nie aan of af kan skakel en veranderinge aan verwante instellings kan aanbring."</string>
+    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Die app sal Moenie Steur Nie aan of af kan skakel en veranderinge aan verwante instellings kan aanbring."</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Moet aangeskakel bly want kennisgewingtoegang is aan"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Herroep <xliff:g id="APP">%1$s</xliff:g> se toegang tot Moenie Steur Nie?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Alle Moenie Steur Nie-reëls wat deur hierdie program geskep is, sal verwyder word."</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Alle Moenie Steur Nie-reëls wat deur hierdie app geskep is, sal verwyder word."</string>
     <string name="zen_modes_access_warning_dialog_title" msgid="8372164559156809659">"Laat toegang tot Modusse toe vir <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_modes_access_warning_dialog_summary" msgid="2432178679607798200">"Die app sal Moenie Steur Nie kan aan- of afskakel, Modusse kan bestuur en aktiveer, en veranderinge aan verwante instellings kan aanbring."</string>
     <string name="zen_modes_access_revoke_warning_dialog_title" msgid="189454396436517964">"Herroep toegang tot Modusse vir <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_modes_access_revoke_warning_dialog_summary" msgid="4669243849023204217">"Alle modusse wat deur hierdie app geskep is, sal verwyder word."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Moenie optimaliseer nie"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimaliseer"</string>
-    <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Sal jou battery dalk vinniger laat afloop. Program sal nie meer beperk word om agtergrondbattery te gebruik nie."</string>
+    <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Sal jou battery dalk vinniger laat afloop. App sal nie meer beperk word om agtergrondbattery te gebruik nie."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Aanbeveel vir beter batterylewe"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"Geen"</string>
-    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Jou administrateur kan steeds datagebruik vir programme in jou werkprofiel naspoor selfs al skakel jy gebruikstoegang vir hierdie program af"</string>
+    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Jou administrateur kan steeds datagebruik vir apps in jou werkprofiel naspoor selfs al skakel jy gebruikstoegang vir hierdie app af"</string>
     <string name="draw_overlay" msgid="7902083260500573027">"Wys bo-oor ander apps"</string>
     <string name="system_alert_window_settings" msgid="6458633954424862521">"Wys bo-oor ander apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Laat toe dat dit bo-oor ander apps wys"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Volskermkennisgewings"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Laat volskermkennisgewings van hierdie app af toe"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Laat hierdie app toe om kennisgewings te wys wat die volle skerm beslaan wanneer die toestel gesluit is. Apps kan dit gebruik om wekkers, inkomende oproepe en ander dringende kennisgewings uit te lig."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Skryf stelselvoorkeure"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Laat hierdie app toe om stelselvoorkeure namens jou te wysig"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Hierdie toestemming laat ’n app toe om kernstelselvoorkeure te wysig."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Mediabestuurapps"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Laat app toe om media te bestuur"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Indien dit toegelaat word, kan hierdie app medialêers wat met ander apps geskep is, wysig of uitvee sonder om jou te vra. App moet toegang tot lêers en media hê."</string>
@@ -4193,7 +4278,7 @@
     <string name="disabled_by_policy_title_sms" msgid="8951840850778406831">"Kan nie SMS\'e stuur nie"</string>
     <string name="disabled_by_policy_title_camera" msgid="6616508876399613773">"Kan nie kamera gebruik nie"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6085100101044105811">"Kan nie skermskote neem nie"</string>
-    <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan nie hierdie program oopmaak nie"</string>
+    <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan nie hierdie app oopmaak nie"</string>
     <string name="disabled_by_policy_title_financed_device" msgid="2328740314082888228">"Geblokkeer deur jou kredietverskaffer"</string>
     <string name="disabled_by_policy_title_biometric_parental_consent" msgid="2463673997797134678">"Ouer word benodig"</string>
     <string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"Gee die foon vir jou ouer om dit te begin opstel"</string>
@@ -4365,7 +4450,7 @@
     <string name="page_tab_title_support" msgid="3235725053332345773">"Wenke en steundiens"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="4718916765158062108">"Geen geïnstalleerde apps het Premium-SMS versoek nie"</string>
-    <string name="premium_sms_warning" msgid="2192300872411073324">"Betaalde SMS\'e kan jou geld kos en die koste sal by jou diensverskafferfakture gevoeg word. As jy toestemming vir \'n program aktiveer, sal jy betaalde SMS\'e met daardie program kan stuur."</string>
+    <string name="premium_sms_warning" msgid="2192300872411073324">"Betaalde SMS\'e kan jou geld kos en die koste sal by jou diensverskafferfakture gevoeg word. As jy toestemming vir \'n app aktiveer, sal jy betaalde SMS\'e met daardie app kan stuur."</string>
     <string name="premium_sms_access" msgid="8487315743197916530">"Premium-SMS"</string>
     <string name="bluetooth_disabled" msgid="835838280837359514">"Af"</string>
     <string name="bluetooth_connected_summary" msgid="8043167194934315712">"Gekoppel aan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gebare"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Maak kamera vinnig oop"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Druk die aan/af-skakelaar twee keer om die kamera vinnig oop te maak. Dit werk op enige skerm."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Draai kamera om vir selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigasiemodus"</string>
@@ -4481,7 +4580,7 @@
     <string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"Jou toegang tot hierdie toestel"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="3963070078195245028">"Data wat met jou werkrekening geassosieer word, soos e-pos en kalender"</string>
     <string name="enterprise_privacy_installed_packages" msgid="6707006112254572820">"Lys programme op jou toestel"</string>
-    <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Hoeveelheid tyd en data wat in elke program bestee is"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Hoeveelheid tyd en data wat in elke app bestee is"</string>
     <string name="enterprise_privacy_network_logs" msgid="3081744541193695887">"Mees onlangse netwerkverkeer-loglêer"</string>
     <string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"Mees onlangse foutverslag"</string>
     <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Mees onlangse sekuriteitloglêer"</string>
@@ -4564,7 +4663,7 @@
     <string name="storage_trash_dialog_confirm" msgid="1707723334982760436">"Maak asblik leeg"</string>
     <string name="storage_usage_summary" msgid="4591121727356723463">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g> gebruik"</string>
     <string name="storage_total_summary" msgid="7163360249534964272">"Altesaam <xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="UNIT">%2$s</xliff:g>"</string>
-    <string name="clear_instant_app_data" msgid="5951258323364386357">"Maak program skoon"</string>
+    <string name="clear_instant_app_data" msgid="5951258323364386357">"Maak app skoon"</string>
     <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Wil jy hierdie kitsprogram verwyder?"</string>
     <string name="launch_instant_app" msgid="8503927414339606561">"Maak oop"</string>
     <string name="game_storage_settings" msgid="2521393115726178837">"Speletjies"</string>
@@ -4583,7 +4682,7 @@
     <string name="credman_button_change" msgid="4072629639218503790">"Verander"</string>
     <string name="credman_button_open" msgid="7519871964170816850">"Maak oop"</string>
     <string name="credman_app_list_preference_none" msgid="2509646651254971448">"Niks is gekies nie"</string>
-    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Maak seker dat jy hierdie program vertrou&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Outovul&gt;%1$s&lt;/xliff:g&gt; gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
+    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Maak seker dat jy hierdie app vertrou&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Outovul&gt;%1$s&lt;/xliff:g&gt; gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
     <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"&lt;b&gt;Gebruik &lt;xliff:g id=app_name example=Provider&gt;%1$s&lt;/xliff:g&gt;?&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; Nuwe wagwoorde, toegangsleutels en ander inligting sal van nou af hier gestoor word. &lt;xliff:g id=app_name example=Provider&gt;%1$s&lt;/xliff:g&gt; kan dalk gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
     <string name="credman_picker_title" msgid="8442086614222006564">"Voorkeurdiens vir wagwoorde, toegangsleutels en outovul"</string>
     <string name="credman_confirmation_message_title" msgid="8847900085593880729">"Skakel %1$s af?"</string>
@@ -4627,10 +4726,10 @@
     <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="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>
-    <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"Geen ANGLE-gekativeerde program gestel nie"</string>
-    <string name="angle_enabled_app_set" msgid="7811829383833353021">"ANGLE-geaktiveerde program: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Wys dialoog elke keer as \'n app omval"</string>
+    <string name="angle_enabled_app" msgid="6044941043384239076">"Kies ANGLE-geaktiveerde app"</string>
+    <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"Geen ANGLE-geaktiveerde app gestel nie"</string>
+    <string name="angle_enabled_app_set" msgid="7811829383833353021">"ANGLE-geaktiveerde app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Grafikadrywervoorkeure"</string>
     <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Wysig grafikadrywerinstellings"</string>
     <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Wanneer daar veelvuldige grafikadrywers is, kan jy kies om die opgedateerde grafikadrywer te gebruik vir programme wat op die toestel geïnstalleer is."</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellietboodskappe"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Stuur en ontvang teksboodskappe via satelliet. Ingesluit by jou rekening."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Stuur en ontvang teksboodskappe via satelliet. Nie by jou rekening ingesluit nie."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellietboodskappe"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Meer oor satellietboodskappe"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Jy kan as deel van ’n kwalifiserende <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-rekening teksboodskappe via satelliet stuur en ontvang."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Jou <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-pakket"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellietboodskappe is by jou rekening ingesluit"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellietboodskappe is nie by jou rekening ingesluit nie"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Kry meer inligting"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Hoe dit werk"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Jou foon sal outomaties aan ’n satelliet verbind. Vir die beste verbinding, maak seker jy kan die lug duidelik sien."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Nadat jou foon aan ’n satelliet verbind"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Jy kan ’n teksboodskap na enigiemand stuur, insluitend nooddienste. Jou foon sal weer aan ’n selnetwerk verbind wanneer dit beskikbaar is."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellietboodskappe kan langer neem en is net in sekere gebiede beskikbaar. Die weer en sekere strukture kan jou satellietverbinding affekteer. Satellietoproepe is nie beskikbaar nie. Noodfoonoproepe kan steeds verbind.\n\nDit kan \'n tyd neem vir rekeningveranderinge om te wys in Instellings. Kontak jou diensverskaffer vir besonderhede"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Meer oor satellietboodskappe"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Kan nie <xliff:g id="FUNCTION">%1$s</xliff:g> aanskakel nie"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Beëindig eers die satellietverbinding om <xliff:g id="FUNCTION">%1$s</xliff:g> aan te skakel."</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellietkonnektiwiteit"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Toegangspuntname"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Onbeskikbaar wanneer gekoppel aan <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4905,7 +5054,7 @@
     <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>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Probeer weer"</string>
-    <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Iets het voorgeval. Die program het die versoek gekanselleer om \'n toestel te kies."</string>
+    <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Iets het voorgeval. Die app het die versoek gekanselleer om \'n toestel te kies."</string>
     <string name="network_connection_connect_successful" msgid="2587314077675642476">"Verbinding suksesvol"</string>
     <string name="network_connection_connect_failure" msgid="6803313816657494319">"Kon nie koppel nie"</string>
     <string name="network_connection_request_dialog_showall" msgid="6392059758456994944">"Wys alles"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Jy is in die 16 KB-modus van die niebladgebonde modus. Die sagteware se integriteit kan nie in hierdie modus gewaarborg word nie, en enige data wat op die foon gestoor word terwyl die selflaaiprogram ontsluit is, is dalk in gevaar. Sommige kenmerke sal gedeaktiveer word in hierdie modusse, so sommige apps sal dalk nie werk nie. Jy moet terugskakel na 4 KB-modus en dan die selflaaiprogram van die toestel sluit om weer in die produksiemodus te gaan. Dit sal weer ’n fabriekterugstelling op die toestel doen en dit na produksie-instellings terugstel. Jy moet die OEM-ontsluiting in Ontwikkelaaropsies deaktiveer nadat die toestel suksesvol in Android geselflaai het. As die toestel nie in Android kon selflaai nie of onstabiel is, moet jy die toestel herflits met die jongste fabriekstelselkopie vanaf &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; of gebruik &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; en kies “Vee toestel skoon”, “Sluit selflaaiprogram” en “Verpligflits alle afdelings”."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB-bladsy-agnostiese modus"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lees meer"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Laat loop app met bladsygrootte-versoenbaarheidmodus"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Foutverslaghanteerder"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Bepaal watter program die Foutverslag-kortpad op jou toestel hanteer."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Persoonlik"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Luister na stroom"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skandeer ’n oudiostroom-QR-kode om op <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te luister"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Kan nie wagwoord wysig terwyl daar gedeel word nie. Skakel eers oudiodeling af om die wagwoord te verander."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Jou wagwoord moet 4-16 karakters bevat en net letters, syfers en simbole gebruik"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kodeskandeerder"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Het jy hulp nodig?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Soekinstellings"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakte, berging, rekening"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakte-berging"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Net toestel"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nuwe kontakte sal nie met ’n rekening gesinkroniseer word nie"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakte sal by verstek op jou toestel gestoor en met jou rekening gesinkroniseer word"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Daar was ’n fout met die stel van die verstekrekening"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Geen verstek gestel nie"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Net toestel"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Toestel en %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg ’n rekening by om te begin"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Waar om kontakte te stoor"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Omkring en Soek"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Raak en hou die Tuisknoppie of die navigasiehandvatsel om met gebruik van die inhoud op jou skerm te soek."</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f2996acd007..d0a748b9694 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"የበረዶ ቅንጣት"</item>
     <item msgid="7952183800501346803">"የባህር ዳርቻ ዣንጥላ"</item>
     <item msgid="799139025758265891">"የሥራ ቦታ መሣሪያዎች"</item>
-    <item msgid="1330084588359129896">"ድንኳን"</item>
+    <item msgid="8112685757657659269">"ፒያኖ"</item>
     <item msgid="3861584909935022342">"የፊልም ሪል"</item>
     <item msgid="5827426100157335512">"መጽሐፍ"</item>
     <item msgid="8585828346253128384">"የሎተስ አበባ"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8bad9829e32..085b275ab0f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ብሉቱዝ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ነገ በራስ-ሰር ያብሩ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ብሉቱዝ ካጠፉ በቀጣዩ ቀን እንደገና ይበራል"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"የቀኝ ጆሮን ያጣምሩ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"የግራ ጆሮን ያጣምሩ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ሌላውን ጆሮዎን ያጣምሩ"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"የብሉቱዝ LE ኦዲዮን ያሰናክሉ"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"መሣሪያው የLE ኦዲዮ ሃርድዌር ችሎታዎችን የሚደግፍ ከሆነ የብሉቱዝ ኦዲዮ ባህሪን ያሰናክላል።"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"የብሉቱዝ LE ኦዲዮ ሁነታ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ብሉቱዝ LE ኦዲዮ ሥርጭት ዩአይ ቅድመ ዕይታን ያንቁ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"የግል የድምፅ ማጋራትን እና የግል ሥርጭትን ጨምሮ የLE ኦዲዮ ማጋራት ዩአይ ቅድመ ዕይታን ያነቃል"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"በመሣሪያ ዝርዝሮች ውስጥ LE ኦዲዮ መቀያየሪያን አሳይ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"የብሉቱዝ LE ኦዲዮ የተፈቀዱ ዝርዝርን እለፍ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE ኦዲዮ ተቀጥላ የተፈቀዱ ዝርዝር መስፈርቶችን እንደሚያሟላ ባይረጋገጥም እንኳን LE ኦዲዮን በነባሪ መጠቀም።"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"የመተግበሪያ ቋንቋ"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"የተጠቆሙ ቋንቋዎች"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ሁሉም ቋንቋዎች"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"በአስተያየት የተጠቆሙ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ሁሉም ቋንቋዎች"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ሁሉም ክልሎች"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ሁሉም የቁጥር አሰጣጥ ሥርዓቶች"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"የስርዓት ቋንቋ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"የሥርዓት ነባሪ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ለዚህ መተግበሪያ የቋንቋ መረጣ ከቅንብሮች አይገኝም።"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ለውጥ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s አይገኝም"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ይህ ቋንቋ እንደ የስርዓት ቋንቋ ጥቅም ላይ መዋል አይችልም ግን ለመተግበሪያዎች እና ድር ጣቢያዎች ይህን ቋንቋ እንደሚመርጡ አሳውቀዋል።"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ፈልግ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ቋንቋ ያክሉ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"የክልል ምርጫ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"የቋንቋ ስም ይተይቡ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ተጨማሪ የቋንቋ ቅንብሮች"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ክልላዊ ምርጫዎች"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"አሃዶች እና የቁጥር ምርጫዎችን ያቀናብሩ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"መተግበሪያዎች ተሞክሮዎን ግላዊነት ማላበስ ይችሉ ዘንድ የእርስዎን ክልላዊ ምርጫዎች ያሳውቋቸው።"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"በሚቻልበት ቦታ ላይ መተግበሪያዎች የእርስዎን ክልላዊ ምርጫዎች ይጠቀማሉ።"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ክልላዊ ምርጫዎች"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"የሙቀት መጠን"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"የሳምንቱ የመጀመሪያ ቀን"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"የቁጥሮች አማራጮች"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_disable" msgid="729512894708689604">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"የዝውውር ክፍያዎች ሊተገበሩ ይችላሉ።"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ጊዜን በራስ-ሰር ያቀናብሩ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"በራስ-ሰር አቀናብር"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ይህ መቀያየሪያ ሲበራ አካባቢ የጊዜ ሰቁን ለማቀናበር ጥቅም ላይ ይውላል"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ራስ-ሰር ቀን እና ሰዓት"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"አውታረ መረቡን እና ገመድ አልባ ምልክቶችን በመጠቀም በራስ-ሰር ያቀናብሩ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ራስ-ሰር የሰዓት ሰቅ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"በአቅራቢያዎ ባሉ የተንቀሳቃሽ ስልክ አውታረ መረቦች መሰረት በራስ-ሰር ያቀናብሩ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"የሚገኝ ከሆነ የመሣሪያዎን አካባቢ በመጠቀም በራስ-ሰር ያቀናብሩ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"የቋንቋ ነባሪ ይጠቀሙ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 ሰዓት ቅርፀት ተጠቀም"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ሰዓት"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ጣትዎን ያንሱ፣ ከዚያ በድጋሚ ዳሳሽ ይንኩ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"የጣት አሻራ ዳሳሽን መጠቀም አይቻልም"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"የጥገና አገልግሎት ሰጪን ይጎብኙ።"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ማያ ገፅ ጠፍቶ በጣት አሻራ መክፈቻ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ማያ ገፁ በሚጠፋበት ጊዜ እንኳን በጣት አሻራ መክፈቻ ይጠቀሙ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ማያ ገፅ ጠፍቷል፣ ክፈት"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ተጨማሪ የደህንነት ቅንብሮች"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"የስራ መገለጫ መቆለፊያ፣ ምስጠራ እና ሌሎችም"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ምስጠራ፣ የመግቢያ ማስረጃዎች እና ሌሎችም"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ለግል ቦታዎ የሚሆን ስርዓተ ጥለት ያዘጋጁ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ቆልፍ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ደብቅ"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"የግል ቦታ ሥርዓተ ጥለትዎን ያረጋግጡ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"የግል ቦታ ፒንዎን እንደገና ያስገቡ"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"የግል ቦታ የይለፍ ቃልዎን እንደገና ያስገቡ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ የጣት አሻራዎችን ማከል ይችላሉ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"የሚፈቀደውን ከፍተኛ የጣት አሻራ ብዛት አክለዋል"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ተጨማሪ የጣት አሻራዎችን ማከል አይቻልም"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"በርቷል"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ጠፍቷል"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ውጫዊ ማሳያ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"አብሮገነብ ማሳያ"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ውጫዊ ማሳያ ይጠቀሙ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"የማሳያ ጥራት"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"የውጫዊ ማሳያ ግንኙነት ተቋርጧል"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ማዞር ወይም ጥራትን መለወጥ በአሁኑ ጊዜ እየሄዱ ያሉ ማናቸውንም መተግበሪያዎች ሊያቆም ይችላል"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ማያ ገፅዎን ለማንጸባረቅ መሣሪያዎ ከውጫዊ ማሳያ ጋር መገናኘት አለበት"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ተጨማሪ አማራጮች"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ማሳያዎችን ዳግም ለመደርደር ይያዙ እና ይጎትቱ።"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"መስታወት"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"የይለፍ ቃሉን ይፈትሹ እና እንደገና ይሞክሩ"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"የመሣሪያውን አምራች ያነጋግሩ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ግንኙነትን ይፈትሹና እንደገና ይሞክሩ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ይህ የWi‑Fi አውታረ መረብ በአሁን ጊዜ አይገኝም"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"እዚህ QR ኮድ ላይ ችግር አለ። በሌላ መንገድ ለመገናኘት ይሞክሩ።"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"አውታረ መረብ ይምረጡ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"የእርስዎን መሣሪያ ለማገናኘት አውታረ መረብ ይምረጡ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"ይህ መሣሪያ ወደ «<xliff:g id="SSID">%1$s</xliff:g>» ይታከል?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ስለራስ-አዙር የበለጠ ይረዱ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"የማያ ገፅ ጥራት"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ከፍተኛ ጥራት"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ሙሉ ጥራት"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ሙሉ ጥራት የባትሪዎን ተጨማሪ ይጠቀማል። ጥራትዎን መቀየር አንዳንድ መተግበሪያዎች እንደገና እንዲጀምሩ ሊያስደርግ ይችላል።"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"ከፍተኛው ጥራት"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"ከፍተኛው ጥራት የባትሪዎን ተጨማሪ ይጠቀማል። ጥራትዎን መቀየር አንዳንድ መተግበሪያዎች እንደገና እንዲጀምሩ ሊያስደርግ ይችላል።"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ተመርጧል"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ቀለማት"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ተፈጥሯዊ"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ተለማማጅ"</string>
     <string name="brightness" msgid="6216871641021779698">"የብሩህነት ደረጃ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ተለማማጅ ብሩህነት"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"ስለ ተለዋዋጭ ብሩህነት"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"የማያዎ ብሩህነት በራስ-ሰር ከእርስዎ አካባቢ እና እንቅስቃሴዎች ጋር ጋር ይስተካከላል። ተለማማጅ ብሩህነት ምርጫዎችዎን እንዲያውቅ ለማገዝ ተንሸራታቹን ራስዎ ማንቀሳቀስ ይችላሉ።"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"አብራ"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ጠፍቷል"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"የመኝታ ሰዓት ሁነታ ቅንብሮች"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ሁነታዎች እንዲሁም ጠቆር ያለ ገጽታን ማንቃት ይችላሉ}=1{{mode_1} እንዲሁም ጠቆር ያለ ገጽታን ያነቃል}=2{{mode_1} እና {mode_2} እንዲሁም ጠቆር ያለ ገጽታን ያነቃሉ}=3{{mode_1}፣ {mode_2} እና {mode_3} እንዲሁም ጠቆር ያለ ገጽታን ያነቃሉ}one{{mode_1}፣ {mode_2} እና # ሌላ እንዲሁም ጠቆር ያለ ገጽታን ያነቃሉ}other{{mode_1}፣ {mode_2} እና # ሌሎችም እንዲሁም ጠቆር ያለ ገጽታን ያነቃሉ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"የሁነታዎች ቅንብሮች"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"የበለጠ ይደብዝዝ"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ተጨማሪ ደብዛዛ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"መሣሪያው ከወትሮው እንዲደበዝዝ ይፍቀዱለት"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ማያ ጊዜው እረፍት"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"የአካባቢ አገልግሎቶች"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"የአካባቢ አገልግሎቶች"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"አካባቢን ተጠቀም"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"አካባቢን ለሰዓት ሰቅ ተጠቀም"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"የጊዜ ሰቁን በራስ-ሰር ማቀናበር አልተቻለም"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"አካባቢ ወይም የአካባቢ አገልግሎቶች ጠፍተዋል"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"የአካባቢ ቅንብሮች"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ይህን ጠግን"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ይቅር"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ራስ-ሰር የሰዓት ሰቅ ጠፍቷል"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ራስ-ሰር የሰዓት ሰቅ በሚጠፋበት ጊዜ አይገኝም"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"የሰዓት ሰቅን ለማቀናበር አካባቢ ሥራ ላይ ሊውል ይችላል"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"የመሣሪያዎ አካባቢ የሚገኝ ከሆነ የእርስዎን የሰዓት ሰቅ ለማቀናበር ጥቅም ላይ ሊውል ይችላል"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"የሕግ መረጃ፣ኹነታ፣ የሶፍትዌር ሥሪት እይ"</string>
     <string name="legal_information" msgid="7509900979811934843">"የህግ መረጃ"</string>
     <string name="manual" msgid="3651593989906084868">"መመሪያ"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"አማራጮች"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ተደራሽነት"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"አካላዊ ቁልፍ ሰሌዳ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"የመንጠሪያ ቁልፎች"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"ቁልፍ ሰሌዳው በ<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ሚሊሰከንድ ውስጥ ተመሳሳዩ ቁልፍ በፍጥነት መጫኑን ችላ ይላል"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ቁልፍ ሰሌዳው ተመሳሳዩ ቁልፍ በፍጥነት መጫኖችን ችላ ይላል"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"የወጡ ቁልፎች መባቻ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"የቁልፍ ሰሌዳዎ ተደጋጋሚ የቁልፍ መጫኖችን ችላ የሚልበትን የቆይታ ጊዜ ይምረጡ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2ሰ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4ሰ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6ሰ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ብጁ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ብጁ እሴት"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ቀርፋፋ ቁልፎች"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"የቁልፍ መጫን ለማግበር የሚወስደውን ጊዜ ወደ <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ሚሊሰከንድ ያስተካክላል"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"የቁልፍ መጫኖችን ለማግበር የሚወስደውን ጊዜ ያስተካክላል"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ተጣባቂ ቁልፎች"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"አቋራጮችን ለማግኘት ቁልፎችን በአንድ ላይ ከመያዝ ይልቅ ቁልፎችን አንድ በአንድ ይጫኑ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"የመዳፊት ቁልፎች"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"መዳፊቱን ለመቆጣጠር አካላዊ የቁልፍ ሰሌዳውን ይጠቀሙ።"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"የመዳፊት ቁልፎችን ይጠቀሙ"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ነጥቦቹን ለመቆጣጠር የቁልፍ ሰሌዳዎን ይጠቀሙ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"የመዳፊት ወደኋላ መሸብለል"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ገፁን ወደ ታች ለማንቀሳቀስ ወደ ላይ ይሸብልሉ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"የግራ እና የቀኝ አዝራሮችን ያለዋውጡ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"የግራ የመዳፊት አዝራሩን እንደ የእርስዎ ቀኝ ይጠቀሙ"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"የ<xliff:g id="KEYBOARD_NAME">%s</xliff:g> መዳፊት ቁልፎች"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"የመዳፊት ጠቋሚን ለማንቀሳቀስ የ<xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ቁልፎችን ይጠቀሙ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ዋናውን የመዳፊት አዝራር ጠቅ ለማድረግ የ<xliff:g id="CLICK_LABEL">%s</xliff:g> ቁልፍን ይጠቀሙ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ዋናውን የመዳፊት አዝራር ተጭነው ለመያዝ የ<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ቁልፍን ይጠቀሙ"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ዋናውን የመዳፊት አዝራር ለመልቀቅ የ<xliff:g id="RELEASE_LABEL">%s</xliff:g> ቁልፍን ይጠቀሙ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"የሸብልል ሁነታን ለመቀያየር <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>ን ይጠቀሙ። ይህ የ<xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ቁልፎች ዕይታውን ወደላይ፣ ወደታች፣ ወደግራ ወይም ወደቀኝ ይሸብልሉታል"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ሁለተኛውን የመዳፊት አዝራር ጠቅ ለማድረግ የ<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ቁልፍን ይጠቀሙ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"የቁልፍ ሰሌዳ አቋራጮች"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"የአቋራጭ ዝርዝርን አሳይ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"የሥራ መገለጫ የቁልፍ ሰሌዳዎች እና መሣሪያዎች"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ነባሪ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"የመዳሰሻ ሰሌዳ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"የመዳሰሻ ሰሌዳ እና መዳፊት"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"መዳፊት"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"የጠቋሚ ፍጥነት፣ ምልክቶች"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ጠቅ ለማድረግ መታ ያድርጉ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"መታ አድርጎ መጎተት"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"የታችኛው ቀኝ ጠቅታ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ለተጨማሪ አማራጮች የመዳሰሻ ሰሌዳውን የታችኛው ቀኝ ጠርዝ ጠቅ ያድርጉ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"የጠቋሚ ፍጥነት"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ባለ ሦስት ጣት መታ ማድረግ ይጠቀሙ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"የጠቋሚ ቀለም"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"የጠቋሚ ሙሌት ቅጥን ወደ ጥቁር ይለውጡ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"የጠቋሚ ሙሌት ቅጥን ወደ አረንጓዴ ይለውጡ"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"የመዳሰሻ ሰሌዳ ምልክቶችን ይወቁ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"የመከታተያ ፓድ፣ የትራክ ፓድ፣ መዳፊት፣ ጠቋሚ፣ ሸብልል፣ ማንሸራተት፣ የቀኝ ጠቅታ፣ ጠቅ ያድርጉ፣ ጠቋሚ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"የቀኝ ጠቅታ፣ መታ ያድርጉ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"የመካከል ጠቅታ"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"የማስጀመር ረዳት"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ወደ መነሻ ሂድ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ወደኋላ ተመለስ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"የቅርብ ጊዜ መተግበሪያዎችን አሳይ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ወደ መነሻ ይሂዱ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"በመዳሰሻ ሰሌዳዎ ማንኛውም ቦታ ላይ በሦስት ጣቶች ወደ ላይ ያንሸራትቱ"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ይመለሱ"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ለ<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> አዲስ ቁልፍ ይምረጡ፦"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"የአካላዊ ቁልፍ ሰሌዳ ተደራሽነት"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ተለጣፊ ቁልፎች፣ አንጥር ቁልፎች፣ የመዳፊት ቁልፎች"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"የሚደጋገሙ አዝራሮች"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ከመድገም በፊት አዘግይ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"የድግግሞሽ ፍጥነት"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"አንድ አዝራር እስከሚለቀቅ ድረስ ቁምፊውን ለመደጋገም አዝራሩን ተጭነው ይያዙ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"የ<xliff:g id="IME_LABEL">%s</xliff:g> አቀማመጥ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ነባሪ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ራስ-ሰር፦ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ቅድመ-ዕይታ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"መደበኛ አማራጮች"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ቋንቋ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"የፅሁፍ መጠን"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"የመግለጫ ጽሁፍ መጠን"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"የመግለጫ ጽሁፍ ቅጥ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ብጁ አማራጮች"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"የጀርባ ቀለም"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"የኃይል አጠቃቀም አስተካክል"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"የታከሉ አካታቾች"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"መተግበሪያዎች በመደበኝነት እያሄዱ ናቸው"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ባትሪውን መተካት ይመከራል"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"የባትሪ አቅም እና የኃይል መሙላት አፈጻጸም ተቀንሰዋል እና ባትሪን መተካት ይመከራል።"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"የባትሪ ደረጃ ዝቅተኛ ነው"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"የባትሪ ዕድሜን ለማራዘም የባትሪ ቆጣቢን ያብሩ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"የባትሪ ዕድሜን ያሻሽሉ"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"የዚህ ቪፒኤን ግንኙነት ይቋረጥ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ግንኙነት አቋርጥ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ስሪት"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ሥሪት <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNን እርሳ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"አሁን ያለው VPN ይተካ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ሁልጊዜ-የበራ VPN ይቀናበር?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"«9 ጠዋት - 5 ከሰዓት የሥራ ቀናት»"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"የቀን መቁጠሪያ ክስተቶች"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ገቢር ነው}=2{{mode_1} እና {mode_2} ገቢር ናቸው}=3{{mode_1}፣ {mode_2} እና {mode_3} ገቢር ናቸው}one{{mode_1}፣ {mode_2} እና # ተጨማሪ ገቢር ናቸው}other{{mode_1}፣ {mode_2} እና # ተጨማሪ ገቢር ናቸው}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ሁነታ በራስ ሰር መብራት ይችላል}one{# ሁነታ በራስ ሰር መብራት ይችላል}other{# ሁነታዎች በራስ ሰር መብራት ይችላሉ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{አትረብሽ}=1{{mode_1}}=2{{mode_1}፣ {mode_2}}one{{mode_1}፣ {mode_2}፣ {mode_3}}other{{mode_1}፣ {mode_2}፣ {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"በርቷል"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"አልተቀናበረም"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ተሰናክሏል"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ገብቶኛል"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ማሳወቂያዎች"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"የቆይታ ጊዜ"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"መልዕክቶች፣ ክስተቶች እና አስታዋሾች"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ተከናውኗል"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ቅንብሮች"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምፅ የለም"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ከማሳወቂያዎች ምንም ድምፅ የለም"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ማሳወቂያዎችን አያዩም ወይም አይሰሙም። ኮከብ ከተደረገባቸው እውቂያዎች የሚመጡ ጥሪዎች እና ድጋሚ ደዋዮች ይፈቀዳሉ።"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(የአሁን ቅንብር)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"የአትረብሽ ማሳወቂያ ቅንብሮች ይቀየሩ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"የስራ መገለጫ ድምጾች"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"የግል መገለጫ ድምጾችን ይጠቀሙ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"እንደ የግል መገለጫዎ ያለ ተመሳሳይ ድምፆችን ይጠቀሙ"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ከከፈቱ በኋላ በቀጥታ መጨረሻ ላይ ሥራ ላይ ወደዋለው ማያ ገፅ ይሂዱ። ማሳወቂያዎች በማያ ገፅ ቁልፍ ላይ አይታዩም። እነርሱን ለማየት ከላይ ወደታች ያንሸራትቱ።"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"የማያ ገፅ ቁልፍ፣ የማያ ገፅ ቁልፍ፣ ዝለል፣ እለፍ"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"የሥራ መገለጫ ሲቆለፍ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"የማያ ገፅ ቁልፍ ማሳወቂያ አነስተኛ አጠቃቀም"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ማያ ገፅ ቁልፍ ላይ በቁጥር ያነሱ ማሳወቂያዎችን አሳይ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"በማያ ገፅ ቁልፍ ላይ አዲስ ማሳወቂያዎችን ብቻ ያሳዩ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ከዚህ ቀደም የታዩ ማሳወቂያዎችን ከማያ ገፅ ቁልፍ ያስወግዱ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"በማያ ገፅ ቁልፍ ላይ ማሳወቂያዎች"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ውይይቶችን፣ ነባሪን እና ጸጥ ያሉትን አሳይ"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ጸጥ ያሉ ውይይቶችን እና ማሳወቂያዎችን አሳይ"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ሚስጥራዊነት ያለው የስራ ማሳወቂያ ይዘት አሳይ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"አደጋ ሊያስከትል የሚችል የሥራ ይዘትን ደብቅ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"የእርስዎ መሣሪያ የተቆለፈ ሲሆን እንዴት ነው ማሳወቂያዎችዎ እንዲታዩ የሚፈልጉት?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"በአጭር ጊዜ ውስጥ ብዙ ማሳወቂያዎች ሲያገኙ መሣሪያዎ ለ2 ደቂቃዎች ያህል የድምፅ መጠኑን ይቀንሳል እና ማንቂያዎችን ያሳንሳል። ጥሪዎች፣ ማንቂያዎች እና የቅድሚያ ውይይቶች ተጽዕኖ አያድርባቸውም። \n\nበረጋ ማለቱ ወቅት የደረሱ ማሳወቂያዎች ከማያ ገፁ አናት ላይ ወደታች በመጎተት ሊገኙ ይችላሉ።"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"የሥራ መገለጫዎች ላይ ይተግብሩ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ለሥራ መገለጫ መተግበሪያዎች ያመልክቱ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"የተቀረቀቡ ማሳወቂያዎች"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"በርቷል"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ጠፍቷል"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"የማሳወቂያ ቅርቅብ ማዘጋጀትን ይጠቀሙ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ተመሳሳይ ገጽታ ያላቸው ማሳወቂያዎች ጸጥ እንዲሉ እና ጸጥ ላለ ተሞክሮ በአንድ ላይ ይቦደናሉ። ቅርቅብ ማዘጋጀት የመተግበሪያውን የማሳወቂያ ቅንብሮች ይሽራል።"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"የምናባዊ ዕውነታ አጋዥ አገልግሎቶች"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ምንም የተጫኑ መተግበሪያዎች እንደ የምናባዊ ዕውነታ አጋዥ አገልግሎቶች ሆነው እንዲሄዱ አልጠየቁም።"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ለ<xliff:g id="SERVICE">%1$s</xliff:g> የምናባዊ ዕውነታ መዳረሻ ይፈቀድለት?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ቅድሚያ የሚሰጣቸው ውይይቶች"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ምንም"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ምንም}=1{1 ውይይት}one{# ውይይቶች}other{# ውይይቶች}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"የውይይቶች ቅንብሮች"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ማን አቋርጦ መግባት ይችላል"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ምንም እንኳን የመልዕክት መላላኪያ ወይም የመደወያ መተግበሪያዎች እርስዎን ማሳወቅ ባይችሉም፣ እዚህ የሚመርጧቸው ሰዎች አሁንም በእነዚያ መተግበሪያዎች ሊያገኙዎት ይችላሉ።"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ጥሪዎች"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ማንኛውም ሰው"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"እውቂያዎች"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ባለኮከብ ዕውቂያዎች"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"የዕውቂያዎች ቅንብሮች"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ኮከብ የተደረገባቸው ዕውቂያዎች ቅንብሮች"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ምንም"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ምንም"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ማንቂያዎች"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ሥራ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"በማስላት ላይ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"የመተግበሪያዎች ቅንብሮች"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"መተግበሪያዎች እንዲሽሩ ይፍቀዱ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"አቋርጠው መግባት የሚችሉ መተግበሪያዎች"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ሁነታ ይፍጠሩ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ብጁ ሁነታ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"የሁነታ ስም"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"የሁነታ ስም ባዶ መሆን አይችልም"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"አንድ አዶ ይምረጡ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"የቀን መቁጠሪያ ክስተቶች"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"የመኝታ ሰዓት የዕለት ተዕለት ተግባር"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"እየነዱ ሳለ"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"የሙሉ መስኮት ማሳያ ማሳወቂያዎች"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ከዚህ መተግበሪያ የሙሉ መስኮት ማሳያ ማሳወቂያዎችን ይፍቀዱ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ይህ መተግበሪያ መሣሪያው በሚቆለፍበት ጊዜ ሙሉ ገጽ ዕይታውን የሚይዙ ማሳወቂያዎችን እንዲያሳይ ይፍቀዱለት። መተግበሪያዎች ማንቂያዎችን፣ ገቢ ጥሪዎችን ወይም ሌሎች አስቸኳይ ማሳወቂያዎችን ለማድመቅ እነዚህን ሊጠቀሙ ይችላሉ።"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"የሥርዓት ምርጫዎች ጻፍ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ይህ መተግበሪያ እርስዎን ወክሎ የሥርዓት ምርጫዎችን እንዲያሻሽል ይፍቀዱ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ይህ ፈቃድ መተግበሪያው ዋና የሥርዓት ምርጫዎችን እንዲያሻሽል ይፈቅዳል።"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"የሚዲያ አስተዳደር መተግበሪያዎች"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"መተግበሪያው ሚዲያን እንዲያቀናብር ፍቀድ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ከተፈቀደለት ይህ መተግበሪያ እርስዎን ሳይጠይቅ በሌሎች መተግበሪያዎች የተፈጠሩ የሚዲያ ፋይሎችን ማሻሻል ወይም መሰረዝ ይችላል። መተግበሪያው ፋይሎችን እና ሚዲያዎችን ለመድረስ ፈቃድ ሊኖረው ይገባል።"</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"የእጅ ምልክቶች"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"በፍጥነት ካሜራን ክፈት"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ካሜራውን በፍጥነት ለመክፈት በቀላሉ የኃይል አዝራሩን ይጫኑት። ከማንኛውም ማያ ገፅ ላይ ይሠራል"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ለራስ ምስል ካሜራን ገልብጥ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"የአሰሳ ሁነታ"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"በሳተላይት መልዕክት መላላክ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ኤስኤምኤሶችን በሳተላይት ይላኩ እና ይቀበሉ። ከመለያዎ ጋር ተካትቷል።"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ኤስኤምኤሶችን በሳተላይት ይላኩ እና ይቀበሉ። በመለያዎ ውስጥ አልተካተተም።"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"በሳተላይት መልዕክት መላላክ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"በሳተላይት መልክት ስለመላላክ"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"የሳተላይት መልዕክት፣ የሳተላይት ግንኙነት"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"ስለ <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"የብቁ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> መለያ አካል እንደመሆንዎ ኤስኤምኤሶችን በሳተላይት መላክ እና መቀበል ይችላሉ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"የእርስዎ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> እቅድ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"በሳተላይት መልዕክት መላላክ ከመለያዎ ጋር ተካትቷል"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"መልዕክት መላላክ ከመለያዎ ጋር ተካትቷል"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"በሳተላይት መልዕክት መላላክ ከመለያዎ ጋር አልተካተተም"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"የበለጠ ለመረዳት"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"እንዴት እንደሚሠራ"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ስልክዎ ከሳተላይት ጋር በራስ-ሰር ይገናኛል። ለምርጥ ግንኙነት፣ የሰማይ ጥርት ያለ ዕይታ ይኑርዎት።"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ስልክዎ ከሳተላይት ጋር ከተገናኘ በኋላ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"ድንገተኛ አደጋ አገልግሎቶችን ጨምሮ ለማንም ሰው መላክ ይችላሉ። የተንቀሳቃሽ ስልክ አውታረ መረብ ሲገኝ ከስልክዎ ጋር እንደገና ይገናኛል።"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"የሳተላይት መልዕክት መላላክ ረዘም ያለ ጊዜ ሊወስድ ይችላል እና በአንዳንድ አካባቢዎች ብቻ ሊገኝ ይችላል። የአየር ሁኔታ እና አንዳንድ መዋቅሮች በሳተላይት ግንኙነትዎ ላይ ተጽዕኖ ሊያሳድሩ ይችላሉ። በሳተላይት መደወል አይገኝም። የአደጋ ጥሪዎች አሁንም ሊገናኙ ይችላሉ።\n\nየመለያ ለውጦች በቅንብሮች ውስጥ እስኪታዩ ድረስ የተወሰነ ጊዜ ሊወስድ ይችላል። ለዝርዝሮች አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"በሳተላይት መልዕክት ስለመላላክ ተጨማሪ መረጃ"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> ረዘም ያለ ጊዜ ሊወስድ ይችላል እና በአንዳንድ አካባቢዎች ብቻ ሊገኝ ይችላል። የአየር ሁኔታ እና አንዳንድ አወቃቀሮች በሳተላይት ግንኙነትዎ ላይ ተጽዕኖ ሊያሳድሩ ይችላሉ። በሳተላይት መደወል አይገኝም። የአደጋ ጥሪዎች አሁንም ሊገናኙ ይችላሉ።\n\nየመለያ ለውጦች በቅንብሮች ውስጥ እስከሚታዩ ድረስ የተወሰነ ጊዜ ሊወስድ ይችላል። ለዝርዝሮች <xliff:g id="CARRIER_NAME">%1$s</xliff:g>ን ያነጋግሩ።"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"ስለ <xliff:g id="SUBJECT">%1$s</xliff:g> ተጨማሪ"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ማብራት አልተቻለም"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ለማብራት መጀመሪያ የሳተላይት ግንኙነቱን ያጠናቅቁ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"የሳተላይት ግንኙነት"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"የሳተላይት ግንኙነት"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"የሳተላይት ግንኙነት"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"የሳተላይት መልዕክት"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ውሂብ መጠቀም ከመለያዎ ጋር ተካትቷል"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"ሳተላይት ኤስኦኤስ"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"ከሞባይል ወይም የWi-Fi አውታረ መረብ ጋር መገናኘት በማይችሉበት ጊዜ ከድንገተኛ አደጋ አገልግሎቶች ጋር መልዕክት ይላላኩ"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"ሳተላይት ኤስኦኤስ፣ ኤስኦኤስ"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"ስለ ሳተላይት ኤስኦኤስ"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"ከድንገተኛ አደጋ አገልግሎቶች ጋር መልዕክት መላላክ እና ከሞባይል ወይም የWi-Fi አውታረ መረብ ጋር መገናኘት በማይችሉበት ጊዜ አካባቢዎን ማጋራት ይችላሉ። ይህ አገልግሎት በማንኛውም ጊዜ በሁሉም ቦታዎች እና ሁኔታዎች ላይ ላይገኝ ይችላል።"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ለድንገተኛ አደጋ አገልግሎቶች ይደውሉ ወይም ይጻፉ"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ስለድንገተኛ አደጋው ጥያቄዎችን ይመልሱ"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"ከሳተላይቱ ጋር ለመገናኘት እርምጃዎችን ይከተሉ"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"የተንቀሳቃሽ ስልክ አውታረ መረብ ከሌለዎት ሳተላይት ኤስኦኤስ የመጠቀም አማራጭ ይመለከታሉ"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ለእርስዎ ትክክለኛውን ዓይነት እገዛ ለማግኘት መልሶችን ወደ ድንገተኛ አደጋ አገልግሎቶች ይላኩ"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"አንዴ እርስዎ ከተገናኙ በኋላ ከድንገተኛ አደጋ አገልግሎቶች ጋር መልዕክት መላላክ ይችላሉ"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ቅንጭብ ማሳያን ይሞክሩ"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"በሳተላይት ከድንገተኛ አደጋ አገልግሎቶች ጋር ሲገናኙ የእርስዎ ስም፣ ኢሜይል፣ ስልክ ቁጥር፣ ቦታ፣ የመሣሪያ መረጃ (IMEI፣ ቋንቋ፣ ሞዴል፣ የባትሪ ደረጃ) እና የአደጋ ጊዜ የዕውቂያ መረጃ ከድንገተኛ አደጋ አገልግሎቶች እና ከሳተላይት አገልግሎት አቅራቢዎች ጋር ይጋራሉ። \n\nሳተላይት ኤስኦኤስን ለመጠቀም Google መልዕክቶች የእርስዎ ነባሪ የኤስኤምኤስ መተግበሪያ መሆን አለበት \n\nራስ-ሰር የአውታረ መረብ ምርጫ ከጠፋ፣ ይበራል እና መሣሪያዎ በራስ-ሰር ከማንኛውም አውታረ መረብ ጋር ይገናኛል።"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"የማጋራት ምርጫዎች"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"የአደጋ ጊዜ ዕውቂያዎች"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"የእርስዎ የGoogle መለያ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ከድንገተኛ አደጋ አገልግሎቶች ጋር የሚጋራ መረጃ ይገምግሙ ወይም ያዘምኑ"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"የመዳረሻ ነጥብ ስም"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"ኤፒኤን"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ከ<xliff:g id="CARRIER">%1$s</xliff:g> ጋር ሲገናኝ የማይገኝ"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"የገጽ-አግኖስቲክ ሁነታ የ16 ኪባ ሁነታ ላይ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም ውሂብ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎች ላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት ወደ የ4ኪባ ሁነታ መመለስ እና ከዚያ የመሣሪያውን bootloader መቆለፍ አለብዎት። ይህ መሣሪያውን ወደ የፋብሪካ ዳግም ያስጀምረዋል እና የምርት ቅንብሮችን ወደነበሩበት ይመልሳል። መሣሪያው በተሳካ ሁኔታ ወደ Android ከተነሳ በኋላ በገንቢ አማራጮች ውስጥ የOEM መክፈቻን ያሰናክሉ። መሣሪያው ወደ Android መነሳት ካልቻለ ወይም ያልተረጋጋ ከሆነ መሣሪያውን ከ&lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; በመጡ የቅርብ ጊዜዎቹ የፋብሪካ ምስሎች ዳግም ፍላሽ ያድርጉት ወይም &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ይጠቀሙ እና «መሣሪያን ጥረግ»፣ «Bootloaderን ቆልፍ» እና «የሁሉንም ክፍልፋዮች ፍላሽ አስገድድ» የሚለውን ይምረጡ።"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"የ16 ኪባ ለሁሉም ገጽ ተስማሚ ሁነታ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ተጨማሪ ያንብቡ"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"መተግበሪያን በገፅ መጠን ተኳኋኝ ሁነታ ያሂዱ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"የሳንካ ሪፖርት ተቆጣጣሪ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"በእርስዎ መሣሪያ ላይ የሳንካ ሪፖርት አቋራጭን የትኛው መተግበሪያ እንደሚቆጣጠር ይወስናል።"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"የግል"</string>
@@ -5159,7 +5282,7 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"UWB ያላቸውን በአቅራቢያ ያሉ የመሣሪያዎች አንፃራዊ ቦታ አቀማመጥን ለመለየት ይረዳል"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWBን ለመጠቀም የአውሮፕላን ሁነታን ያጥፉ"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB በአሁኑ አካባቢ አይገኝም"</string>
-    <string name="thread_network_settings_title" msgid="4212301030523859220">"ተከታታይ"</string>
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread ይጠቀሙ"</string>
     <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread ዘመናዊ የቤት መሣሪያዎችዎን ለማገናኘት፣ ውጤታማነት እና አፈጻጸምን ለመጨመር ያግዛል።\n\nሲነቃ ይህ መሣሪያ የThread አውታረ መረብ ለመቀላቀል ብቁ በመሆን በዚህ ስልክ በኩል በMatter የተደገፉ መሣሪያዎችን ቁጥጥር ይፈቅዳል።"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"ስለ Thread የበለጠ ይወቁ"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ዥረት ያዳምጡ"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"በ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ለማዳመጥ የኦዲዮ ዥረት QR ኮድ ይቃኙ"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"እያጋሩ እያለ የይለፍ ቃልን ማርተዕ አልተቻለም። የይለፍ ቃሉን ለመቀየር በቅድሚያ የድምፅ ማጋራትን ያጥፉ።"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"የይለፍ ቃልዎ 4-16 ቁምፊዎችን መያዝ እና ፊደላት፣ ቁጥሮች እና ምልክቶችን ብቻ መጠቀም አለበት"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"የQR ኮድ መቃኛ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"እገዛ ይፈልጋሉ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ቅንብሮች ውስጥ ይፈልጉ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"ዕውቂያዎች፣ ማከማቻ፣ መለያ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"የዕውቂያዎች ማከማቻ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"መሣሪያ ብቻ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"አዳዲስ ዕውቂያዎች በመለያ አይሰምሩም"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ዕውቂያዎች ወደ መሣሪያዎ ይቀመጣሉ እና በነባሪ ከመለያዎ ጋር ይሰምራሉ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ነባሪ መለያውን በማቀናበር ላይ ስህተት"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ምንም ነባሪ አልተቀናበረም"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"መሣሪያ ብቻ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"መሣሪያ እና %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ለመጀመር መለያ ያክሉ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ዕውቂያዎች የት እንደሚቀመጡ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ለመፈለግ ክበብ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"በማያ ገፅዎ ላይ ያለውን ይዘት በመጠቀም ለመፈለግ የመነሻ አዝራሩን ወይም የአሰሳ መያዣውን ይንኩ እና ይያዙ።"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 5f924b25c26..11636c3fd1c 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ندفة ثلج"</item>
     <item msgid="7952183800501346803">"مظلة شاطئ"</item>
     <item msgid="799139025758265891">"أدوات ورشة عمل"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"بيانو"</item>
     <item msgid="3861584909935022342">"بكرة فيلم"</item>
     <item msgid="5827426100157335512">"كتاب"</item>
     <item msgid="8585828346253128384">"زهرة لوتس"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1a7a79586bd..bf2e099c565 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"إقران جهاز جديد"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوتوث"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"التفعيل تلقائيًا غدًا"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"عند إيقاف البلوتوث، سيُعاد تفعيله تلقائيًا في اليوم التالي"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"إقران السماعة اليمنى"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"إقران السماعة اليسرى"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"إقران السماعة الأخرى"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"‏إيقاف ميزة Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"‏يؤدي هذا الخيار إلى إيقاف ميزة Bluetooth LE audio إذا كان الجهاز متوافقًا مع إمكانيات جهاز الصوت المنخفض الطاقة."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"‏وضع Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"‏تفعيل الخيار \"معاينة واجهة المستخدم لميزة Bluetooth LE Audio Broadcast\""</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"‏يتيح هذا الخيار معاينة واجهة المستخدِم لميزة LE Audio Sharing، بما في ذلك ميزة \"مشاركة الصوت\" الشخصية والبث الخاص"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"‏إظهار خيار تفعيل LE Audio أو إيقافه في تفاصيل الجهاز"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"‏استبعاد القائمة المسموح بها لتطبيق Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"‏استخدِم تطبيق LE Audio تلقائيًا حتى إذا لم يتم التأكّد من توافق الجهاز الملحق مع معايير القائمة المسموح بها."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"لغة التطبيق"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"اللغات المقترحة"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"جميع اللغات"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"اللغات المُقترَحة"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"جميع اللغات"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"جميع المناطق"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"جميع أنظمة الترقيم"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"لغة النظام"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"الإعداد التلقائي للنظام"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"لا تتوفَّر إمكانية اختيار لغة لهذا التطبيق من الإعدادات."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"تغيير"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"‏لا تتوفّر اللغة %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"لا يمكن استخدام هذه اللغة كلغة النظام، ولكن تم إعلام التطبيقات والمواقع الإلكترونية بأنّك تفضّل هذه اللغة."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"البحث"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"إضافة لغة"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"تفضيل المنطقة"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"اكتب اسم اللغة"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"المزيد من إعدادات اللغة"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"الإعدادات المفضّلة لمنطقتك"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"يمكنك ضبط الإعدادات المفضّلة لوحدات القياس والأرقام"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"السماح للتطبيقات بمعرفة الإعدادات المفضّلة لمنطقتك لتتمكن من تخصيص تجربتك"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ستستخدم التطبيقات الإعدادات المفضّلة لمنطقتك كلما أمكن."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"الإعدادات المفضّلة للمنطقة"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"درجة الحرارة"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"أول يوم في الأسبوع"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"الإعدادات المفضّلة لنظام الأرقام"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"الاتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="729512894708689604">"الاتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"قد يتم فرض رسوم تجوال."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ضبط الوقت تلقائيًا"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ضبط إعدادات التاريخ والوقت تلقائيًا"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"سيتم استخدام الموقع الجغرافي لضبط المنطقة الزمنية عندما يكون مفتاح التبديل هذا مفعَّلاً."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"التاريخ والوقت التلقائي"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ضبط التاريخ والوقت تلقائيًا باستخدام إشارة الشبكة والإشارة اللاسلكية"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"المنطقة الزمنية التلقائية"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ضبط التاريخ والوقت تلقائيًا استنادًا إلى شبكات الجوّال القريبة منك"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"يمكن ضبط التاريخ والوقت تلقائيًا باستخدام الموقع الجغرافي لجهازك، إذا كان متاحًا"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استخدام التنسيق التلقائي المحلي"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استخدام تنسيق ٢٤ ساعة"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"الوقت"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"يتعذّر استخدام أداة استشعار بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"يُرجى التواصل مع مقدِّم خدمات إصلاح."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"فتح الجهاز ببصمة الإصبع حتى عندما تكون الشاشة مطفأة"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"يمكنك استخدام ميزة \"فتح الجهاز ببصمة الإصبع\" حتى عندما تكون الشاشة مطفأة"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"الشاشة مطفأة، فتح الجهاز"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"المزيد من إعدادات الأمان"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"قفل ملف العمل، والتشفير، وغير ذلك"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"التشفير، وبيانات الاعتماد، وغير ذلك"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"اضبط نقشًا لمساحتك الخاصة"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"قفل"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"إخفاء"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"تأكيد نقش المساحة الخاصّة"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"إعادة إدخال رقم التعريف الشخصي للمساحة الخاصّة"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"إعادة إدخال كلمة مرور المساحة الخاصّة"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات إصبع"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"لقد أضفت الحد الأقصى لعدد بصمات الإصبع"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"يتعذر إضافة مزيد من بصمات الإصبع"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"مشغَّلة"</string>
     <string name="external_display_off" msgid="5634413756025351374">"مطفأة"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"الشاشة الخارجية"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"شاشة مدمَجة"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"استخدام الشاشة الخارجية"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"دقة الشاشة"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"الشاشة الخارجية غير متصلة"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"عند تغيير زاوية الدوران أو درجة الدقة، قد تتوقف أي تطبيقات تعمل حاليًا"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"يجب توصيل جهازك بشاشة خارجية لنسخ محتوى شاشتك بشكل مطابق"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"خيارات إضافية"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"اضغط مع الاستمرار واسحب لإعادة ترتيب الشاشات."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"البث"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"انعكاس"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"تفعيل عرض شاشة لاسلكي"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"تحقَّق من كلمة المرور وأعِد المحاولة."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"يمكنك التواصل مع الشركة المصنّعة للجهاز."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"يُرجى التحقّق من الاتصال والمحاولة مرة أخرى."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"‏شبكة Wi‑Fi هذه غير متوفِّرة في الوقت الحالي"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ثمة مشكلة في رمز الاستجابة السريعة هذا. يُرجى محاولة الاتصال بالانترنت بطريقة أخرى."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"اختيار شبكة"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"للاتصال بجهازك، اختَر شبكة."</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"هل تريد إضافة هذا الجهاز إلى \"<xliff:g id="SSID">%1$s</xliff:g>\"؟"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"مزيد من المعلومات عن التدوير التلقائي"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"دقة الشاشة"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"دقة عالية"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"دقة كاملة"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"تستخدِم الدقة الكاملة قدرًا أكبر من طاقة بطاريتك. وقد يؤدي تبديل الدقة إلى إعادة تشغيل بعض التطبيقات."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"الحد الأقصى للدقة"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"يستهلك الحد الأقصى للدقة مزيدًا من طاقة البطارية. وقد يؤدي تبديل الدقة إلى إعادة تشغيل بعض التطبيقات."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"تم الاختيار"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"الألوان"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبيعية"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"توافقية"</string>
     <string name="brightness" msgid="6216871641021779698">"مستوى السطوع"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"السطوع التكيُّفي"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"لمحة عن ميزة \"السطوع التكيُّفي\""</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"سيتم ضبط سطوع الشاشة تلقائيًا حسب البيئة المحيطة والأنشطة. ويمكنك تحريك شريط التمرير يدويًا لضبط السطوع التكيُّفي حسبما تفضّل."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"مفعّل"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"غير مفعّل"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"إعدادات وضع \"وقت النوم\""</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{\"الأوضاع\" يمكنها تفعيل \"المظهر الداكن\" أيضًا}=1{يمكن لوضع \"{mode_1}\" تفعيل \"المظهر الداكن\" أيضًا}=2{يمكن لوضع \"{mode_1}\" ووضع \"{mode_2}\" تفعيل \"المظهر الداكن\" أيضًا}=3{يمكن لوضع \"{mode_1}\" ووضع \"{mode_2}\" ووضع \"{mode_3}\" تفعيل \"المظهر الداكن\" أيضًا}few{يمكن لوضع \"{mode_1}\" ووضع \"{mode_2}\" و# أوضاع أخرى تفعيل \"المظهر الداكن\" أيضًا}many{يمكن لوضع \"{mode_1}\" ووضع \"{mode_2}\" و# وضعًا آخر تفعيل \"المظهر الداكن\" أيضًا}other{يمكن لوضع \"{mode_1}\" ووضع \"{mode_2}\" و# وضع آخر تفعيل \"المظهر الداكن\" أيضًا}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"إعدادات \"الأوضاع\""</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"زيادة تعتيم الشاشة"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"زيادة تعتيم الشاشة"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"السماح للجهاز بزيادة تعتيم الشاشة أكثر من المعتاد"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"المهلة قبل غلق الشاشة"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"خدمات الموقع الجغرافي"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"خدمات الموقع الجغرافي"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"استخدام الموقع الجغرافي"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"استخدام الموقع الجغرافي لرصد المنطقة الزمنية"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"يتعذّر ضبط المنطقة الزمنية تلقائيًا"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ميزة \"الموقع الجغرافي\" أو خدمات الموقع الجغرافي غير مفعَّلة."</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"إعدادات الموقع الجغرافي"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"إصلاح ذلك"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"إلغاء"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ميزة التعرّف التلقائي على المنطقة الزمنية غير مفعّلة."</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"لا يمكن استخدام هذه الميزة عند إيقاف إعدادات الرصد التلقائي للمنطقة الزمنية"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"قد يتم استخدام الموقع الجغرافي لضبط المنطقة الزمنية"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"إذا كان الموقع الجغرافي لجهازك متاحًا، قد يتم استخدامه لضبط المنطقة الزمنية"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"عرض المعلومات القانونية والحالة وإصدار البرنامج"</string>
     <string name="legal_information" msgid="7509900979811934843">"المعلومات القانونية"</string>
     <string name="manual" msgid="3651593989906084868">"الكتيب"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"الخيارات"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"تسهيل الاستخدام"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"لوحة المفاتيح الخارجية"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"تجاهُل النقرات المتكرّرة"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"تتجاهل لوحة المفاتيح الضغطات المتكررة بسرعة على المفتاح نفسه خلال <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ملي ثانية"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"تتجاهل لوحة المفاتيح الضغطات المتكررة بسرعة على المفتاح نفسه"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"حدّ تجاهُل النقرات المتكرّرة"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"اختَر المدة الزمنية التي تتجاهل فيها لوحة المفاتيح الضغطات المتكرّرة على المفاتيح"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"‫0.2 ثانية"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"‫0.4 ثانية"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"‫0.6 ثانية"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"مخصّصة"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"قيمة مخصّصة"</string>
     <string name="slow_keys" msgid="2891452895499690837">"المفاتيح البطيئة"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"لضبط المهلة قبل أن يعمل المفتاح عند الضغط عليه على <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ملي ثانية"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"تضبط هذه الميزة المهلة قبل أن يعمل المفتاح عند الضغط عليه"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"تثبيت المفاتيح"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"اضغط على مفتاح واحد في كل مرة للحصول على الاختصارات بدلاً من الضغط باستمرار على المفاتيح معًا"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"مفاتيح الماوس"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"استخدِم لوحة المفاتيح الخارجية للتحكّم في مؤشر الماوس"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"استخدام مفاتيح الماوس"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"يمكنك استخدام لوحة المفاتيح للتحكّم في المؤشر"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"الانتقال العكسي عبر الماوس"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"يمكنك الانتقال للأعلى لتحريك محتوى الصفحة للأسفل"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"تبديل الزرَّين الأيمن والأيسر"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"يمكنك استخدام زر الماوس الأيسر كزر الماوس الأيمن"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"مفاتيح الماوس في \"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>\""</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"يمكنك استخدام مفاتيح <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> لتحريك مؤشّر الماوس"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"يمكنك استخدام مفتاح <xliff:g id="CLICK_LABEL">%s</xliff:g> للنقر على الزر الأساسي للماوس"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"يمكنك استخدام مفتاح <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> للضغط مع الاستمرار على الزر الأساسي للماوس"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"يمكنك استخدام مفتاح <xliff:g id="RELEASE_LABEL">%s</xliff:g> لتحرير الزر الأساسي للماوس"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"يمكنك استخدام مفتاح <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> لتبديل وضع التمرير. وسيؤدي هذا إلى جعل مفاتيح <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> تنتقل إلى الأعلى أو الأسفل أو اليسار أو اليمين"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"يمكنك استخدام مفتاح <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> للنقر على الزر الثانوي للماوس"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"اختصارات لوحة المفاتيح"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"إظهار قائمة الاختصارات"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"لوحات مفاتيح وأدوات ملف العمل"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"الخيار التلقائي"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"لوحة اللمس"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"لوحة اللمس والماوس"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ماوس"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"سرعة المؤشر، والإيماءات"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"الضغط للنقر"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"السحب بعد النقر"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"النقر أسفل يمين لوحة اللمس"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"انقر أسفل يمين لوحة اللمس للحصول على مزيد من الخيارات"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"سرعة المؤشر"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"استخدام النقر بثلاثة أصابع"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"لون المؤشر"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"تغيير نمط منتصف المؤشر إلى الأسود"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"تغيير نمط منتصف المؤشر إلى الأخضر"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"التعرّف على إيماءات لوحة اللمس"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"لوحة اللمس، لوحة لمس، ماوس، مؤشر، الانتقال للأسفل أو للأعلى، تمرير سريع، النقر بزر الماوس الأيمن، نقرة، مؤشر"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"النقر بزر الماوس الأيمن، النقر"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"النقر بزر الماوس الأوسط"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"‏تشغيل \"مساعد Google\""</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"الانتقال إلى الشاشة الرئيسية"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"رجوع"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"عرض التطبيقات المستخدَمة مؤخرًا"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"الانتقال إلى الشاشة الرئيسية"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"مرّر سريعًا للأعلى باستخدام 3 أصابع بأي مكان على لوحة اللمس."</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"الرجوع"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"اختيار مفتاح جديد لـ \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"تسهيل استخدام لوحة المفاتيح الخارجية"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ميزة \"تثبيت المفاتيح\" وميزة \"تجاهُل النقرات المتكرّرة\" ومفاتيح الماوس"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"تكرار الحرف الذي يكتبه المفتاح"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"مدة التأخير قبل التكرار"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"معدّل التكرار"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"اضغط مع الاستمرار على أحد المفاتيح لتكرار الحرف الذي يكتبه هذا المفتاح إلى أن ترفع إصبعك عنه"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"التنسيق <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"تلقائي"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"تلقائي: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"معاينة"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"خيارات عادية"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"اللغة"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"حجم النص"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"حجم نص الترجمة والشرح"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"نمط الشرح"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"خيارات مخصصة"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"لون الخلفية"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ضبط استخدام الطاقة"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"الحزم المضمنة"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"التطبيقات تعمل بشكل طبيعي"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"يُنصح باستبدال البطارية"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"انخفضت سعة البطارية وأداء الشحن، ويُنصح باستبدال البطارية."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"مستوى شحن البطارية منخفض"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"يمكنك تفعيل خيار \"توفير شحن البطارية\" لإطالة عمر البطارية."</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"إطالة عمر البطارية"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏هل تريد قطع الاتصال بهذه شبكة VPN؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"قطع الاتصال"</string>
     <string name="vpn_version" msgid="6344167191984400976">"الإصدار"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"الإصدار <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"‏نسيان شبكة VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏هل تريد استبدال شبكة VPN الحالية؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏هل تريد تشغيل شبكة VPN باستمرار؟"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"أيام الأسبوع من 9 صباحًا إلى 5 بعد الظهر\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"أحداث التقويم"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{تمّ تفعيل الوضع \"{mode_1}\"}=2{تمّ تفعيل الوضعَين \"{mode_1}\" و\"{mode_2}\"}=3{تمّ تفعيل الأوضاع \"{mode_1}\" و\"{mode_2}\" و\"{mode_3}\"}few{تمّ تفعيل الوضعَين \"{mode_1}\" و\"{mode_2}\" و# أوضاع أخرى}many{تمّ تفعيل الوضعَين \"{mode_1}\" و\"{mode_2}\" و# وضعًا آخرًا}other{تمّ تفعيل الوضعَين \"{mode_1}\" و\"{mode_2}\" و# وضع آخر}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{يمكن تفعيل وضع واحد تلقائيًا}two{يمكن تفعيل وضعَين تلقائيًا}few{يمكن تفعيل # أوضاع تلقائيًا}many{يمكن تفعيل # وضعًا تلقائيًا}other{يمكن تفعيل # وضع تلقائيًا}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{عدم الإزعاج}=1{{mode_1}}=2{\"{mode_1}\" و\"{mode_2}\"}few{\"{mode_1}\" و\"{mode_2}\" و\"{mode_3}\"}many{\"{mode_1}\" و\"{mode_2}\" و\"{mode_3}\"}other{\"{mode_1}\" و\"{mode_2}\" و\"{mode_3}\"}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"مفعَّل"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"لم يتم ضبط الوضع"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"غير مفعَّل"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"حسنًا"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"الإشعارات"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"المدة"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"الرسائل والأحداث والتذكيرات"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"عند تفعيل ميزة \"عدم الإزعاج\"، سيتم تجاهل إشعارات الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"تمّ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"الإعدادات"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"بدون تنبيهات مرئيّة أو صوتية من الإشعارات"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"بدون تنبيهات صوتية من الإشعارات"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"لن ترى أو تسمع إشعارات. ويُسمح بالمكالمات من جهات الاتصال المميّزة بنجمة والمتصلين المتكرّرين."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(الإعداد الحالي)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"هل تريد تغيير إعدادات إشعار ميزة \"عدم الإزعاج\"؟"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"أصوات ملف العمل"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"استخدام أصوات الملف الشخصي"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"استخدام الأصوات نفسها التي يستخدمها ملفك الشخصي"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"بعد فتح القفل، يتم الانتقال مباشرةً إلى آخر شاشة مُستخدَمة. لن تظهر الإشعارات على شاشة القفل. مرِّر سريعًا من أعلى الشاشة لأسفلها لعرض الإشعارات."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"شاشة القفل، شاشة القفل، التخطي، التجاوز"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"عند قفل ملف العمل"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"تقليل عدد الإشعارات المعروضة على شاشة القفل"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"إظهار إشعارات أقل على شاشة القفل"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"إظهار الإشعارات الجديدة فقط على شاشة القفل"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"لإزالة الإشعارات تلقائيًا من شاشة القفل إذا سبق واطّلعت عليها"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"الإشعارات على شاشة القفل"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"إظهار إشعارات المحادثات والإشعارات التلقائية والصامتة"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"إظهار إشعارات المحادثات والإشعارات التلقائية والصامتة"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"عرض محتوى إشعارات العمل كاملاً"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"إخفاء محتوى العمل الحساس"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"كيف تريد أن يتم عرض إشعارات الملف الشخصي عندما يكون الجهاز مقفلاً؟"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"حينما تتلقّى الكثير من الإشعارات خلال وقت قصير، سيتم خفض مستوى صوت الجهاز وتقليل ظهور التنبيهات لمدة تصل إلى دقيقتين. ولن تتأثر المكالمات والمنبّهات والمحادثات ذات الأولوية بتلك الإجراءات. \n\nيمكنك العثور على الإشعارات المُرسلة إليك أثناء فترة تخفيض الإشعارات الصوتية والاهتزاز من خلال سحب الشاشة من أعلى لأسفل."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"التطبيق على ملفات العمل"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"يسري على تطبيقات ملف العمل"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"إشعارات مُجمّعة"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"تفعيل"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"إيقاف"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"استخدام ميزة تجميع الإشعارات"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"سيتم كتم صوت الإشعارات ذات المظاهر المتشابهة وتجميعها معًا لتوفير تجربة أكثر هدوءًا. ستؤدي عملية التجميع إلى تجاوز إعدادات إشعارات التطبيق."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"خدمات تحسّن تجربة الواقع الافتراضي"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"لم تطلب أي تطبيقات مثبَّتة أن يتم تشغيلها كخدمات تحسّن تجربة الواقع الافتراضي."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"هل تريد السماح لخدمة \"<xliff:g id="SERVICE">%1$s</xliff:g>\" بالوصول إلى خدمة الواقع الافتراضي؟"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"المحادثات ذات الأولوية"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"غير مسموح بأي محادثات"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ما من محادثات}=1{محادثة واحدة}two{محادثتان}few{# محادثات}many{# محادثة}other{# محادثة}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"إعدادات ميزة \"محادثات\""</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"مَن يمكنه تجاوز وضع \"عدم الإزعاج\""</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"حتى لو لم يكن بإمكان تطبيقات المراسلة أو الاتصال إرسال إشعارات إليك، يظلّ بإمكان المستخدمين الذين تختارهم هنا الوصول إليك من خلال هذه التطبيقات"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"المكالمات"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"جهات الاتصال"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"جهات الاتصال المميّزة بنجمة"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"إعدادات جهات الاتصال"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"إعدادات جهات الاتصال المميّزة بنجمة"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"غير مسموح بأي مكالمات"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"غير مسموح بأي رسائل"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"المنبّهات"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"‫<xliff:g id="APP_LABEL">%s</xliff:g> (ملف العمل)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"جارٍ الحساب…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"إعدادات التطبيقات"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"‫+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"السماح للتطبيقات بإلغاء وضع \"عدم الإزعاج\""</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"التطبيقات التي يمكنها تخطّي الوضع"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"إنشاء وضع"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"وضع مخصّص"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"اسم الوضع"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"يجب عدم ترك حقل اسم الوضع فارغًا"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"اختَر رمزًا"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"أحداث في التقويم"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"سلسلة إجراءات \"وقت النوم\""</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"أثناء القيادة"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"عرض الإشعارات بملء الشاشة"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"السماح بعرض الإشعارات بملء الشاشة من هذا التطبيق"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"يتم السماح لهذا التطبيق بعرض إشعارات بملء الشاشة عندما يكون الجهاز مُقفَلاً. قد تستخدم التطبيقات هذا الإذن لإبراز المنبّهات أو المكالمات الواردة أو غيرها من الإشعارات العاجلة."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"كتابة الإعدادات المفضّلة للنظام"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"السماح لهذا التطبيق بتعديل الإعدادات المفضّلة للنظام نيابةً عنك"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"يتيح هذا الإذن للتطبيق إمكانية تعديل الإعدادات المفضَّلة الأساسية للنظام."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"تطبيقات إدارة الوسائط"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"السماح للتطبيق بإدارة الوسائط"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"في حال السماح لهذا التطبيق، يمكنه بدون طلب موافقتك تعديل أو حذف ملفات الوسائط التي يتم إنشاؤها باستخدام تطبيقات أخرى. يجب أن يتوفّر للتطبيق الإذن بالوصول إلى الملفات والوسائط."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"الإيماءات"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"فتح الكاميرا بسرعة"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"لفتح الكاميرا سريعًا، يمكنك الضغط على زر التشغيل مرتين. ويعمل ذلك في أي شاشة."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"قلب الكاميرا لالتقاط صورة ذاتية"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"وضع التنقّل"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"المراسلة باستخدام القمر الصناعي"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"يمكنك إرسال رسائل نصية واستلامها باستخدام القمر الصناعي. هذه الميزة مدرجة ضمن حسابك."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"يمكن إرسال رسائل نصية واستلامها باستخدام القمر الصناعي، ولكن هذه الميزة غير متوفّرة على حسابك."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"المراسلة باستخدام القمر الصناعي"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"لمحة عن المراسلة باستخدام القمر الصناعي"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"المراسلة عبر القمر الصناعي، إمكانية الاتصال بالقمر الصناعي"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"لمحة عن \"<xliff:g id="SUBJECT">%1$s</xliff:g>\""</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"يمكنك إرسال الرسائل النصية واستلامها عبر الأقمار الصناعية كجزء من حساب <xliff:g id="CARRIER_NAME">%1$s</xliff:g> مؤهَّل."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"خطّتك من <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ميزة المراسلة باستخدام القمر الصناعي مدرجة ضمن حسابك"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"يتيح لك حسابك استخدام ميزة المراسلة"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ميزة المراسلة باستخدام القمر الصناعي غير مدرجة ضمن حسابك"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"مزيد من المعلومات"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"طريقة العمل"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"سيتصل هاتفك تلقائيًا بالقمر الصناعي. للحصول على أفضل تجربة اتصال، يُرجى البقاء في مكان مفتوح بدون عوائق بين الجهاز والسماء."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"بعد اتصال الهاتف بالقمر الصناعي"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"يمكنك إرسال رسائل نصية إلى أي شخص، وكذلك الاستفادة من خدمات الطوارئ. سيحاول هاتفك الاتصال بشبكة جوّال مجددًا عند توفُّرها."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"قد تستغرق المراسلة باستخدام القمر الصناعي وقتًا أطول ولا تتوفّر إلا في بعض المناطق. وقد يؤثّر الطقس وبعض المباني في اتصالك بالقمر الصناعي. لا تتوفّر إمكانية الاتصال باستخدام القمر الصناعي. قد تظل مكالمات الطوارئ مفعَّلة.\n\nقد يستغرق ظهور التغييرات في حسابك ضمن \"الإعدادات\" بعض الوقت. يمكنك التواصل مع مشغِّل شبكة الجوّال للتعرّف على التفاصيل."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"مزيد من المعلومات حول ميزة المراسلة باستخدام القمر الصناعي"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"قد تستغرق ميزة \"<xliff:g id="SUBJECT">%1$s</xliff:g>\" وقتًا أطول ولا تتوفّر إلا في بعض المناطق. وقد يؤثّر الطقس وبعض المباني في اتصالك بالقمر الصناعي. ولا تتوفّر إمكانية الاتصال باستخدام القمر الصناعي. قد تظل مكالمات الطوارئ مفعَّلة.\n\nقد يستغرق ظهور التغييرات في حسابك ضِمن \"الإعدادات\" بعض الوقت. يُرجى التواصل مع <xliff:g id="CARRIER_NAME">%1$s</xliff:g> لمعرفة التفاصيل."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"المزيد حول \"<xliff:g id="SUBJECT">%1$s</xliff:g>\""</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"يتعذّر تفعيل <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"لتفعيل <xliff:g id="FUNCTION">%1$s</xliff:g>، عليك أولاً إنهاء الاتصال بالقمر الصناعي"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"إمكانية الاتصال بالقمر الصناعي"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"إمكانية الاتصال بالقمر الصناعي"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"إمكانية الاتصال بالقمر الصناعي"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"المراسلة عبر القمر الاصطناعي"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"يتيح لك حسابك استخدام البيانات عبر القمر الصناعي"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"اتصالات طوارئ بالقمر الصناعي"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"‏يمكنك مراسلة خدمات الطوارئ عند تعذُّر الاتصال بشبكة جوّال أو Wi‑Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"اتصالات طوارئ بالقمر الصناعي، اتصالات الطوارئ"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"لمحة عن ميزة \"اتصالات طوارئ بالقمر الصناعي\""</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"‏يمكنك مراسلة خدمات الطوارئ ومشاركة موقعك الجغرافي عند تعذُّر الاتصال بشبكة جوّال أو Wi-Fi. قد لا تتوفّر هذه الخدمة في بعض الأوقات أو المواقع الجغرافية أو الظروف."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"يمكنك الاتصال بخدمات الطوارئ أو مراسلتها نصيًا"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"يمكنك الإجابة عن الأسئلة بشأن حالة الطوارئ"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"يمكنك اتّباع التعليمات للاتصال بالقمر الصناعي"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"في حال عدم توفّر شبكة جوّال، سيظهر لك خيار لاستخدام ميزة \"اتصالات طوارئ بالقمر الصناعي\""</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"يمكنك إرسال الإجابات إلى خدمات الطوارئ لتلقّي المساعدة على النحو الصحيح"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"عند الاتصال بالقمر الصناعي، يمكنك مراسلة خدمات الطوارئ"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"تجربة إصدار تجريبي"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"‏عند الاتصال بخدمات الطوارئ عبر القمر الصناعي، فإنّ اسمك وعنوان بريدك الإلكتروني ورقم هاتفك وموقعك الجغرافي ومعلومات جهازك (رمز IMEI واللغة والطراز ومستوى البطارية) ومعلومات جهات الاتصال في حالات الطوارئ تتم مشاركتها مع خدمات الطوارئ ومقدّمي خدمات الأقمار الصناعية. \n\nلاستخدام ميزة \"اتصالات طوارئ بالقمر الصناعي\"، يجب ضبط تطبيق \"رسائل Google\" ليكون هو تطبيق SMS التلقائي. \n\nإذا كان الاختيار التلقائي للشبكة غير مفعّل، سيتم تفعيله وسيتصل جهازك تلقائيًا بأي شبكة."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"الإعدادات المفضَّلة للمشاركة"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"جهات الاتصال في حالات الطوارئ"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"‏حسابك على Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"يمكنك مراجعة أو تعديل المعلومات التي ستتم مشاركتها مع خدمات الطوارئ"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"أسماء نقاط الوصول"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"عدم التوفُّر عند الربط بمشغّل شبكة الجوّال <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"‏جهازك الآن في الوضع 16 كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. وسيتم إيقاف بعض الميزات في هذين الوضعين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع 4 كيلوبايت وقفل برنامج الإقلاع للجهاز. سيؤدي هذا الإجراء إلى إعادة ضبط الجهاز على الإعدادات الأصلية لوضع الإنتاج. بعد تشغيل نظام Android على الجهاز بنجاح، أوقِف الإعداد \"فتح قفل المصنّع الأصلي للجهاز\" ضِمن \"خيارات المطوّرين\". إذا تعذَّر تشغيل نظام Android أو كان يعمل بشكل غير مستقر، عليك إعادة تثبيت أحدث نُسخ برامج الجهة المصنِّعة من خلال &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; أو استخدام &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;، وتحديد الخيارات التالية: \"حجب بيانات الجهاز\" (Wipe Device)، و\"قفل برنامج الإقلاع\" (Lock Bootloader)، و\"فرض تثبيت البيانات في جميع الأقسام\" (Force Flash all partitions)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"الوضع 16 كيلوبايت غير المستند إلى حجم الصفحة"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"قراءة المزيد"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"تشغيل التطبيق في وضع التوافق مع حجم الصفحة"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"معالِج تقارير الأخطاء"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"يحدّد هذا الإعداد التطبيق الذي سيعالج اختصار \"تقرير الأخطاء\" على جهازك."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"شخصي"</string>
@@ -5165,7 +5288,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"‏النطاق الفائق العرض (UWB) غير متاح في الموقع الجغرافي الحالي."</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"‏استخدام شبكة Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"‏تساعد شبكة Thread في ربط أجهزة المنزل الذكية بالهاتف، ما يعزِّز كفاءتها وأدائها.\n\nيصبح الجهاز مؤهَّلاً لاستخدام شبكة Thread عند تفعيلها عليه، ما يتيح التحكّم في الأجهزة المتوافقة مع معيار Matter من خلال هذا الهاتف."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"‏تساعد شبكة Thread في ربط أجهزة المنزل الذكية بالهاتف، ما يعزِّز كفاءتها وأداءها.\n\nيصبح الجهاز مؤهَّلاً لاستخدام شبكة Thread عند تفعيلها عليه، ما يتيح التحكّم في الأجهزة المتوافقة مع معيار Matter من خلال هذا الهاتف."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"‏مزيد من المعلومات عن شبكة Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"الوصول إلى الكاميرا"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"الوصول إلى الميكروفون"</string>
@@ -5437,7 +5560,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"الاستماع إلى البث"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"عليك أن تمسح ضوئيًا رمز الاستجابة السريعة للبث الصوتي للاستماع إليه باستخدام \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"لا يمكن تعديل كلمة المرور أثناء المشاركة. ولتعديلها، عليك أولاً إيقاف ميزة \"مشاركة الصوت\"."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"يجب أن تحتوي كلمة المرور على 4 إلى 16 حرفًا، وأن تتضمّن أحرفًا وأرقامًا ورموزًا فقط"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"الماسح الضوئي لرمز الاستجابة السريعة"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"هل أنت بحاجة إلى مساعدة؟"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"البحث في \"الإعدادات\""</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"جهات اتصال، تخزين، حساب"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"تخزين جهات الاتصال"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"الجهاز فقط"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"لن تتم مزامنة جهات الاتصال الجديدة مع أحد الحسابات"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"سيتم حفظ جهات الاتصال على جهازك ومزامَنتها مع حسابك تلقائيًا"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"حدث خطأ أثناء ضبط الحساب التلقائي"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"لم يتم ضبط حساب تلقائي"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"الجهاز فقط"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏الأجهزة و%1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"يُرجى إضافة حساب للبدء"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"مكان حفظ جهات الاتصال"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"دائرة البحث"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"انقر مع الاستمرار على زر الشاشة الرئيسية أو مؤشر التنقُّل للبحث باستخدام المحتوى الذي يظهر على شاشتك."</string>
 </resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index bddefceed7a..992508f1a6a 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"তুষাৰ কণিকা"</item>
     <item msgid="7952183800501346803">"সমুদ্ৰতীৰৰ ছাতি"</item>
     <item msgid="799139025758265891">"কৰ্মশালাৰ সঁজুলি"</item>
-    <item msgid="1330084588359129896">"তম্বু"</item>
+    <item msgid="8112685757657659269">"পিয়ান’"</item>
     <item msgid="3861584909935022342">"ফিল্মৰ ৰীল"</item>
     <item msgid="5827426100157335512">"কিতাপ"</item>
     <item msgid="8585828346253128384">"পদুম ফুল"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index cfc23414d8d..042d0214ab6 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"নতুন ডিভাইচ পেয়াৰ কৰক"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ব্লুটুথ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"কাইলৈ স্বয়ংক্ৰিয়ভাৱে অন কৰক"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"যদি আপুনি ব্লুটুথ অফ কৰে, তেন্তে পাছদিনা ই পুনৰ অন হয়"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"সোঁ কাণখন পেয়াৰ কৰক"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"বাওঁ কাণখন পেয়াৰ কৰক"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"নিজৰ অন্য কাণখন পেয়াৰ কৰক"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ব্লুটুথ LE অডিঅ’ অক্ষম কৰক"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ডিভাইচটোৱে LE অডিঅ’ হাৰ্ডৱেৰ ক্ষমতাসমূহ সমৰ্থন কৰিলে ই ব্লুটুথ LE অডিঅ’ সুবিধাসমূহ অক্ষম কৰে।"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ব্লুটুথ LE অডিঅ’ ম’ড"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ব্লুটুথ LE অডিঅ’ ব্ৰডকাষ্ট UIৰ পূৰ্বদৰ্শন সক্ষম কৰক"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"ব্যক্তিগত অডিঅ’ শ্বেয়াৰিং আৰু ব্যক্তিগত সম্প্ৰচাৰকে ধৰি LE অডিঅ’ শ্বেয়াৰিং UIৰ পূৰ্বদৰ্শন সক্ষম কৰে"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ডিভাইচৰ সবিশেষত LE অডিঅ’ৰ ট’গল দেখুৱাওক"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ব্লুটুথ LE অডিঅ’ৰ অনুমতি দিয়া সূচী বাইপাছ কৰক"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE অডিঅ’ৰ পৰিধীয় ডিভাইচে অনুমতি দিয়া সূচীৰ যোগ্যতাৰ মাপকাঠী মানি চলিছে বুলি সত্যাপন নকৰিলেও ডিফ’ল্ট হিচাপে LE অডিঅ’ ব্যৱহাৰ কৰক।"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"এপৰ ভাষা"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"পৰামৰ্শ হিচাপে পোৱা ভাষা"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"আটাইবোৰ ভাষা"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"পৰামৰ্শিত"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"আটাইবোৰ ভাষা"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"আটাইবোৰ অঞ্চল"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"আটাইবোৰ সংখ্যা প্ৰণালী"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ছিষ্টেমৰ ভাষা"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ছিষ্টেম ডিফ’ল্ট"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"এই এপ্‌টোৰ বাবে ছেটিঙৰ পৰা ভাষা বাছনি কৰাৰ সুবিধা উপলব্ধ নহয়।"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"সলনি কৰক"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s উপলব্ধ নহয়"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"এই ভাষাটো ছিষ্টেমৰ ভাষা হিচাপে ব্যৱহাৰ কৰিব নোৱাৰি, কিন্তু আপুনি এপ্‌ আৰু ৱেবছাইটসমূহক জনাইছে যে আপুনি এই ভাষাটোক অগ্ৰাধিকাৰ দিয়ে।"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"সন্ধান কৰক"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"এটা ভাষা যোগ দিয়ক"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"অঞ্চলৰ অগ্ৰাধিকাৰ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ভাষাৰ নাম লিখক"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"অধিক ভাষাৰ ছেটিং"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"আঞ্চলিক অগ্ৰাধিকাৰ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"একক আৰু সংখ্যাৰ অগ্ৰাধিকাৰ ছেট কৰক"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"এপ্‌সমূহক আপোনাৰ আঞ্চলিক অগ্ৰাধিকাৰসমূহ জানিবলৈ দিয়ক যাতে সেইবোৰে আপোনাৰ অভিজ্ঞতা ব্যক্তিগতকৰণ কৰিব পাৰে।"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"এপ্‌সমূহে য’ত সম্ভৱ হয় তাত আপোনাৰ আঞ্চলিক অগ্ৰাধিকাৰসমূহ ব্যৱহাৰ কৰিব।"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"আঞ্চলিক অগ্ৰাধিকাৰ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"উষ্ণতা"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"সপ্তাহৰ প্ৰথম দিন"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"সংখ্যাৰ অগ্ৰাধিকাৰ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ৰ’মিঙৰ মাচুল প্ৰযোজ্য হ’ব পাৰে।"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"স্বয়ংক্ৰিয়ভাৱে সময় ছেট কৰক"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"এই ট’গলটো অন হৈ থাকিলে সময় মণ্ডল ছেট কৰিবলৈ অৱস্থান ব্যৱহাৰ কৰা হ’ব"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"স্বয়ংক্ৰিয় তাৰিখ আৰু সময়"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"আপোনাৰ নেটৱৰ্ক আৰু বেতাঁৰ ছিগনেল ব্যৱহাৰ কৰি স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"স্বয়ংক্ৰিয় সময় মণ্ডল"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"আপোনাৰ নিকটৱৰ্তী ম’বাইল নেটৱৰ্ক অনুযায়ী স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"উপলব্ধ হ’লে আপোনাৰ ডিভাইচৰ অৱস্থান ব্যৱহাৰ কৰি স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"স্থানীয় ডিফ’ল্ট ব্যৱহাৰ কৰক"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘণ্টীয়া সজ্জা ব্যৱহাৰ কৰক"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"সময়"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"আঙুলিটো আঁতৰাওক আৰু ছেন্সৰটো আকৌ স্পৰ্শ কৰক"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰ ব্যৱহাৰ কৰিব নোৱাৰি"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"মেৰামতি সেৱা প্ৰদানকাৰী কোনো প্ৰতিষ্ঠানলৈ যাওক।"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"স্ক্ৰীন অফ হৈ থকা অৱস্থাত ফিংগাৰপ্ৰিণ্ট আনলক ব্যৱহাৰ কৰক"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"স্ক্ৰীনখন অফ থকা অৱস্থাতো ফিংগাৰপ্ৰিণ্ট আনলক ব্যৱহাৰ কৰক"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"স্ক্ৰীনখন অফ হৈ আছে, আনলক কৰক"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"সুৰক্ষা সম্পৰ্কীয় অধিক ছেটিং"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ লক, এনক্ৰিপশ্বন আৰু বহুতো"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"এনক্ৰিপশ্বন, ক্ৰেডেনশ্বিয়েল আৰু বহুতো"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"প্ৰাইভেট স্পেচৰ বাবে এটা আৰ্হি ছেট কৰক"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"লক কৰক"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"লুকুৱাওক"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"আপোনাৰ প্ৰাইভেট স্পে’চৰ আৰ্হি নিশ্চিত কৰক"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"আপোনাৰ প্ৰাইভেট স্পে’চৰ পিন পুনৰ দিয়ক"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"আপোনাৰ প্ৰাইভেট স্পে’চৰ পাছৱৰ্ড পুনৰ দিয়ক"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"আপুনি <xliff:g id="COUNT">%d</xliff:g> টালৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপুনি সৰ্বাধিক সংখ্যক ফিংগাৰপ্ৰিণ্টবোৰ যোগ কৰিছে"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"আৰু অধিক ফিংগাৰপ্ৰিণ্ট যোগ কৰিব নোৱাৰি"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"অন আছে"</string>
     <string name="external_display_off" msgid="5634413756025351374">"অফ আছে"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"বাহ্যিক ডিছপ্লে’"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"বিল্ট-ইন ডিছপ্লে’"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"বাহ্যিক ডিছপ্লে’ ব্যৱহাৰ কৰক"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ডিছপ্লে’ৰ ৰিজ’লিউশ্বন"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"বাহ্যিক ডিছপ্লে’ বিচ্ছিন্ন কৰা হৈছে"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ঘূৰ্ণন বা ৰিজ’লিউশ্বন সলনি কৰিলে বৰ্তমান চলি থকা যিকোনো এপ্‌ বন্ধ হ’ব পাৰে"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"আপোনাৰ স্ক্ৰীনখনৰ প্ৰতিবিম্বকৰণ কৰিবলৈ আপোনাৰ ডিভাইচটো এখন বাহ্যিক ডিছপ্লে’ৰ সৈতে সংযোগ কৰিবই লাগিব"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"অধিক বিকল্প"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ডিছপ্লে’সমূহ পুনৰ সজাবলৈ হেঁচি ধৰি টানি আনক।"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাষ্ট"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"আইনা"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"বেতাঁৰ ডিছপ্লে’ সক্ষম কৰক"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"পাছৱৰ্ডটো পৰীক্ষা কৰক আৰু পুনৰ চেষ্টা কৰক"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ডিভাইচ নিৰ্মাতাৰ সৈতে যোগাযোগ কৰক"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"সংযোগ পৰীক্ষা কৰি আকৌ চেষ্টা কৰক"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"এই ৱাই-ফাই নেটৱৰ্ক এই মূহুৰ্তত উপলব্ধ নহয়"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"এই QR ক’ডটোত কিবা সমস্যা আছে। অন্য উপায়েৰে সংযোগ কৰি চাওক।"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"নেটৱৰ্ক বাছনি কৰক"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"আপোনাৰ ডিভাইচটো সংযোগ কৰিবলৈ এটা নেটৱৰ্ক বাছনি কৰক"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"এই ডিভাইচটো “<xliff:g id="SSID">%1$s</xliff:g>”ত যোগ কৰিবনে?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"স্বয়ং-ঘূৰ্ণনৰ বিষয়ে অধিক জানক"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"স্ক্ৰীনৰ ৰিজ\'লিউশ্বন"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"উচ্চ ৰিজ\'লিউশ্বন"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"সম্পূৰ্ণ ৰিজ’লিউশ্বন"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"সম্পূৰ্ণ ৰিজ’লিউশ্বনে আপোনাৰ অধিক বেটাৰী ব্যৱহাৰ কৰে। আপোনাৰ ৰিজ’লিউশ্বন সলনি কৰিলে কিছুমান এপ্‌ ৰিষ্টাৰ্ট হ’ব পাৰে।"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"সর্বাধিক ৰিজ’লিউশ্বন"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"সর্বাধিক ৰিজ’লিউশ্বনে আপোনাৰ অধিক বেটাৰী ব্যৱহাৰ কৰে। আপোনাৰ ৰিজ’লিউশ্বনলৈ সলনি কৰিলে কিছুমান এপ্‌ ৰিষ্টাৰ্ট হ’ব পাৰে।"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"বাছনি কৰা হৈছে"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ৰংবোৰ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"প্ৰাকৃতিক"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"অভিযোজিত"</string>
     <string name="brightness" msgid="6216871641021779698">"উজ্জ্বলতাৰ স্তৰ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"অভিযোজিত উজ্জ্বলতা"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"অভিযোজিত উজ্জ্বলতাৰ বিষয়ে"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"আপোনাৰ স্ক্ৰীনৰ উজ্জ্বলতা আপোনাৰ পৰিৱেশ আৰু কাৰ্যকলাপবোৰৰ লগত স্ৱয়ংক্ৰিয়ভাৱে খাপ খায়। আপুনি অভিযোজিত উজ্জ্বলতাক আপোনাৰ অগ্ৰাধিকাৰসমূহ বুজাত সহায় কৰাৰ বাবে শ্লাইডাৰ মেনুৱেলভাৱে স্থানান্তৰ কৰিব পাৰে।"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"অন আছে"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"অফ হৈ আছে"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"শোৱাৰ সময়ৰ ম’ডটোৰ ছেটিং"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ম’ডে গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰিব পাৰে}=1{{mode_1}এ গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰে}=2{{mode_1} আৰু {mode_2}এ গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰে}=3{{mode_1}, {mode_2} আৰু {mode_3}এ গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰে}one{{mode_1}, {mode_2} আৰু #এ গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰে}other{{mode_1}, {mode_2} আৰু #এ গাঢ় ৰঙৰ থীমো সক্ৰিয় কৰে}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ম’ডৰ ছেটিং"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"আৰু অনুজ্জ্বল"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"এক্সট্ৰা ডিম"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ডিভাইচটোক সচৰাচৰতকৈ অনুজ্জ্বল হ’বলৈ দিয়ক"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"স্ক্ৰীন টাইমআউট"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> নিস্ক্ৰিয় হৈ থকাৰ পাছত"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ অফ থকা অৱস্থাতও এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্যৱহাৰ কৰিব পাৰি।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"অৱস্থান সেৱা"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"অৱস্থান সেৱা"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"অৱস্থান ব্যৱহাৰ কৰক"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"সময় মণ্ডলৰ বাবে অৱস্থান ব্যৱহাৰ কৰক"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"স্বয়ংক্ৰিয়ভাৱে সময় মণ্ডল ছেট কৰিব নোৱাৰি"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"অৱস্থান অথবা অৱস্থান সেৱাসমূহ অফ কৰা আছে"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"অৱস্থানৰ ছেটিং"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"এইটো সমাধান কৰক"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"বাতিল কৰক"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"স্বয়ংক্ৰিয় সময় মণ্ডল অফ হৈ আছে"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"স্বয়ংক্ৰিয় সময় মণ্ডল অফ থাকিলে উপলব্ধ নহয়"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"সময় মণ্ডল ছেট কৰিবলৈ অৱস্থান ব্যৱহাৰ কৰা হ’ব পাৰে"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"যদি আপোনাৰ ডিভাইচৰ অৱস্থান উপলব্ধ হয়, তেন্তে সেইটো আপোনাৰ সময় মণ্ডল ছেট কৰিবলৈ ব্যৱহাৰ কৰা হ’ব পাৰে"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"আইনী তথ্য, স্থিতি, ছফটৱেৰৰ সংস্কৰণ"</string>
     <string name="legal_information" msgid="7509900979811934843">"আইনী তথ্য"</string>
     <string name="manual" msgid="3651593989906084868">"মেনুএল"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"বিকল্পসমূহ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"সাধ্য সুবিধা"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"কায়িক কীব\'ৰ্ড"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"কায়িক কীব’ৰ্ডৰ লে’আউট বাছনিকৰ্তা"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"বাউন্স কী"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"কীব’ৰ্ডে <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> এমএছৰ ভিতৰত একেটা কী ক্ষিপ্ৰতাৰে বাৰে বাৰে টিপাটো উপেক্ষা কৰে"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"কীব’ৰ্ডে একেটা কী ক্ষিপ্ৰতাৰে বাবে বাৰে টিপাটো আওকাণ কৰে"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"বাউন্স কীৰ সীমা"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"সেই সময় অৱধি বাছনি কৰক যেতিয়া আপোনাৰ কীব’ৰ্ডে বাৰে বাৰে কী টিপাটো আওকাণ কৰে"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"০.২ ছেকেণ্ড"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"০.৪ ছেকেণ্ড"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"০.৬ ছেকেণ্ড"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"কাষ্টম"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"কাষ্টম মান"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ধীৰ গতিৰ কী"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> এমএছ সক্ৰিয় কৰিবলৈ এটা কী টিপাৰ বাবে লগা সময় মিলাওক"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"সক্ৰিয় কৰিবলৈ এটা কী টিপাৰ বাবে লগা সময় মিলায়"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ষ্টিকী কী"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"একেলগে কীসমূহ টিপি ধৰি থকাৰ সলনি শ্বৰ্টকাটৰ বাবে এবাৰত এটা কী টিপক"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"মাউছ কীসমূহ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"মাউছটো নিয়ন্ত্ৰণ কৰিবলৈ কায়িক কীব\'ৰ্ড ব্যৱহাৰ কৰক।"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"মাউছৰ কীসমূহ ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"পইণ্টাৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাৰ কীব’ৰ্ড ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"মাউছ ওলোটাকৈ স্ক্ৰ’ল কৰাৰ সুবিধা"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"পৃষ্ঠাটো তললৈ নিবলৈ ওপৰলৈ স্ক্ৰ’ল কৰক"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"বাওঁ আৰু সোঁফালৰ বুটাম সলনা-সলনি কৰক"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"মাউছৰ বাওঁফালৰ বুটামটো আপোনাৰ সোঁফালৰ হিচাপে ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>ৰ বাবে মাউছৰ কী"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"মাউছৰ পইণ্টাৰটো লৰচৰ কৰিবলৈ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> কীসমূহ ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"প্ৰাথমিক মাউছৰ বুটামটোত ক্লিক কৰিবলৈ <xliff:g id="CLICK_LABEL">%s</xliff:g> কীটো ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"প্ৰাথমিক মাউছৰ বুটামটোত টিপি কিছু সময় ধৰি থাকিবলৈ <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> কীটো ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"প্ৰাথমিক মাউছৰ বুটামটো এৰি দিবলৈ কৰিবলৈ <xliff:g id="RELEASE_LABEL">%s</xliff:g> কীটো ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"স্ক্ৰ’ল ম’ডটো ট’গল কৰিবলৈ <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> কীটো ব্যৱহাৰ কৰক। এইটোৱে <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>ক ভিউটো ওপৰলৈ, তললৈ, বাওঁফালে বা সোঁফালে স্ক্ৰ’ল কৰিবলৈ দিব"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"গৌণ মাউছৰ বুটামটোত ক্লিক কৰিবলৈ <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> কীটো ব্যৱহাৰ কৰক"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"কীব’ৰ্ডৰ শ্বৰ্টকাটসমূহ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"শ্বৰ্টকাটৰ সূচী দেখুৱাওক"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"কৰ্মস্থানৰ প্ৰ’ফাইল আৰু সঁজুলি"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ডিফ’ল্ট"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"টাচ্চপেড"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"টাচ্চপেড আৰু মাউছ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"মাউছ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"পইণ্টাৰৰ গতিবেগ, নিৰ্দেশ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ক্লিক কৰিবলৈ টিপাৰ সুবিধা"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"টিপি ধৰি টানি অনা সুবিধা"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"সোঁফালে তলত ক্লিক কৰা"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"অধিক বিকল্পৰ বাবে টাচ্চপেডৰ একেবাৰে তলৰ সোঁকোণত ক্লিক কৰক"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"পইণ্টাৰৰ গতিবেগ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"তিনিটা আঙুলিৰে টিপাৰ সুবিধাটো ব্যৱহাৰ কৰক"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"পইণ্টাৰৰ ৰং"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"পইণ্টাৰ পূৰ কৰাৰ শৈলী ক’লা কৰক"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"পইণ্টাৰ পূৰ কৰাৰ শৈলী সেউজীয়া কৰক"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"টাচ্চপেডৰ নিৰ্দেশসমূহ শিকক"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ট্ৰেকপেড, ট্ৰেক পেড, মাউছ, কাৰ্ছৰ, স্ক্ৰ’ল কৰক, ছোৱাইপ কৰক, ৰাইট ক্লিক কৰক, ক্লিক কৰক, পইণ্টাৰ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ৰাইট ক্লিক কৰক, টিপক"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"মিড্‌ল ক্লিক"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant লঞ্চ কৰক"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"গৃহ পৃষ্ঠালৈ যাওক"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"উভতি যাওক"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"শেহতীয়া এপ্‌সমূহ চাওক"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"গৃহ পৃষ্ঠালৈ যাওক"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"আপোনাৰ টাচ্চপেডৰ যিকোনো ঠাইত তিনিটা আঙুলিৰে ওপৰলৈ ছোৱাইপ কৰক"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"উভতি যাওক"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>ৰ বাবে এটা নতুন চাবি বাছনি কৰক:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"কায়িক কীব’ৰ্ডৰ সাধ্য সুবিধা"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ষ্টিকী কী, বাউন্স কী, মাউছ কী"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"কী পুনৰাবৃত্তি কৰক"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"পুনৰাবৃত্তিৰ পূৰ্বে হোৱা বিলম্ব"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"পুনৰাবৃত্তিৰ হাৰ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"কীটো এৰি নিদিয়ালৈকে কোনো কীৰ বৰ্ণটো পুনৰাবৃত্তি কৰিবলৈ সেই কীটো টিপি ধৰক"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> লে’আউট"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফ\'ল্ট"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"স্বয়ংক্ৰিয়: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"পূৰ্বদৰ্শন"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"মান্য বিকল্পসমূহ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ভাষা"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"পাঠৰ আকাৰ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"কেপশ্বনৰ আকাৰ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"কেপশ্বন শৈলী"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"কাষ্টম বিকল্পসমূহ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"বেকগ্ৰাউণ্ডৰ ৰং"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"পাৱাৰৰ ব্যৱহাৰ খাপ খুৱাওক"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"পেকেজসমূহ অন্তৰ্ভুক্ত আছে"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"এপ্‌সমূহ স্বাভাৱিকভাৱে চলি আছে"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"বেটাৰী সলনি কৰিবলৈ চুপাৰিছ কৰা হৈছে"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"বেটাৰীৰ বহনক্ষমতা আৰু চাৰ্জিঙৰ কাৰ্যদক্ষতা হ্ৰাস হৈছে আৰু বেটাৰী সলনি কৰিবলৈ চুপাৰিছ কৰা হৈছে।"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"বেটাৰী কমিছে"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰিবলৈ বেটাৰী সঞ্চয়কাৰী অন কৰক"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"বেটাৰীৰ জীৱনকাল উন্নত কৰক"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"সংযোগ বিচ্ছিন্ন কৰক"</string>
     <string name="vpn_version" msgid="6344167191984400976">"সংস্কৰণ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"সংস্কৰণ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"ভিপিএন পাহৰক"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"কৰ্মদিনত পুৱা ৯ বজা - সন্ধিয়া ৫ বজা\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"কেলেণ্ডাৰৰ অনুষ্ঠান"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} সক্ৰিয় আছে}=2{{mode_1} আৰু {mode_2} সক্ৰিয় আছে}=3{{mode_1}, {mode_2}, আৰু {mode_3} সক্ৰিয় আছে}one{{mode_1}, {mode_2}, আৰু # টা সক্ৰিয় আছে}other{{mode_1}, {mode_2}, আৰু # টা সক্ৰিয় আছে}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{১ টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}one{# টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}other{# টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{অসুবিধা নিদিব ম’ড}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"অন আছে"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ছেট কৰা হোৱা নাই"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"অক্ষম কৰা আছে"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"বুজি পালোঁ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"জাননী"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"সময়"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"বাৰ্তা, কাৰ্যক্ৰম আৰু সোঁৱৰণিসমূহ"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে বাকী বাৰ্তা, ৰিমাইণ্ডাৰ আৰু কাৰ্যক্ৰম মিউট কৰা হ\'ব। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ বাৰ্তাৰ ছেটিং মিলাব পাৰে।"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"হ’ল"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ছেটিং"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"জাননীৰ পৰা কোনো ভিজুৱেল বা ধ্বনি নাই"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"জাননীৰ কাৰণে কোনো ধ্বনি নাই"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"আপুনি আৰু জাননী নেদেখিব বা জাননীৰ ধ্বনি নুশুনিব। তৰাযুক্ত সম্পৰ্ক আৰু দুনাই কল কৰোঁতাৰ পৰা অহা কলত অনুমতি দিয়া হৈছে।"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(বৰ্তমানৰ ছেটিং)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"অসুবিধা নিদিব-ৰ জাননীৰ ছেটিং সলনি কৰিব নেকি?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ ধ্বনিসমূহ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ব্যক্তিগত প্ৰ’ফাইলৰ ধ্বনি ব্যৱহাৰ কৰক"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"আপোনাৰ ব্যক্তিগত প্ৰ’ফাইলৰ দৰে একেই ধ্বনি ব্যৱহাৰ কৰক"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"আনলক কৰাৰ পাছত পোনপটীয়াকৈ অন্তিমবাৰ ব্যৱহাৰ কৰা স্ক্ৰীনখনলৈ যাওক। জাননীসমূহ লক স্ক্ৰীনত দেখুওৱা নহ’ব। সেইসমূহ চাবলৈ তললৈ ছোৱাইপ কৰক।"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্ৰীন, লকস্ক্ৰীন, এৰি যাওক, প্ৰতিহত কৰক"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"কৰ্মস্থানৰ প্ৰ\'ফাইল লক থকা অৱস্থাত"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"লক স্ক্ৰীনত দেখুওৱা জাননীৰ সংখ্যা কমোৱা"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"লক স্ক্ৰীনত কম জাননী দেখুৱাওক"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"লক স্ক্ৰীনত কেৱল নতুন জাননী দেখুৱাওক"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"লক স্ক্ৰীনৰ পৰা পূৰ্বে চোৱা জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে আঁতৰাওক"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"লক স্ক্ৰীনত দেখা পোৱা জাননীসমূহ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ডিফ’ল্ট আৰু নীৰৱ বাৰ্তালাপসমূহ দেখুৱাওক"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ডিফ’ল্ট আৰু নীৰৱ বাৰ্তালাপসমূহ দেখুৱাওক"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"কৰ্মস্থানৰ আটাইবোৰ জাননী সমল দেখুৱাওক"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"কৰ্মস্থানৰ সংবেদনশীল সমল লুকুৱাওক"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"আপোনাৰ ডিভাইচটো লক হৈ থকা অৱস্থাত আপুনি প্ৰ’ফাইলৰ জাননীসমূহ কেনেকৈ দেখুওৱাটো বিচাৰে?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"আপুনি কম সময়ৰ ভিতৰতে বহুতো জাননী পালে, আপোনাৰ ডিভাইচটোৱে নিজৰ ভলিউম কমাব আৰু ২ মিনিটলৈকে সতৰ্কবাৰ্তাসমূহ মিনিমাইজ কৰিব। কল, এৰ্লাম আৰু অগ্ৰাধিকাৰপ্ৰাপ্ত বাৰ্তালাপত প্ৰভাৱ নপৰে। \n\nকুলডাউনৰ সময়ত পোৱা জাননী স্ক্ৰীনখনৰ একেবাৰে ওপৰৰ পৰা তললৈ টানি পাব পাৰি।"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"কৰ্মস্থানৰ প্ৰ’ফাইলত প্ৰয়োগ কৰক"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ এপত প্ৰয়োগ কৰক"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"বাণ্ডল কৰা জাননী"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"অন আছে"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"অফ আছে"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"জাননীৰ বাণ্ডলিং ব্যৱহাৰ কৰক"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"একে ধৰণৰ থীমৰ জাননীসমূহ নীৰৱ কৰা হ’ব আৰু অধিক নীৰৱ অভিজ্ঞতাৰ বাবে একেলগে গোটবদ্ধ কৰা হ’ব। বাণ্ডলিঙে কোনো এপৰ নিজৰ জাননীৰ ছেটিং অ’ভাৰৰাইড কৰিব।"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআৰ সহায়ক সেৱা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ইনষ্টল কৰি থোৱা কোনো এপে ভিআৰ সহায়ক সেৱা হিচাপে চলাবলৈ অনুৰোধ কৰা নাই।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR সেৱাক <xliff:g id="SERVICE">%1$s</xliff:g>ৰ এক্সেছ দিবনে?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"অগ্ৰাধিকাৰপ্ৰাপ্ত বাৰ্তালাপ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"একো নাই"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{এটাও নাই}=1{১ টা বাৰ্তালাপ}one{# টা বাৰ্তালাপ}other{# টা বাৰ্তালাপ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"বাৰ্তালাপৰ ছেটিং"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ব্যাঘাত জন্মাব পৰা সকল"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"বাৰ্তা বিনিময় অথবা কল কৰা এপে যদিও আপোনাক জাননী দিব নোৱাৰে, আপুনি ইয়াত বাছনি কৰা লোকসকলে তথাপি এই এপ্‌সমূহৰ জৰিয়তে আপোনাৰ সৈতে যোগাযোগ কৰিব পাৰে"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যিকোনো লোক"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"সম্পর্কসমূহ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"সম্পৰ্কৰ ছেটিং"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"তৰা চিহ্নযুক্ত সম্পৰ্কৰ ছেটিং"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"একো নাই"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"একো নাই"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"এলাৰ্মসমূহ"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (কৰ্মস্থান)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"গণনা কৰি থকা হৈছে…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"এপৰ ছেটিং"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"এপক অ\'ভাৰৰাইডৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ব্যাঘাত জন্মাব পৰা এপ্‌সমূহ"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"এটা ম’ড সৃষ্টি কৰক"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"কাষ্টম ক’ড"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ম’ডৰ নাম"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ম’ডৰ নাম খালী থাকিব নোৱাৰে"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"কোনো চিহ্ন বাছনি কৰক"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"কেলেণ্ডাৰৰ অনুষ্ঠান"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"শোৱাৰ সময়ৰ ৰুটিন"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"গাড়ী চলাই থাকোঁতে"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"পূৰ্ণ স্ক্ৰীনৰ জাননীসমূহ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"এই এপ্‌টোৰ পৰা পূৰ্ণ স্ক্ৰীনৰ জাননীৰ অনুমতি দিয়ক"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"এই এপ্‌টোক ডিভাইচ লক হৈ থাকোঁতে পূৰ্ণ স্ক্ৰীনত ওলোৱা জাননীসমূহ দেখুওৱাৰ অনুমতি দিয়ক। এপ্‌সমূহে এইবোৰ এলাৰ্ম, অন্তৰ্গামী কল অথবা অন্য জৰুৰী জাননীসমূহ হাইলাইট কৰিবলৈ ব্যৱহাৰ কৰিব পাৰে।"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"ছিষ্টেমৰ অগ্ৰাধিকাৰসমূহ লিখক"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"এই এপ্‌টোক আপোনাৰ হৈ ছিষ্টেমৰ অগ্ৰাধিকাৰসমূহ সংশোধন কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"এই অনুমতিটোৱে কোনো এপক ছিষ্টেমৰ মুখ্য অগ্ৰাধিকাৰসমূহ সংশোধন কৰিবলৈ দিব।"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"মিডিয়া পৰিচালনা কৰা এপ্‌"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"এপ্‌টোক মিডিয়া পৰিচালনা কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"অনুমতি দিলে, এই এপ্‌টোৱে আপোনাক নোসোধাকৈয়ে অন্য এপৰ জৰিয়তে সৃষ্টি কৰা মিডিয়া ফাইল সংশোধন কৰিব অথবা মচিব পাৰে। ফাইল আৰু মিডিয়া এক্সেছ কৰিবলৈ এপৰ ওচৰত অনুমতি থাকিবই লাগিব।"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"নিৰ্দেশসমূহ"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ক্ষিপ্ৰতাৰে কেমেৰা খোলক"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"কেমেৰাটো ততালিকে খুলিবলৈ পাৱাৰ বুটামটো দুবাৰ টিপক। যিকোনো স্ক্ৰীনৰ পৰা ই কাম কৰিব।"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ছেল্ফীৰ বাবে কেমেৰা লুটিয়াওক"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"নেভিগেশ্বন ম’ড"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰা"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"উপগ্ৰহৰ জৰিয়তে পাঠ বাৰ্তা পঠিয়াওক আৰু লাভ কৰক। আপোনাৰ একাউণ্টত অন্তৰ্ভুক্ত কৰা হয়।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"উপগ্ৰহৰ জৰিয়তে পাঠ বাৰ্তা পঠিয়াওক আৰু লাভ কৰক। আপোনাৰ একাউণ্টৰ সৈতে অন্তৰ্ভুক্ত নহয়।"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰা"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰাৰ বিষয়ে"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"উপগ্ৰহৰ দ্বাৰা বাৰ্তা বিনিময়, উপগ্ৰহৰ সংযোগ"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g>ৰ বিষয়ে"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"এটা যোগ্য <xliff:g id="CARRIER_NAME">%1$s</xliff:g> একাউণ্টৰ অংশ হিচাপে আপুনি উপগ্ৰহৰ জৰিয়তে পাঠ বাৰ্তা পঠিয়াব বা লাভ কৰিব পাৰে"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"আপোনাৰ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>ৰ আঁচনি"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰাটো আপোনাৰ একাউণ্টত অন্তৰ্ভুক্ত কৰা হয়"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"আপোনাৰ একাউণ্টত বাৰ্তা বিনিময় কৰাটো অন্তর্ভুক্ত"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰাটো আপোনাৰ একাউণ্টত অন্তৰ্ভুক্ত কৰা নহয়"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"অধিক জানক"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ই কেনেকৈ কাম কৰে"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"আপোনাৰ ফ’নটো এটা উপগ্ৰহৰ সৈতে স্বয়ংক্ৰিয়ভাৱে সংযুক্ত হ’ব। আটাইতকৈ ভাল সংযোগৰ বাবে, আকাশখন ভালকৈ দেখাকৈ ৰাখক।"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"আপোনাৰ ফ’নটো এটা উপগ্ৰহৰ সৈতে সংযুক্ত হোৱাৰ পাছত"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"আপুনি জৰুৰীকালীন সেৱাকে ধৰি যিকোনো ব্যক্তিকে পাঠ বাৰ্তা পঠিয়াব পাৰে। আপোনাৰ ফ’নটোৱে উপলব্ধ হ’লে কোনো ম’বাইল নেটৱৰ্কৰ সৈতে পুনৰ সংযোগ কৰিব।"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰোঁতে অধিক সময় লাগিব পাৰে আৰু ই কেৱল কিছুমান অঞ্চলতহে উপলব্ধ। বতৰ আৰু নিৰ্দিষ্ট কিছুমান গাঁথনিয়ে আপোনাৰ উপগ্ৰহৰ সংযোগত প্ৰভাৱ পেলাব পাৰে। উপগ্ৰহৰ জৰিয়তে কল কৰাৰ সুবিধাটো উপলব্ধ নহয়। জৰুৰীকালীন কলসমূহ তথাপি সংযোগ হ\'ব পাৰে।\n\nএকাউণ্টৰ সালসলনিসমূহ ছেটিঙত দেখুৱাবলৈ কিছু সময় লাগিব পাৰে। সবিশেষৰ বাবে আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"উপগ্ৰহৰ জৰিয়তে বাৰ্তা বিনিময় কৰাৰ বিষয়ে অধিক"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>এ অধিক সময় ল\'ব পাৰে আৰু ই কেৱল কিছুমান অঞ্চলতহে উপলব্ধ। বতৰ আৰু নিৰ্দিষ্ট কিছুমান গাঁথনিয়ে আপোনাৰ উপগ্ৰহৰ সংযোগত প্ৰভাৱ পেলাব পাৰে। উপগ্ৰহৰ জৰিয়তে কল কৰাৰ সুবিধাটো উপলব্ধ নহয়। জৰুৰীকালীন কলসমূহ তথাপি সংযোগ হ\'ব পাৰে।\n\nএকাউণ্টৰ সালসলনিসমূহ ছেটিঙত দেখুৱাবলৈ কিছু সময় লাগিব পাৰে। সবিশেষৰ বাবে <xliff:g id="CARRIER_NAME">%1$s</xliff:g>ৰ সৈতে যোগাযোগ কৰক।"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g>ৰ বিষয়ে অধিক"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> অন কৰিব নোৱাৰি"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> অন কৰিবলৈ, প্ৰথমে উপগ্ৰহৰ সংযোগ সমাপ্ত কৰক"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"উপগ্ৰহৰ সংযোগ"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"উপগ্ৰহৰ সংযোগ"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"উপগ্ৰহৰ সংযোগ"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"উপগ্ৰহৰ দ্বাৰা বাৰ্তা বিনিময়"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"আপোনাৰ একাউণ্টত ডেটা ব্যৱহাৰ কৰাটো অন্তর্ভুক্ত"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"উপগ্ৰহ SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"আপুনি কোনো ম\'বাইল বা ৱাই-ফাই নেটৱর্কৰ সৈতে সংযোগ কৰিবলৈ জৰুৰীকালীন সেৱাৰ সৈতে বাৰ্তা বিনিময় কৰক"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"উপগ্ৰহ SOS, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"উপগ্ৰহ SOSৰ বিষয়ে"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"আপুনি কোনো ম\'বাইল বা ৱাই-ফাই নেটৱর্কৰ সৈতে সংযোগ কৰিব নোৱাৰিলে জৰুৰীকালীন সেৱাৰ সৈতে বাৰ্তা বিনিময় আৰু অৱস্থান শ্বেয়াৰ কৰিব পাৰে। এই সেৱা সকলো সময়তে আটাইবোৰ অৱস্থান বা পৰিস্থিতিত উপলব্ধ নহ’বও পাৰে।"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"জৰুৰীকালীন সেৱালৈ কল কৰক বা চাট কৰক"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"জৰুৰীকালীন পৰিস্থিতিটোৰ বিষয়ে কৰা প্ৰশ্নসমূহৰ উত্তৰ দিয়ক"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"উপগ্ৰহৰ সৈতে সংযোগ কৰিবলৈ পদক্ষেপসমূহ অনুসৰণ কৰক"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"যদি আপোনাৰ ম’বাইল নেটৱৰ্ক নাই, তেন্তে আপুনি উপগ্ৰহ SOS ব্যৱহাৰ কৰাৰ বিকল্প দেখিব"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"আপোনাক সঠিক ধৰণৰ সহায় প্ৰদান কৰিবলৈ উত্তৰসমূহ জৰুৰীকালীন সেৱালৈ প্ৰেৰণ কৰক"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"সংযোগ কৰাৰ পাছত আপুনি জৰুৰীকালীন সেৱালৈ বাৰ্তা পঠিয়াব পাৰে"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"এটা ডেম’ ব্যৱহাৰ কৰি চাওক"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"যেতিয়া আপুনি উপগ্ৰহৰ দ্বাৰা জৰুৰীকালীন সেৱাসমূহৰ সৈতে সংযোগ কৰে, আপোনাৰ নাম, ইমেইল, ফ’ন নম্বৰ, অৱস্থান, ডিভাইচৰ তথ্য (IMEI, ভাষা, মডেল, বেটাৰীৰ স্তৰ), আৰু জৰুৰীকালীন সম্পৰ্কৰ তথ্য জৰুৰীকালীন সেৱাসমূহ আৰু উপগ্ৰহ সেৱা প্ৰদানকাৰীৰ সৈতে শ্বেয়াৰ কৰা হয়। \n\nউপগ্ৰহ SOS ব্যৱহাৰ কৰিবলৈ, Google Messages আপোনাৰ ডিফ’ল্ট SMS এপ্‌ হ’বই লাগিব। \n\nযদি স্বয়ংক্ৰিয়ভাৱে নেটৱর্ক বাছনি কৰাটো অফ আছে, এইটো অন কৰা হ\'ব আৰু আপোনাৰ ডিভাইচটো স্বয়ংক্ৰিয়ভাৱে যিকোনো নেটৱর্কৰ সৈতে সংযুক্ত হ\'ব।"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"শ্বেয়াৰ কৰাৰ বিকল্প"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"জৰুৰীকালীন সম্পৰ্ক"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"আপোনাৰ Google একাউণ্ট"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"জৰুৰীকালীন সেৱাসমূহৰ সৈতে শ্বেয়াৰ কৰিবলগীয়া তথ্য পৰ্যালোচনা অথবা আপডে’ট কৰক"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"এক্সেছ পইণ্টৰ নাম"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"এপিএন"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিলে উপলব্ধ নহয়"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ১৬ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি ৪ কেবি ম’ডলৈ উভতি যাবই লাগিব আৰু তাৰ পাছত ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। ই ডিভাইচটো পুনৰ ফেক্টৰী ৰিছেট কৰিব আৰু সেইটোক উৎপাদন ছেটিঙলৈ পুনঃস্থাপন কৰিব। ডিভাইচটোৱে Androidত সফলতাৰে বুট কৰাৰ পাছত, বিকাশকৰ্তাৰ বিকল্পসমূহত OEM আনলক কৰাটো অক্ষম কৰক। যদি ডিভাইচটো Androidত বুট কৰিব পৰা নাযায় বা অস্থিৰ হয়, তেন্তে &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;ৰ পৰা শেহতীয়া ফেক্টৰী প্ৰতিচ্ছবিসমূহৰ সৈতে ডিভাইচটো পুনৰ ফ্লেশ্ব কৰক আৰু \'ডিভাইচৰ ডেটা মচি পেলাওক\', \'বুটল’ডাৰ লক কৰক\' আৰু \'আটাইবোৰ বিভাজন বলপূৰ্বক ফ্লেশ্ব কৰক\' বাছনি কৰক।"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"১৬ কেবি পেজ-এগন’ষ্টিক ম’ড"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"অধিক পঢ়ক"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"এপ্‌টো পৃষ্ঠাৰ আকাৰৰ সুসমতা ম’ডৰ জৰিয়তে চলাওক"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"বাগ ৰিপ’ৰ্ট নিয়ন্ত্ৰণ কৰোঁতা"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"আপোনাৰ ডিভাইচত কোনটো এপে বাগ ৰিপ’ৰ্টৰ শ্বৰ্টকাট নিয়ন্ত্ৰণ কৰে সেয়া নিৰ্ধাৰণ কৰে।"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ব্যক্তিগত"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ষ্ট্ৰীম শুনক"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ৰ জৰিয়তে শুনিবলৈ অডিঅ’ ষ্ট্ৰীমৰ কিউআৰ ক’ড এটা স্কেন কৰক"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"শ্বেয়াৰ কৰি থকা সময়ত পাছৱৰ্ড সম্পাদনা কৰিব নোৱাৰি। পাছৱৰ্ডটো সলনি কৰিবলৈ, প্ৰথমে অডিঅ’ শ্বেয়াৰিং অফ কৰক।"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"আপোনাৰ পাছৱৰ্ডটোত ৪-১৬ টা বৰ্ণসংখ্যা থাকিবই লাগিব আৰু সেইটোত কেৱল বৰ্ণ, সংখ্যা আৰু চিহ্ন ব্যৱহাৰ কৰিব পাৰি"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"কিউআৰ ক’ড স্কেনাৰ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"সহায় লাগে নেকি?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"সন্ধানৰ ছেটিংসমূহ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"সম্পর্ক, ষ্ট’ৰেজ, একাউণ্ট"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"সম্পৰ্কৰ ষ্ট’ৰেজ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ডিভাইচ মাত্ৰ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"নতুন সম্পৰ্কসমূহ একাউণ্টৰ সৈতে ছিংক কৰা নহ’ব"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"সম্পৰ্কসমূহ আপোনাৰ ডিভাইচত ছেভ কৰা হ’ব আৰু ডিফ’ল্টভাৱে আপোনাৰ একাউণ্টত ছিংক কৰা হ’ব"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ডিফ’ল্ট একাউণ্ট ছেট কৰোঁতে আসোঁৱাহ হৈছে"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"কোনো ডিফ’ল্ট ছেট কৰা হোৱা নাই"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ডিভাইচ মাত্ৰ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ডিভাইচ আৰু %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"আৰম্ভ কৰিবলৈ এটা একাউণ্ট যোগ দিয়ক"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"সম্পৰ্কসমূহ ক’ত ছেভ কৰিব লাগে"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"সন্ধান কৰিবৰ বাবে বৃত্ত"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"আপোনাৰ স্ক্ৰীনত থকা সমলটো ব্যৱহাৰ কৰি সন্ধান কৰিবলৈ গৃহ বুটামটো বা নেভিগেশ্বন হেণ্ডেল স্পৰ্শ কৰি ধৰি ৰাখক।"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index e035d4e93e5..6293141d695 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Qar uçqunu"</item>
     <item msgid="7952183800501346803">"Çimərlik çətiri"</item>
     <item msgid="799139025758265891">"Emalatxana alətləri"</item>
-    <item msgid="1330084588359129896">"Çadır"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Kinolent"</item>
     <item msgid="5827426100157335512">"Kitab"</item>
     <item msgid="8585828346253128384">"Lotus çiçəyi"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index d37cd5b063d..8648045c526 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Cihaz əlavə edin"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Sabah avtomatik aktiv edin"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth-u söndürsəniz, növbəti gün yenidən aktivləşir"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Sağ qulaqlığı birləşdirin"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Sol qulaqlığı birləşdirin"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Digər qulaqlığı birləşdirin"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE audionu deaktiv edin"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Cihaz LE audio avadanlıq imkanlarını dəstəkləyirsə, Bluetooth LE audio funksiyasını deaktiv edir."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio rejimi"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio Yayım üzrə istifadəçi interfeysi önizləməsini aktiv edin"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Şəxsi audio paylaşma və şəxsi yayım da daxil olmaqla LE Audio Paylaşım üzrə istifadəçi interfeysi önizləməsini aktivləşdirir"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE audio açarı görünsün: Cihaz detalları"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio üzrə icazə verilənlər siyahısına qoşulmayın"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio periferik cihazının icazə verilənlər siyahısı üzrə meyarlara cavab verdiyi doğrulanmasa da, defolt olaraq LE Audio istifadə edin."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Tətbiq dili"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Təklif edilən dillər"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Bütün dillər"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Təklif edilənlər"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Bütün dillər"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Bütün regionlar"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Bütün nömrələmə sistemləri"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistem dili"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistem defoltu"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Bu tətbiq üçün dil seçimini Ayarlardan etmək olmur."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Dəyişin"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s əlçatan deyil"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bu dil sistem dili kimi istifadə edilə bilməz, lakin tətbiq və veb-saytlara bu dili tərcih etdiyinizi bildirmisiniz."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Axtarın"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dil əlavə edin"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region seçimi"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Dil adını daxil edin"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Digər dil ayarları"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regional tərcihlər"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Vahidlər və nömrə tərcihlərini ayarlayın"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Tətbiqlərə regional tərcihlərinizi bildirin ki, təcrübənizi fərdiləşdirə bilsinlər."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Tətbiqlər mümkün olduqda regional tərcihlərinizdən istifadə edəcək."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regional tərcihlər"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Həftənin ilk günü"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Rəqəm tərcihləri"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Rominq zamanı data xidmətinə qoşulun"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Rominq zamanı data xidmətinə qoşulun"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Rominq xərcləri arta bilər."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Vaxt avtomatik ayarlansın"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Avtomatik olaraq ayarlayın"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Məkan bu keçid aktiv olduqda saat qurşağını təyin etmək üçün istifadə olunacaq"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Avtomatik tarix və vaxt"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Şəbəkə və simsiz siqnallarınızdan istifadə edərək avtomatik təyin edin"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Avtomatik saat qurşağı"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Yaxınlıqdakı mobil şəbəkələrə əsasən avtomatik təyin edin"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Mümkünsə, cihaz məkanı vasitəsilə avtomatik təyin edin"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Regional defolt ayarlar tətbiq olunsun"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat formatından istifadə et"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vaxt"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Barmağınızı qaldırın, sonra sensora təkrar toxunun"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Barmaq izi sensorunu istifadə etmək olmur"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Servis mərkəzinə gedin."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekran sönülü olduqda Barmaqla Kiliddən Açma"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Ekran sönülü olduqda belə, Barmaqla Kiliddən Açma funksiyasından istifadə edin"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekran sönülüdür, Kilidi açın"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Digər güvənlik ayarları"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"İş profili kilidi, şifrələmə və s."</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Şifrələmə, giriş məlumatları və s."</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Şəxsi sahə üçün model qurun"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kilidləyin"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Gizlədin"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Şəxsi sahə modelini təsdiq edin"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Şəxsi sahə PIN-ni yenidən daxil edin"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Şəxsi sahə parolunu yenidən daxil edin"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> ədədə qədər barmaq izi əlavə edə bilərsiniz"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Maksimum sayda barmaq izi əlavə etmisiniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Daha artıq barmaq izi əlavə edilə bilməz"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aktiv"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Deaktiv"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Xarici displey"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Xarici displeyi istifadə edin"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Displeyin ayırdetmə dəqiqliyi"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Xarici displeyin əlaqəsi kəsilib"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Fırlanma və ya ayırdetmə dəqiqliyinin dəyişdirilməsi hazırda işləyən tətbiqləri dayandıra bilər"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Ekranı əks etdirmək üçün cihaz xarici displeyə qoşulmalıdır"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Digər seçimlər"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Displeyləri yenidən tənzimləmək üçün basıb saxlayın və dartın."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayım"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"güzgü"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Naqilsiz displeyi aktivləşdirin"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Parolu yoxlayıb yenidən cəhd edin"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Cihazın istehsalçısı ilə əlaqə saxlayın"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Bağlantını yoxlayın və yenidən cəhd edin"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Bu Wi‑Fi şəbəkəsi əlçatan deyil"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Bu QR kodu ilə bağlı problem var. Başqa üsulla qoşulmağa çalışın."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Şəbəkə seçin"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Cihazın qoşulması üçün şəbəkə seçin"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Bu cihaz \"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə əlavə edilsin?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Avtodönüş haqqında ətraflı məlumat"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekran dəqiqliyi"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Yüksək ayırdetmə dəqiqliyi"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Tam ayırdetmə dəqiqliyi"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Tam ayırdetmə dəqiqliyi batareyanızdan daha çox istifadə edir. Ayırdetmə dəqiqliyinin keçirilməsi bəzi tətbiqlərin yenidən başladılmasına səbəb ola bilər."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seçilib"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Rənglər"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Təbii"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptiv"</string>
     <string name="brightness" msgid="6216871641021779698">"Parlaqlıq səviyyəsi"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptiv parlaqlıq"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Adaptiv parlaqlıq haqqında"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekran parlaqlığı avtomatik olaraq ətraf mühitə və fəaliyyətlrinizə görə tənzimlənəcək. Ayarlana bilən parlaqlığın təcihlərinizi öyrənməsi üçün slayderi əlinizlə hərəkət etdirin."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aktiv"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Deaktiv"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Yuxu vaxtı rejimi ayarları"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Rejimlər tünd temanı da aktivləşdirə bilər}=1{{mode_1} tünd temanı da aktivləşdirir}=2{{mode_1} və {mode_2} tünd temanı da aktivləşdirir}=3{{mode_1}, {mode_2} və {mode_3} tünd temanı da aktivləşdirir}other{{mode_1}, {mode_2}, və # rejim tünd temanı da aktivləşdirir}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Rejim ayarları"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Daha qaranlıq"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Əlavə qaraltma"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Cihazın həmişəkindən daha çox qaralmasına icazə verin"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Avtomatik ekran sönməsi"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth deaktiv olanda da tətbiq və xidmətlərin cihaz axtarmasına icazə verin. Bununla da məkan haqqında məlumata ehtiyacı olan funksiya və xidmətlərin iş keyfiyyəti artmış olur."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Məkan xidmətləri"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Məkan xidmətləri"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Məkandan istifadə edin"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Saat qurşağı üçün məkandan istifadə edin"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Saat qurşağını avtomatik ayarlamaq mümkün deyil"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Məkan və ya Məkan Xidmətləri deaktivdir"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Məkan ayarları"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Bunu düzəldin"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Ləğv edin"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Avtomatik saat qurşağı deaktivdir"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Avtomatik saat qurşağı deaktiv olduqda əlçatan deyil"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Məkan saat qurşağını təyin etmək üçün istifadə edilə bilər"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Cihazın məkanı əlçatandırsa, saat qurşağını təyin etmək üçün istifadə edilə bilər"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Hüquqi məlumata, statusa, proqram versiyasına baxın"</string>
     <string name="legal_information" msgid="7509900979811934843">"Hüquqi məlumat"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Seçimlər"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Əlçatımlıq"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziki klaviatura"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Sıçrama düymələri"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klaviatura <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms ərzində eyni düymənin tez-tez basılmasını nəzərə almır"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviatura eyni düymənin təkrarən basılmasını nəzərə almır"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Sıçrayan klaviş üzrə hədd"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klaviaturanızın təkrarlanan düymə basılmalarını nəzərə almayacağı müddəti seçin"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Fərdi"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"fərdi qiymət"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Asta düymələr"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Düymənin aktivləşdirilməsi vaxtını <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms-ə tənzimləyir"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Düyməyə basmağın aktivləşdirilməsi üçün tələb olunan vaxtı tənzimləyir"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Əvəzedici düymələr"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Qısayollar üçün düymələri birlikdə basıb saxlamaq əvəzinə hər dəfə bir düyməyə basın"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Maus düymələri"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Mausu idarə etmək üçün fiziki klaviaturadan istifadə edin."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Maus düymələrindən istifadə edin"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Poynteri idarə etmək üçün klaviaturadan istifadə edin"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mausun geri sürüşdürülməsi"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Səhifəni aşağı hərəkət etdirmək üçün yuxarı sürüşdürün"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sol və sağ düymələri dəyişin"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Mausun sol düyməsini sağ kimi istifadə edin"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> üçün maus düymələri"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Maus göstəricisini hərəkət etdirmək üçün <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> düymələrindən istifadə edin"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Əsas maus düyməsinə klikləmək üçün <xliff:g id="CLICK_LABEL">%s</xliff:g> düyməsindən istifadə edin"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Əsas maus düyməsinə basıb saxlamaq üçün <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> düyməsindən istifadə edin"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Əsas maus düyməsini buraxmaq üçün <xliff:g id="RELEASE_LABEL">%s</xliff:g> düyməsindən istifadə edin"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Sürüşdürmə rejimini dəyişmək üçün <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> düyməsindən istifadə edin. Bu, <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> düymələrinin görünüşü yuxarı, aşağı, sola və ya sağa sürüşdürməsini təmin edəcək"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"İkinci dərəcəli maus düyməsinə klikləmək üçün <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> düyməsindən istifadə edin"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klaviatura qısayolları"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Qısayolların siyahısını göstərin"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"İş profili klaviaturaları və alətlər"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Defolt"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Taçped"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Taçped &amp; maus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Maus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Göstərici sürəti, jestlər"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Toxunaraq klikləyin"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Toxunaraq sürüşdürmək"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Aşağı sağ tərəfə klikləyin"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Digər seçimlər üçün taçpedin aşağı sağ küncünə klikləyin"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kursor sürəti"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Üç barmaqla toxunuşdan istifadə edin"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Göstərici rəngi"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Poynter doldurma üslubunu qaraya dəyişin"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Poynter doldurma üslubunu yaşıla dəyişin"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Taçped jestlərini öyrənin"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trekped, trek ped, maus, kursor, sürüşdürün, çəkin, sağ düymə ilə toxunun, klikləyin, poynter"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"sağ düymə ilə toxunun, basın"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Ortaya klikləyin"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistenti başladın"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Əsas səhifəyə qayıdın"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Geri qayıdın"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Son tətbiqlərə baxın"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Əsas səhifəyə keçin"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Taçpedin istənilən yerində üç barmağınızla yuxarı sürüşdürün"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Geri qayıdın"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> üçün yeni açar seçin:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziki klaviatura əlçatanlığı"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Əvəzedici düymələr, sıçrama düymələri, maus düymələri"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Düymələri təkrarlayın"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Təkrardan əvvəlki gecikmə"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Təkrar sürəti"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Düymə buraxılana qədər simvolu təkrarlamaq üçün düyməni basıb saxlayın"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> düzəni"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Defolt"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Avtomatik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Önizləmə"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart seçimlər"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Dil"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Mətn ölçüsü"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtitr ölçüsü"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitr üslubu"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Fərdi seçimlər"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Arxa plan rəngi"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Enerji istifadəsini idarə edin"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Daxil edilmiş paketlər"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Tətbiqlər normal işləyir"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Batareyanın dəyişdirilməsi tövsiyə olunur"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batareyanın tutumu və doldurma performansı azalır və batareyanın dəyişdirilməsi tövsiyə olunur."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Enerji qurtarır"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Enerjiyə qənaət etmək üçün qənaət rejimini aktivləşdirin"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Batareya ömrünü artırın"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN bağlantısı kəsilsin?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Bağlantını kəsin"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versiya <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN\'i unudun"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mövcud VPN əvəz edilsin?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Hər zaman aktiv VPN quraşdırılsın?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09:00 - 17:00 həftəiçi\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Təqvim tədbirləri"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} aktivdir}=2{{mode_1} və {mode_2} aktivdir}=3{{mode_1}, {mode_2} və {mode_3} aktivdir}other{{mode_1}, {mode_2} və daha # rejim aktivdir}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 rejim avtomatik işə düşə bilər}other{# rejim avtomatik işə düşə bilər}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Narahat Etməyin}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AKTİV"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ayarlanmayıb"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Deaktiv"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Anladım"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Bildirişlər"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Müddət"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mesaj, tədbir və xatırlatmalar"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Hazırdır"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ayarlar"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bildirişlər tam söndürülsün"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bildirişlər səssiz olsun"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Bildirişlərə baxa və ya eşidə bilməyəcəksiniz. Ulduzlanmış kontaktlar və təkrarlanan zənglər icazəlidir."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Cari ayarlar)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"Narahat Etməyin\" bildiriş ayarları dəyişdirilsin?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"İş profili səsləri"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Şəxsi profil səslərini istifadə edin"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Şəxsi profilinizlə eyni səslərdən istifadə edin"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Kiliddən çıxarıb, son istifadə edilən ekrana keçin. Kilid ekranında bildiriş görünməyəcək. Görmək üçün yuxarıdan aşağı sürüşdürün."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran kilidi, ekrankilidi, keçin, ötürün"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"İş profili kilidləndikdə"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Kilid ekranı bildirişlərinin minimalizmi"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Kilid ekranında daha az bildiriş göstərin"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Kilid ekranında yalnız yeni bildirişləri göstərin"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Əvvəlcədən baxılan bildirişləri kilid ekranından avtomatik silin"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Kilid ekranında bildirişlər"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Defolt və səssizlər daxil olmaqla, söhbətləri göstərin"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Hamısı göstərilsin"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Bütün iş bildirişləri göstərilsin"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Həssas məlumatı gizlədin"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Cihazınız kilidləndiyi zaman profil bildirişlərinin necə göstərilməsini istəyirsiniz?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profil bildirişləri"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Bildirişlər"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Tətbiq bildirişləri"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Qısa müddətdə çoxlu bildiriş alanda cihaz 2 dəqiqəyədək səsi azaldacaq və xəbərdarlıqları minimuma endirəcək. Zənglər, alarmlar və prioritet söhbətlər təsirə məruz qalmır. \n\nFasilə zamanı qəbul edilən bildirişləri ekranın yuxarısından aşağı çəkərək tapmaq olar."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"İş profillərinə tətbiq edin"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"İş profili tətbiqlərinə tətbiq edin"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Paketlənmiş bildirişlər"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aktiv"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Deaktiv"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Bildiriş paketləməsini istifadə edin"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Bənzər mövzulu bildirişlər susdurulacaq və daha sakit təcrübə üçün bir yerdə qruplaşdırılacaq. Paketləmə tətbiqin öz bildiriş ayarlarını əvəzləyəcək."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR köməkçi xidmətləri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Heç bir tətbiq VR köməkçi xidmətləri kimi çalışma sorğusu göndərməyib."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xidmətinə <xliff:g id="SERVICE">%1$s</xliff:g> üçün girişə icazə verilsin?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritet söhbətlər"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Söhbət ayarları"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Sizinlə kim əlaqə saxlaya bilər"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mesajlaşma və ya zəng tətbiqləri sizi xəbərdar edə bilməsə belə, burada seçdiyiniz insanlar hələ də həmin tətbiqlər vasitəsilə sizinlə əlaqə saxlaya bilər"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zənglər"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontakt ayarları"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Ulduzlu kontakt ayarları"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Heç biri"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Heç biri"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Siqnallar"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Heç bir tətbiq bildiriş göndərə bilməz}=1{{app_1} bildiriş göndərə bilər}=2{{app_1} və {app_2} bildiriş göndərə bilər}=3{{app_1}, {app_2} və {app_3} bildiriş göndərə bilər}other{{app_1}, {app_2} və daha # tətbiq bildiriş göndərə bilər}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (İş)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Hesablanır…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Tətbiq ayarları"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tətbiqlərin rejimdən imtina etməsinə icazə verin"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Narahat etmiş sayılmayan tətbiqlər"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Rejim yaradın"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Fərdi rejim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Rejim adı"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Rejimin adı boş ola bilməz"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Piktoqram seçin"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Təqvim tədbirləri"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Yuxu vaxtı rejimi"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Avtomobil sürərkən"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Tam ekran bildirişləri"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Bu tətbiqdən tam ekran bildirişlərinə icazə verin"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Bu tətbiqə cihaz kilidli olduqda tam ekranı tutan bildirişlər göstərmək icazəsi verin. Bunlar zəngli saat, gələn zəng və ya digər təcili bildirişlər üçündür."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Yazı sistemi tərcihləri"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Bu tətbiqin sizin adınıza sistem tərcihlərini dəyişməyinə icazə verin"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Bu icazə tətbiqin əsas sistem tərcihlərini dəyişməyinə imkan verir."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media idarəetmə tətbiqləri"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Tətbiqə medianı idarə etməyə icazə verin"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"İcazə verildiyi təqdirdə, bu tətbiq sizə soruşmadan digər tətbiqlərlə yaradılan media fayllarını dəyişdirə və ya silə bilər. Tətbiqin fayllara və mediaya giriş icazəsi olmalıdır."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Jestlər"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kameranı cəld açın"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"İstənilən tətbiqdə kameranı düyməni iki dəfə basaraq açın."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Ön kameraya keçirin"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Naviqasiya rejimi"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Peyk vasitəsilə mesajlaşma"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Peyk vasitəsilə mətn mesajları göndərin və qəbul edin. Hesaba daxil edilib."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Peyk vasitəsilə mətn mesajları göndərin və qəbul edin. Hesabınıza daxil deyil."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Peyk vasitəsilə mesajlaşma"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Peyk vasitəsilə mesajlaşma haqqında"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Uyğun <xliff:g id="CARRIER_NAME">%1$s</xliff:g> hesabında peyk vasitəsilə mətn mesajları göndərə və qəbul edə bilərsiniz"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> planınız"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Peyk vasitəsilə mesajlaşma hesaba daxil edilib"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Peyk vasitəsilə mesajlaşma hesaba daxil edilməyib"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Ətraflı Məlumat"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Haqqında"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefon peykə avtomatik qoşulacaq. Yaxşı bağlantı üçün səma aydın görünməlidir."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Telefon peykə qoşulduqdan sonra"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Təcili xidmətlər daxil olmaqla istədiyiniz şəxsə mesaj yaza bilərsiniz. Əlçatan olduqda telefon mobil şəbəkəyə yenidən qoşulacaq."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Peyk vasitəsilə mesajlaşma uzun çəkə bilər və yalnız bəzi ərazilərdə əlçatandır. Hava və müəyyən strukturlar peyk bağlantısına təsir edə bilər. Peyk vasitəsilə zənglər hələ əlçatan deyil. Təcili zənglər yenə qoşula bilər.\n\nHesab dəyişikliklərinin Ayarlarda görünməsi bir müddət çəkə bilər. Ətraflı məlumat üçün operator ilə əlaqə saxlayın."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Peyk vasitəsilə mesajlaşma haqqında ətraflı"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> funksiyasını yandırmaq olmur"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> funksiyasını yandırmaq üçün əvvəlcə peyk bağlantısını sonlandırın"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Peyk bağlantısı"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Giriş nöqtəsi adları"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ünvanına qoşulduqda əlçatan deyil"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Səhifədən asılı olmayan rejimin 16 KB rejimindəsiniz. Bu rejimdə proqram təminatının bütövlüyü təmin edilə bilməz və yükləyicinin kilidi açıq halda telefonda saxlanılan data risk altında ola bilər. Bu rejimlərdə bəzi funksiyalar deaktiv ediləcək, buna görə də bəzi tətbiqlər işləməyə bilər. İstehsal rejiminə yenidən daxil olmaq üçün yenidən 4 KB rejiminə keçməli və sonra cihazın yükləyicisini kilidləməlisiniz. Bununla cihaz yenidən zavod ayarlarına qayıdacaq və istehsal ayarları bərpa ediləcək. Cihaz Android-ə yükləndikdən sonra Developer seçimlərində OEM kiliddən çıxarılmasını deaktiv edin. Cihaz Android-ə yüklənmirsə və ya qeyri-sabitdirsə, cihazı buradan əldə edilən ən son fabrik şəkilləri ilə yenidən işə salın: &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; yaxud &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; istifadə edin və \"Cihaz datasını silin\", \"Yükləyicini kilidləyin\" və \"Bütün hissələri məcburi yükləyin\" seçin."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB səhifə-aqnostik rejimi"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ətraflı məlumat"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Tətbiqi səhifə ölçüsü uyğunluq rejimi ilə işə salın"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Baq hesabatı idarəedicisi"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Seçilmiş tətbiq xəta hesabatının göndərilməsi düyməsini basanda işə salınacaq."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Şəxsi"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Yayımı dinləyin"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə dinləmək üçün audio yayımı QR kodunu skanlayın"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Paylaşarkən parolu redaktə etmək olmur. Parolu dəyişmək üçün əvvəlcə audio paylaşmanı deaktiv edin."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Parolunuz 4-16 simvoldan ibarət olmalıdır və yalnız hərf, rəqəm və simvollardan istifadə edilməlidir"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR kod skaneri"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Kömək lazımdır?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Axtarış Ayarları"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktlar, yaddaş, hesab"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakt yaddaşı"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Yalnız cihaz"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yeni kontaktlar hesab ilə sinxronlaşdırılmayacaq"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktlar cihazınızda saxlanılacaq və defolt olaraq hesabınız ilə sinxronlaşdırılacaq"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Defolt hesabı ayarlayarkən xəta baş verdi"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Defolt ayarlanmayıb"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Yalnız cihaz"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Cihaz və %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamaq üçün hesab əlavə edin"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kontaktları harada yadda saxlamalı"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Dairəyə alaraq axtarın"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Ekrandakı kontentdən istifadə edərək axtarış etmək üçün Əsas ekran düyməsinə və ya naviqasiya tutacağına basıb saxlayın."</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 95361005632..0a97d195747 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Pahulja"</item>
     <item msgid="7952183800501346803">"Suncobran"</item>
     <item msgid="799139025758265891">"Alat iz radionice"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
+    <item msgid="8112685757657659269">"Klavir"</item>
     <item msgid="3861584909935022342">"Rolna filma"</item>
     <item msgid="5827426100157335512">"Knjiga"</item>
     <item msgid="8585828346253128384">"Cvet lotosa"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 27f386649ee..a8fa6f43dc0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ako isključite Bluetooth, ponovo će se uključiti sledećeg dana"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Upari desno uvo"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Upari levo uvo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Uparite drugo uvo"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Onemogući Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Onemogućava funkciju Bluetooth LE audio ako uređaj podržava mogućnosti LE audio hardvera."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio režim"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Omogući pregled korisničkog interfejsa za Bluetooth LE Audio emitovanje"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Omogućava pregled korisničkog interfejsa za Bluetooth LE Audio, uključujući deljenje ličnih audio snimaka i privatno emitovanje"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE Audio prekidač u detaljima o uređaju"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Zaobiđi Bluetooth LE Audio listu dozvoljenih"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Podrazumevano koristi LE Audio čak i ako nije potvrđeno da LE Audio periferni uređaj zadovoljava kriterijume liste dozvoljenih."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jezik aplikacije"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Predloženi jezici"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Svi jezici"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Predloženo"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Svi jezici"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Svi regioni"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Svi sistemi za numerisanje"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Jezik sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Podrazumevani sistemski"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Izbor jezika za ovu aplikaciju nije dostupan iz Podešavanja."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Promeni"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Nije dostupno: %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Ovaj jezik ne može da se koristi kao jezik sistema, ali ste obavestili aplikacije i veb-sajtove da želite ovaj jezik."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pretraži"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dodajte jezik"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Podešavanje regiona"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Unesite naziv jezika"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Još podešavanja jezika"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionalna podešavanja"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Izaberite podešavanja jedinica i brojeva"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Omogućite aplikacijama da saznaju vaša regionalna podešavanja kako bi mogle da personalizuju vaš doživljaj."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacije će koristiti regionalna podešavanja kada je to moguće."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionalna podešavanja"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prvi dan nedelje"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Podešavanja brojeva"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Poveži sa uslugom za podatke u romingu"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Poveži sa uslugom za podatke u romingu"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Mogu da važe naknade za roming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Podesi vreme automatski"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Podesi automatski"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokacija će se koristiti za podešavanje vremenske zone kada je ovaj prekidač uključen"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatski datum i vreme"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatsko podešavanje pomoću mreže i bežičnih signala"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatsko podešavanje na osnovu mobilnih mreža u blizini"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Automatsko podešavanje pomoću lokacije uređaja, ako je dostupna"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi podrazumevanu vrednost za lokalitet"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-časovni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vreme"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Podignite prst, pa ponovo dodirnite senzor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Ne možete da koristite senzor za otisak prsta"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Posetite dobavljača za popravke."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Otključavanje otiskom prsta kada je ekran isključen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Koristite otključavanje otiskom prsta čak i kada je ekran isključen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Isključen ekran, otključavanje"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Još bezbednosnih podešavanja"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zaključavanje poslovnog profila, šifrovanje i drugo"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifrovanje, akreditivi i drugo"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Podesite obrazac za privatni prostor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zaključaj"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Sakrij"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potvrdite šablon za privatan prostor"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Ponovo unesite PIN za privatan prostor"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Ponovo unesite lozinku za privatan prostor"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Možete da ih dodate do <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ne možete da dodate još otisaka prstiju"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Uključeno"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Isključeno"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Spoljni ekran"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ugrađeni ekran"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Koristi spoljni ekran"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rezolucija ekrana"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Spoljni ekran je isključen"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Promena rotacije ili rezolucije može da zaustavi sve aplikacije koje su trenutno aktivne"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Uređaj mora da bude povezan sa spoljnim ekranom da bi se preslikao ceo ekran"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Još opcija"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Zadržite i prevucite da biste prerasporedili prikaz na ekranima."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prebacivanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikati"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Proverite lozinku i probajte ponovo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Obratite se proizvođaču uređaja"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Proverite vezu i probajte ponovo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ova WiFi mreža trenutno nije dostupna"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Postoji problem sa ovim QR kodom. Probajte da se povežete na drugi način."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Odaberite mrežu"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Da biste povezali uređaj, odaberite mrežu"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Želite li da dodate ovaj uređaj na mrežu „<xliff:g id="SSID">%1$s</xliff:g>“?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saznajte više o automatskom rotiranju"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rezolucija ekrana"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Visoka rezolucija"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Puna rezolucija"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Puna rezolucija koristi više baterije. Ako pređete na ovu rezoluciju, neke aplikacije će se možda restartovati."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimalna rezolucija"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimalna rezolucija koristi više baterije. Ako pređete na ovu rezoluciju, neke aplikacije će se možda restartovati."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Izabrano je"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Prilagodljivo"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivo osvetljenosti"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Prilagodljiva osvetljenost"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"O priladoljivoj osvetljenosti"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Osvetljenost ekrana će se automatski prilagođavati okruženju i aktivnostima. Možete ručno da pomerate klizač da bi prilagodljivo podešavanje osvetljenosti naučilo šta vam odgovara."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Uključeno"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Isključeno"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Podešavanja režima za spavanje"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Režimi mogu i da aktiviraju tamnu temu}=1{{mode_1} aktivira i tamnu temu}=2{{mode_1} i {mode_2} aktiviraju i tamnu temu}=3{{mode_1}, {mode_2} i {mode_3} aktiviraju i tamnu temu}one{{mode_1}, {mode_2} i još # aktiviraju i tamnu temu}few{{mode_1}, {mode_2} i još # aktiviraju i tamnu temu}other{{mode_1}, {mode_2} i još # aktiviraju i tamnu temu}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Podešavanja režima"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Još slabije osvetljenje"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Dodatno zatamnjeno"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Dozvolite da osvetljenje uređaja bude slabije nego obično"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Gašenje ekrana"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Usluge lokacije"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Koristi lokaciju"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Koristi lokaciju za vremensku zonu"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Vremenska zona ne može da se podesi automatski"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokacija ili Usluge lokacije su isključene"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Podešavanja lokacije"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Popravi ovo"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Otkaži"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nije dostupno kada je isključena automatska vremenska zona"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokacija može da se koristi za podešavanje vremenske zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ako je lokacija uređaja dostupna, može da se koristi za podešavanje vremenske zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Pregled pravnih informacija, statusa, verzije softvera"</string>
     <string name="legal_information" msgid="7509900979811934843">"Pravne informacije"</string>
     <string name="manual" msgid="3651593989906084868">"Uputstvo"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcije"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pristupačnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizička tastatura"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Duži odziv tastera"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastatura zanemaruje brze pritiske istog tastera koji se ponavljaju u roku od <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatura zanemaruje brze pritiske istog tastera koji se ponavljaju"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag za duži odziv tastera"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Odaberite koliko dugo tastatura zanemaruje ponavljane pritiske tastera"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sek"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sek"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sek"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Prilagođeno"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"prilagođena vrednost"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Spori tasteri"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Priladite vreme potrebno da se taster aktivira posle pritiska na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Prilagodite vreme za aktiviranje tastera posle pritiska"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Lepljivi tasteri"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pritiskajte jedan po jedan taster da biste koristili prečice umesto da istovremeno držite tastere"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tasteri miša"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Koristite fizičku tastaturu da biste upravljali mišem."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Koristite tastere miša"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Kontrolišite pokazivač pomoću tastature"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto skrolovanje mišem"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Skrolujte nagore da biste pomerili stranicu nadole"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamenite dugmad nalevo i nadesno"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Koristite levi taster miša kao desni"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tasteri miša za: <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Koristite tastere <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> da biste pomerili pokazivač miša"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Koristite taster <xliff:g id="CLICK_LABEL">%s</xliff:g> da biste kliknuli na primarno dugme miša"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Koristite taster <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> da biste pritisnuli i zadržali primarni taster miša"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Koristite taster <xliff:g id="RELEASE_LABEL">%s</xliff:g> da biste oslobodili primarno dugme miša"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Koristite taster <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> da biste uključili ili isključili režim skrolovanja. Tako ćete pomoću tastera <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> skrolovati prikaz nagore, nadole, ulevo ili udesno"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Koristite taster <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> da biste kliknuli na sekundarno dugme miša"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tasterske prečice"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikazuje listu prečica"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastature i alatke za poslovni profil"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Podrazumevano"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Tačped"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Tačped i miš"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Miš"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Brzina pokazivača, pokreti"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Dodirnite da biste kliknuli"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Prevlačenje dodirom"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik dole desno"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Za više opcija, kliknite na donji desni ugao tačpeda"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Brzina pokazivača"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Koristite dodir pomoću tri prsta"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Boja pokazivača"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Promenite stil popune u crno"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Promenite stil popune u zeleno"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Naučite pokrete za tačped"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"dodirna tabla, miš, kursor, skrolovanje, prevlačenje, desni klik, klik, pokazivač"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"desni klik, dodir"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Srednji klik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Pokreni Pomoćnik"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Idi na početni ekran"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Nazad"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Prikaži nedavne aplikacije"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Idi na početni ekran"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Prevucite nagore sa tri prsta bilo gde na tačpedu"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Nazad"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novi taster za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tastature"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Lepljivi tasteri, duži odziv tastera, tasteri miša"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ponavljanje tastera"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Odlaganje pre ponavljanja"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Brzina ponavljanja"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pritisnite i zadržite taster da biste ponavljali unos znaka sve dok ne pustite taster"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Raspored <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Podrazumevano"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatski: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Veličina teksta"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titla"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titla"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Prilagođavanje korišćenja napajanja"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Sadržani paketi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacije rade uobičajeno"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Preporučujemo zamenu baterije"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapacitet baterije i učinak punjenja su smanjeni i preporučujemo zamenu baterije."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nizak nivo napunjenosti baterije"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Uključite uštedu baterije da biste produžili trajanje baterije"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Produžite trajanje baterije"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Želite li da prekinete vezu sa ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li da zamenite postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li da podesite uvek uključeni VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"9:00–17:00 radnim danima"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Događaji u kalendaru"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Aktivan je {mode_1}}=2{Aktivni su {mode_1} i {mode_2}}=3{Aktivni su {mode_1}, {mode_2} i {mode_3}}one{Aktivni su {mode_1}, {mode_2} i još # režim}few{Aktivni su {mode_1}, {mode_2} i još # režima}other{Aktivni su {mode_1}, {mode_2} i još # režima}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 režim može da se uključuje automatski}one{# režim može da se uključuje automatski}few{# režima mogu da se uključuju automatski}other{# režima može da se uključuje automatski}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne uznemiravaj}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"UKLJUČENO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nije podešeno"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Onemogućeno"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Važi"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Obaveštenja"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trajanje"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Poruke, događaji i podsetnici"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja i dozvolite prijateljima, članovima porodice ili drugim kontaktima da dopru do vas."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gotovo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Podešavanja"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bez vizuelnog i zvučnog signala obaveštenja"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bez zvučnog signala za obaveštenja"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Nećete videti niti čuti obaveštenja. Pozivi od kontakata sa zvezdicom i ponovnih pozivalaca su dozvoljeni."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(trenutno podešavanje)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Želite li da promenite podešavanja obaveštenja za režim Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvukovi za poslovni profil"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Koristi zvukove ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Koristi iste zvukove kao lični profil"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Posle otključavanja idete direktno na poslednji ekran. Obaveštenja se neće prikazivati na zaključanom ekranu. Prevucite nadole od vrha da biste ih videli."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključani ekran, preskočiti, zaobići"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kada je poslovni profil zaključan"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalistička obaveštenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Prikazujte manje obaveštenja na zaključanom ekranu"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Prikazuj samo nova obaveštenja na zaključanom ekranu"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatski uklanja prethodno pregledana obaveštenja sa zaključanog ekrana"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Obaveštenja na zaključanom ekranu"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Prikazuje konverzacije, i podrazumevane i nečujne"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Prikazuj konverzacije, i podrazumevane i nečujne"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Prikazuj sav sadržaj obaveštenja o poslovnom profilu"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Sakrij osetljiv sadržaj poslovnog profila"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kada je uređaj zaključan, kako želite da se prikazuju obaveštenja o profilu?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Obaveštenja o profilu"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Obaveštenja"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Obaveštenja aplikacija"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kada primite mnogo obaveštenja u kratkom periodu, uređaj će utišati zvuk i smanjiti broj upozorenja na najviše dva minuta. To ne utiče na pozive, alarme ni prioritetne konverzacije. \n\nObaveštenja koja dobijete tokom utišavanja možete da pronađete povlačenjem nadole od vrha ekrana."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Primeni na poslovne profile"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Primenite na aplikacije poslovnog profila"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupisana obaveštenja"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Uključeno"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Isključeno"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Koristi grupisanje obaveštenja"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Zvuk se isključuje za obaveštenja sa sličnim temama i ona se grupišu radi tišeg doživljaja. Grupisanje zamenjuje podešavanja obaveštenja same aplikacije."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za virtuelnu realnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zahtevala da se pokrene kao usluga pomagača za virtuelnu realnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Dozvoljavate pristup usluzi virtuelne realnosti za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritetne konverzacije"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Podešavanja konverzacija"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko može da prekida"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Čak i ako aplikacije za razmenu poruka ili pozivanje ne mogu da vas obaveste, ljudi koje odaberete ovde mogu da dopru do vas preko tih aplikacija"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Podešavanja kontakata"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Podešavanja kontakata sa zvezdicom"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ništa"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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{{app_1}, {app_2} i još # mogu da prekinu}few{{app_1}, {app_2} i još # mogu da prekinu}other{{app_1}, {app_2} i još # mogu da prekinu}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (posao)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Izračunava se…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Podešavanja aplikacija"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dozvoli da aplikacije zanemaruju"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacije koje mogu da prekidaju"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Napravite režim"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Prilagođeni režim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Naziv režima"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Polje za naziv režima ne može biti prazno"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Odaberite ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Događaji u kalendaru"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina vremena za spavanje"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Tokom vožnje"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Obaveštenja preko celog ekrana"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Dozvoli obaveštenja preko celog ekrana od ove aplikacije"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Dozvolite ovoj aplikaciji da prikazuje obaveštenja preko celog ekrana kada je uređaj zaključan. Aplikacije mogu da ih koriste radi isticanja alarma, dolaznih poziva ili drugih hitnih obaveštenja."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Upisivanje podešavanja sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Dozvolite ovoj aplikaciji da u vaše ime menja podešavanja sistema"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Ova dozvola omogućava aplikaciji da menja osnovna podešavanja sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacije za upravljanje medijima"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Omogući aplikaciji upravljanje medijima"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ako se omogući, ova aplikacija može da menja ili briše medijske fajlove napravljene pomoću drugih aplikacija bez pitanja. Aplikacija mora da ima dozvolu za pristup fajlovima i medijima."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Pokreti"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Brzo otvarajte kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Da biste brzo otvorili kameru, dvaput pritisnite dugme za uključivanje. Ovo funkcioniše na svakom ekranu."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Obrnite kameru da biste snimili selfi"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Režim navigacije"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelitska razmena poruka"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Šaljite i primajte tekstualne poruke preko satelita. Obuhvaćeno je nalogom."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Šaljite i primajte tekstualne poruke preko satelita. Nije obuhvaćeno nalogom."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelitska razmena poruka"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"O satelitskoj razmeni poruka"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"razmena poruka preko satelita, satelitska veza"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Više informacija o: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ako kod mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g> imate nalog koji ispunjava uslove, možete da šaljete i primate tekstualne poruke preko satelita."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Paket kod mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelitska razmena poruka je obuhvaćena nalogom"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Razmena poruka je obuhvaćena nalogom"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelitska razmena poruka nije obuhvaćena nalogom"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saznajte više"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Princip rada"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefon će se automatski povezati na satelit. Za najbolji kvalitet veze, uverite se da vam ništa ne zaklanja pogled na nebo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kad se telefon poveže na satelit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Možete da šaljete poruke bilo kome, uključujući hitne službe. Telefon će se ponovo povezati na mobilnu mrežu kada bude dostupna."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satelitska razmena poruka može da traje duže i dostupna je samo u određenim oblastima. Vremenski uslovi i određene strukture mogu da utiču na satelitsku vezu. Pozivanje putem satelita nije dostupno. Hitni pozivi i dalje mogu da se obave.\n\nTreba malo vremena da se promene naloga pojave u Podešavanjima. Obratite se mobilnom operateru za detalje."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Više o satelitskoj razmeni poruka"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> može da traje duže i dostupna je samo u određenim oblastima. Vremenski uslovi i određene strukture mogu da utiču na satelitsku vezu. Pozivanje putem satelita nije dostupno. Hitni pozivi i dalje mogu da se obave.\n\nMože da prođe neko vreme pre nego što se promene naloga prikažu u Podešavanjima. Obratite se mobilnom operateru <xliff:g id="CARRIER_NAME">%1$s</xliff:g> za više detalja."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Više o: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Ne može da se uključi <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Da biste uključili <xliff:g id="FUNCTION">%1$s</xliff:g>, prvo završite satelitsku vezu"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelitska veza"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelitska veza"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelitska veza"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"razmena poruka preko satelita"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Korišćenje podataka je obuhvaćeno nalogom"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Hitna pomoć preko satelita"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Šaljite poruke hitnim službama kada ne možete da se povežete na mobilnu ili WiFi mrežu"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"hitna pomoć preko satelita, hitna pomoć"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"O hitnoj pomoći preko satelita"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Šaljite poruke hitnim službama i delite lokaciju kada nema mobilne ni WiFi mreže. Ova usluga možda nije uvek dostupna na svim lokacijama i u svim okolnostima."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Pozovite hitne službe ili im pošaljite poruku"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Odgovorite na pitanja o hitnom slučaju"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Pratite korake da biste se povezali sa satelitom"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ako nemate vezu sa mobilnom mrežom, videćete opciju da koristite hitnu pomoć preko satelita"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Pošaljite odgovore hitnim službama da biste dobili odgovarajuću pomoć"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kada se povežete, možete da pošaljete poruku hitnim službama"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Pokreni demonstraciju"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kada se povežete sa hitnim službama preko satelita, vaše ime, imejl, broj telefona, lokacija, informacije o uređaju (IMEI, jezik, model, nivo baterije) i informacije o kontaktima za hitne slučajeve dele se sa hitnim službama i dobavljačima satelitskih usluga. \n\nDa biste koristili hitnu pomoć preko satelita, Google Messages mora da bude podrazumevana aplikacija za SMS poruke. \n\nAko je automatski izbor mreže isključen, uključiće se i uređaj će se automatski povezati na bilo koju mrežu."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Podešavanja deljenja"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kontakti za hitne slučajeve"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google nalog"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Pregledajte ili izmenite informacije koje će se deliti sa hitnim službama"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nazivi pristupnih tačaka"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"Naziv pristupne tačke"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano sa: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4913,7 +5033,7 @@
     <string name="network_connection_connecting_message" msgid="433189540877274889">"Povezuje se sa uređajem…"</string>
     <string name="bluetooth_left_name" msgid="7440064067910080502">"Levo"</string>
     <string name="bluetooth_right_name" msgid="7588088072444124949">"Desno"</string>
-    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Futrola"</string>
+    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Kutija"</string>
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterija"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Tabla sa podešavanjima"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogući prozore proizvoljnog formata"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Koristite režim od 16 KB u okviru režima nezavisnog od veličine stranice. U ovom režimu ne može da se garantuje integritet softvera, pa mogu biti ugroženi podaci koji se čuvaju na telefonu dok je pokretački program otključan. Neke funkcije su onemogućene u ovim režimima, što znači da neke aplikacije možda neće raditi. Da biste uređaj ponovo vratili u proizvodni režim, morate da ga vratite na režim od 4 KB i zaključate pokretački program uređaja. To će ponovo resetovati uređaj na fabrička podešavanja i vratiti ga na proizvodna podešavanja. Kada se na uređaju uključi Android, onemogućite OEM otključavanje u Opcijama za programera. Ako je uređaj nestabilan ili se na njemu ne uključi Android, ponovo ga flešujte koristeći najnovije slike sa fabričkim podešavanjima sa &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;. Možete i da koristite &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; i izaberete Obriši uređaj, Zaključaj pokretački program i Prinudno flešuj sve particije."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Režim od 16 kB nezavisan od veličine stranice"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Pročitajte više"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Pokrenite aplikaciju u režimu kompatibilnosti veličine stranice"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Obrađivač izveštaja o grešci"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Određuje koja aplikacija upravlja prečicom za izveštaj o grešci na uređaju."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Lično"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Slušajte strim"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skenirajte QR kôd audio strima da biste slušali pomoću: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Lozinka ne može da se menja tokom deljenja. Da biste promenili lozinku, prvo isključite deljenje zvuka."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Lozinka mora da sadrži od 4 do 16 znakova i može da sadrži samo slova, brojeve i simbole"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Skener QR koda"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Treba vam pomoć?"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"Podešavanja pretrage"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"Pretražite podešavanja"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakti, memorijski prostor, nalog"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Memorijski prostor za kontakte"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Samo uređaj"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi kontakti se neće sinhronizovati sa nalogom"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti se podrazumevano čuvaju na uređaju i sinhronizuju sa nalogom"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Greška pri podešavanju podrazumevanog naloga"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nije podešen podrazumevani nalog"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte nalog da biste započeli"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gde možete da čuvate kontakte"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Pretraga zaokruživanjem"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Dodirnite i zadržite dugme Početak ili marker za kretanje da biste pretraživali pomoću sadržaja na ekranu."</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 8de19112f34..896e9e72e09 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Сняжынка"</item>
     <item msgid="7952183800501346803">"Пляжны парасон"</item>
     <item msgid="799139025758265891">"Інструменты майстэрні"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
+    <item msgid="8112685757657659269">"Піяніна"</item>
     <item msgid="3861584909935022342">"Кінаплёнка"</item>
     <item msgid="5827426100157335512">"Кніга"</item>
     <item msgid="8585828346253128384">"Кветка лотаса"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 294272589db..03f3b317c71 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Спалучыць новую прыладу"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Аўтаматычна ўключыць заўтра"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Калі выключыць Bluetooth, ён уключыцца на наступны дзень"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Спалучыць справа"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Спалучыць злева"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Спалучыце для іншага вуха"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Адключыць Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Адключае функцыю Bluetooth LE audio, калі прылада падтрымлівае апаратнае забеспячэнне LE audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Рэжым Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Уключыць перадпрагляд інтэрфейсу для Bluetooth LE Audio Broadcast"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Уключае перадпрагляд інтэрфейсу абагульвання LE Audio, у тым ліку абагульвання асабістага аўдыя і прыватнай трансляцыі"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Паказ пераключальніка LE audio у Звестках пра прыладу"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Абыходзіць белы спіс Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Выкарыстоўваць LE Audio стандартна, нават калі перыферыйная прылада LE Audio не адпавядае крытэрыям белага спіса."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Мова праграмы"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Прапанаваныя мовы"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Усе мовы"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Прапанаваныя"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Усе мовы"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Усе рэгіёны"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Усе сістэмы лічэння"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Мова сістэмы"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Стандартная сістэмная налада"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Выбар мовы для гэтай праграмы недаступны ў Наладах."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Змяніць"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Недаступна: %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Гэту мову нельга выкарыстоўваць у якасці мовы сістэмы, аднак для праграм і вэб-сайтаў яна стане прыярытэтнай."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Шукаць"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Дадаць мову"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Параметры рэгіёна"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Увядзіце назву мовы"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Іншыя налады мовы"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Рэгіянальныя налады"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Задаць налады адзінак вымярэння і лічбаў"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"З мэтай персаналізацыі задайце для праграм рэгіянальныя налады."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Праграмы пры магчымасці будуць выкарыстоўваць вашы рэгіянальныя налады."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Рэгіянальныя налады"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Тэмпература"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Першы дзень тыдня"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Налады лічбаў"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Можа спаганяцца плата за роўмінг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Задаваць час аўтаматычна"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Вызначаць аўтаматычна"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Калі гэта налада ўключана, часавы пояс вызначаецца з выкарыстаннем месцазнаходжання"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Аўтавызначэнне даты і часу"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Задаваць аўтаматычна, выкарыстоўваючы сігналы сеткі і бесправадныя сігналы прылады"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Аўтавызначэнне часавага пояса"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Задаваць аўтаматычна па даных бліжэйшых мабільных сетак"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Задаваць аўтаматычна па месцазнаходжанні прылады, калі яно вызначаецца"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Выкарыстоўваць стандартныя рэгіянальныя налады"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Выкарыстоўваць 24-гадзінны фармат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Падыміце палец, потым дакраніцеся да сканера зноў"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Не ўдалося скарыстаць сканер адбіткаў пальцаў"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Звярніцеся ў сэрвісны цэнтр."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Разблакіроўка адбіткам пальца пры выключаным экране"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Разблакіроўка адбіткам пальца працуе нават пры выключаным экране"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Экран выключаны, разблакіраваць"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Іншыя налады бяспекі"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Блакіроўка працоўнага профілю, шыфраванне і іншыя дзеянні"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шыфраванне, уліковыя даныя і іншыя звесткі"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Узор разблакіроўкі для прыват. прасторы"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Блакіроўка"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Хаванне"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Пацвердзіце ўзор разблакіроўкі прыватнай прасторы"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Увядзіце PIN-код прыватнай прасторы яшчэ раз"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Увядзіце пароль прыватнай прасторы яшчэ раз"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Вы можаце дадаць да <xliff:g id="COUNT">%d</xliff:g> адбіткаў пальца"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Вы дадалі максімальную колькасць адбіткаў пальцаў"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Немагчыма дадаць больш адбіткаў пальцаў"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Уключаны"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Выключаны"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Знешні дысплэй"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Убудаваны дысплэй"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Выкарыстоўваць знешні дысплэй"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Раздзяляльнасць дысплэя"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Знешні дысплэй адключаны"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Змяненне налад павароту або раздзяляльнасці можа прывесці да спынення актыўных праграм"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Для дубліравання экрана неабходна падключыць прыладу да знешняга дысплэя"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Дадатковыя параметры"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Націсніце і ўтрымлівайце, каб змяніць парадак дысплэяў."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляцыя"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"адлюстраванне"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Уключыць бесправадны дысплей"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Праверце пароль і паўтарыце спробу"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Звярніцеся да вытворцы прылады"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Праверце падключэнне і паўтарыце спробу"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Гэта сетка Wi‑Fi зараз недаступная"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Узнікла праблема гэтым з QR-кодам. Паспрабуйце падключыцца іншым спосабам."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Выбраць сетку"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Каб падключыць прыладу, выберыце сетку"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Дадаць гэту прыладу да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Даведацца больш пра аўтапаварот"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Раздзяляльнасць экрана"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Высокая раздзяляльнасць"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Поўная раздзяляльнасць"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Пры поўнай раздзяляльнасці хутчэй разраджаецца акумулятар. Пераключэнне на вашу раздзяляльнасць можа прывесці да перазапуску некаторых праграм."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Максімальная раздзяляльнасць"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Пры максімальнай раздзяляльнасці хутчэй разраджаецца акумулятар. Пераключэнне на іншую раздзяляльнасць экрана можа прывесці да перазапуску некаторых праграм."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Выбрана"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Колеры"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральныя"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Адаптыўныя"</string>
     <string name="brightness" msgid="6216871641021779698">"Узровень яркасці"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Адаптыўная яркасць"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Інфармацыя пра адаптыўную яркасць"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Яркасць экрана будзе мяняцца аўтаматычна, у залежнасці ад наваколля і вашых дзеянняў. Можна пераключаць паўзунок уручную, каб дастасаваць функцыю да вашых параметраў."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Уключана"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Выключана"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Налады начнога рэжыму"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Рэжымы могуць таксама актываваць цёмную тэму}=1{Рэжым \"{mode_1}\" можа таксама актываваць цёмную тэму}=2{Рэжымы \"{mode_1}\" і \"{mode_2}\" могуць таксама актываваць цёмную тэму}=3{Рэжымы \"{mode_1}\", \"{mode_2}\" і \"{mode_3}\" могуць таксама актываваць цёмную тэму}one{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # могуць таксама актываваць цёмную тэму}few{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # могуць таксама актываваць цёмную тэму}many{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # могуць таксама актываваць цёмную тэму}other{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # могуць таксама актываваць цёмную тэму}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Налады рэжымаў"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Яшчэ менш яркасці"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Дадатковае памяншэнне яркасці"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Дазвольце прыладзе рабіць экран больш цьмяным, чым звычайна"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Час да выключэння экрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дазвольце праграмам і сэрвісам шукаць прылады паблізу, нават калі Bluetooth выключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Службы геалакацыі"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Службы геалакацыі"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Выкарыстоўваць геалакацыю"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Вызначаць часавы пояс па даных аб месцазнаходжанні"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Не ўдалося задаць часавы пояс аўтаматычна"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Вызначэнне месцазнаходжання або службы геалакацыі выключаны"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Налады месцазнаходжання"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Выправіць"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Скасаваць"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Аўтаматычнае вызначэнне часавага пояса выключана"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Недаступна, калі аўтаматычнае вызначэнне часавага пояса выключана"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Даныя пра месцазнаходжанне могуць выкарыстоўвацца для вызначэння часавых паясоў"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Калі на прыладзе ўключана вызначэнне месцазнаходжання, яно можа выкарыстоўвацца для наладжвання часавага пояса"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Прагледзець юрыдычную інфармацыю, стан, вэрсіі праграмнага забяспечання"</string>
     <string name="legal_information" msgid="7509900979811934843">"Юрыдычная інфармацыя"</string>
     <string name="manual" msgid="3651593989906084868">"Кіраўніцтва"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Іншыя версіі"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Спецыяльныя магчымасці"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Фізічная клавіятура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Ігнараванне паўторнага націскання"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Паўторныя націсканні адной і той жа клавішы, ажыццёўленыя на працягу <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мс, ігнаруюцца"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Хуткія паўторныя націсканні адной і той жа клавішы ігнаруюцца"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ігнараванне паўторнага націскання"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Выберыце час, на працягу якога паўторныя націсканні адной і той жа клавішы будуць ігнаравацца"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 с"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 с"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 с"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Карыстальніцкае значэнне"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"карыстальніцкае значэнне"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Запавольванне рэакцыі на націсканне"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Рэгістрацыя націскання клавішы ажыццяўляецца пасля заканчэння зададзенага часу: <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мс"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Адрэгулюйце час, неабходны для актывацыі націскання клавішы"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Заліпанне клавіш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Замест таго каб утрымліваць усе клавішы са спалучэння, націскайце іх па адной"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Клавішы кіравання мышшу"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Выкарыстоўвайце фізічную клавіятуру, каб кіраваць мышшу"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Выкарыстоўваць клавішы мышшы"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Выкарыстоўвайце клавіятуру, каб кіраваць паказальнікам"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Адваротная прагортка мышшу"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Калі прагортваць уверх, старонка будзе перамяшчацца ўніз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Замена месцамі функцый левай і правай кнопак"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Прызначце для левай кнопкі мышы функцыі правай"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Клавішы кіравання мышшу \"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>\""</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Каб перамясціць паказальнік мышы, скарыстайце клавішы <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Каб націснуць асноўную кнопку мышы, скарыстайце клавішу <xliff:g id="CLICK_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Каб націснуць і ўтрымліваць асноўную кнопку мышы, скарыстайце клавішу <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Каб адпусціць асноўную кнопку мышы, скарыстайце клавішу <xliff:g id="RELEASE_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Каб пераключыць рэжым гартання, скарыстайце клавішу <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. Клавішамі <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> можна будзе гартаць уверх, уніз, улева і ўправа"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Каб націснуць дадатковую кнопку мышы, скарыстайце клавішу <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Гарачыя клавішы"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Паказаць спіс спалучэнняў клавіш"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавіятуры і інструменты працоўнага профілю"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Стандартная"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сэнсарная панэль"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сэнсарная панэль і мыш"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Мыш"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Хуткасць указальніка, жэсты"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Націсканне дотыкам"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Перацягванне дотыкам"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Націск у ніжнім правым вугле"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Каб адкрыць дадатковыя параметры, націсніце ў ніжнім правым вугле сэнсарнай панэлі"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Хуткасць указальніка"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Выкарыстоўваць націсканне трыма пальцамі"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Колер паказальніка"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Змяніць стыль заліўкі на чорны"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Змяніць стыль заліўкі на зялёны"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Даведацца пра жэсты сэнсарнай панэлі"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"сэнсарная панэль, мыш, курсор, прагартаць, правесці пальцам, націснуць правай кнопкай мышы, націснуць, націсканне, паказальнік"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"націснуць правай кнопкай мышы, дакрануцца, націснуць, дотык"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Націсканне пасярэдзіне"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Запусціць Памочніка"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"На галоўную старонку"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Праглядзець нядаўнія праграмы"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"На галоўную старонку"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Правядзіце трыма пальцамі ўверх у любым месцы сэнсарнай панэлі"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Назад"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберыце новы ключ для \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Спецыяльныя магчымасці з выкарыстаннем фізічнай клавіятуры"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Заліпанне клавіш, ігнараванне паўторнага націскання, клавішы мышы"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Паўторны ўвод сімвала"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Затрымка перад паўторам"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Частата паўтораў"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Паўтараць увод сімвала, пакуль клавіша націснута"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Раскладка \"<xliff:g id="IME_LABEL">%s</xliff:g>\""</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандартная"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Аўтаматычна: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Перадпрагляд"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартныя опцыі"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Мова"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Памер тэксту"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Памер субцітраў"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стыль субцітраў"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Карыстальніцкія параметры"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Колер фону"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Адрэгуляваць спажыванне энергіі"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Уключаныя пакеты"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Праграмы працуюць нармальна"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Рэкамендуецца замяніць акумулятар"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Ёмістасць акумулятара і прадукцыйнасць зарадкі знізіліся. Рэкамендуецца замяніць акумулятар."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Нізкі ўзровень зараду акумулятара"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Уключыце Эканомію зараду, каб павялічыць час працы ад акумулятара"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Павялічце час працы ад акумулятара"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Адключыць гэту VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Адключыць"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Забыць VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Замяніць існуючую VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Наладзіць заўсёды ўключаную VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"з 9:00 да 17:00 па будных днях\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Падзеі ў календары"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Рэжым \"{mode_1}\" актыўны}=2{Рэжымы \"{mode_1}\" і \"{mode_2}\" актыўныя}=3{Рэжымы \"{mode_1}\", \"{mode_2}\" і \"{mode_3}\" актыўныя}one{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # актыўныя}few{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # актыўныя}many{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # актыўныя}other{Рэжымы \"{mode_1}\", \"{mode_2}\" і яшчэ # актыўныя}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Можна аўтаматычна ўключыць 1 рэжым}one{Можна аўтаматычна ўключыць # рэжым}few{Можна аўтаматычна ўключыць # рэжымы}many{Можна аўтаматычна ўключыць # рэжымаў}other{Можна аўтаматычна ўключыць # рэжыму}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не турбаваць}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"УКЛЮЧАНА"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Не зададзена"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Адключана"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Зразумела"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Апавяшчэнні"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Працягласць"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Паведамленні, падзеі і напаміны"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вышэй элементаў. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям’і і іншым кантактам звязацца з вамі."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Гатова"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Налады"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Апавяшчэнні без візуальных элементаў і гуку"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Апавяшчэнні без гуку"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Апавяшчэнні не будуць паказвацца ці гучаць. Дазволены выклікі ад пазначаных кантактаў і абанентаў, якія выклікаюць паўторна."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Бягучая налада)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Змяніць налады апавяшчэнняў у рэжыме \"Не турбаваць\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Гукі працоўнага профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Выкарыстоўваць гукі асабістага профілю"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Выкарыстоўваць тыя самыя гукі, што і ў асабістым профілі"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Пасля разблакіроўкі вяртацца на апошні экран. Апавяшчэнні не будуць паказвацца на экране блакіроўкі. Каб праглядзець іх, правядзіце зверху ўніз."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Экран блакіроўкі, экран блакіроўкі, прапусціць, абысці"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Працоўны профіль заблакіраваны"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Памяншэнне колькасці апавяшчэнняў на экране блакіроўкі"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Паказваць менш апавяшчэнняў на экране блакіроўкі"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Паказваць на экране блакіроўкі толькі новыя апавяшчэнні"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Аўтаматычна выдаляць прагледжаныя апавяшчэнні з экрана блакіроўкі"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Апавяшчэнні на экране блакіроўкі"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Паказваць усе размовы: стандартныя і без гуку"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Паказваць усе размовы: стандартныя і без гуку"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Паказваць усё змесціва ў працоўных апавяшчэннях"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Схаваць канфідэнцыяльныя працоўныя даныя"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Як павінны паказвацца апавяшчэнні профілю, калі прылада заблакіравана?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Калі вам будзе прыходзіць многа апавяшчэнняў за кароткі час, прылада паменшыць іх гучнасць і абмяжуе абвесткі на перыяд да 2 хвілін. Гэта не закране выклікі, будзільнікі і прыярытэтныя размовы. \n\nКаб праглядзець апавяшчэнні, атрыманыя ў перыяд зніжэння гучнасці, правядзіце пальцам уніз ад верхняга краю экрана."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Прымяніць да працоўных профіляў"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Прымяняць да праграм працоўнага профілю"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Згрупаваныя апавяшчэнні"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Уключана"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Выключана"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Выкарыстоўваць групаванне апавяшчэнняў"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Каб паменшыць турботы, апавяшчэнні на адну тэму будуць аб’яднаны ў групу і іх гук будзе выключаны. Групаванне скасуе ўласныя налады апавяшчэнняў праграмы."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Дапаможныя VR-сэрвісы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Усталяваныя праграмы не запытвалі выканання ў якасці дапаможных VR-сэрвісаў."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"прыярытэтныя размовы"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ніякія"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ніводнай}=1{1 размова}one{# размова}few{# размовы}many{# размоў}other{# размовы}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Налады размоў"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"На што гэты рэжым не распаўсюджваецца"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Нават калі праграмы абмену паведамленнямі ці выклікаў не могуць адпраўляць вам апавяшчэнні, карыстальнікі, якіх вы выбераце тут, усё роўна змогуць звязвацца з вамі праз гэтыя праграмы"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Выклікі"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Любыя"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Кантакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Пазначаныя кантакты"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Налады кантактаў"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Налады пазначаных кантактаў"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Няма"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ніякія"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Сігналы будзільніка"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (праца)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Вядзецца падлік…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Налады праграм"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дазволіць праграмам перавызначаць"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Гэты рэжым не распаўсюджваецца на наступныя праграмы"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Стварыць рэжым"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Карыстальніцкі рэжым"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назва рэжыму"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Назва рэжыму не можа быць пустой"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Выбар значка"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Падзеі ў календары"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Парадак дзеянняў перад сном"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"За рулём"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Поўнаэкранныя апавяшчэнні"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Дазволіць поўнаэкранныя апавяшчэнні ад гэтай праграмы"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Гэта праграма зможа паказваць поўнаэкранныя апавяшчэнні, калі прылада заблакіравана. Дзякуючы гэтаму дазволу праграмы могуць паказваць сігналы будзільнікаў, уваходныя выклікі і іншыя тэрміновыя апавяшчэнні."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Запісваць сістэмныя налады"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Дазволіць гэтай праграме змяняць сістэмныя налады ад вашага імя"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Пры наяўнасці гэтага дазволу праграма можа змяняць асноўныя налады сістэмы."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Праграмы кіравання мультымедыя"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Дазволіць праграме кіраваць мультымедыя"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Калі дазволена, гэта праграма можа змяняць і выдаляць файлы мультымедыя, створаныя з дапамогай іншых праграм, без вашага ведама. Праграме неабходны дазвол на доступ да файлаў і мультымедыя."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Жэсты"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Хуткае адкрыццё камеры"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Каб хутка адкрыць камеру, двойчы націсніце кнопку сілкавання. Працуе на любым экране."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Пераключэнне на пярэднюю камеру"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Рэжым навігацыі"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Абмен паведамленнямі па спадарожнікавай сувязі"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Адпраўка і атрыманне тэкставых паведамленняў па спадарожнікавай сувязі даступныя для вашага ўліковага запісу."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Адпраўляйце і атрымлівайце тэкставыя паведамленні па спадарожнікавай сувязі. Паслуга не ўключана ва ўліковы запіс."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Абмен паведамленнямі па спадарожнікавай сувязі"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Пра абмен паведамленнямі па спадарожнікавай сувязі"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Абмен паведамленнямі па спадарожнікавай сувязі, спадарожнікавае падключэнне"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Інфармацыя пра \"<xliff:g id="SUBJECT">%1$s</xliff:g>\""</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ваш уліковы запіс ад аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" дазваляе вам адпраўляць і атрымліваць тэкставыя паведамленні па спадарожнікавай сувязі"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ваш тарыфны план ад аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Функцыя абмену паведамленнямі па спадарожнікавай сувязі даступная для вашага ўліковага запісу."</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Ваш уліковы запіс дазваляе выкарыстоўваць абмен паведамленнямі"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Функцыя абмену паведамленнямі па спадарожнікавай сувязі недаступная для вашага ўліковага запісу."</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Даведацца больш"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Як гэта працуе"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ваш тэлефон аўтаматычна падключыцца да спадарожнікавай сувязі. Для аптымальнай якасці падключэння вам лепш знаходзіцца на вуліцы пад адкрытым небам"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Пасля падключэння тэлефона да спадарожнікавай сувязі"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Вы можаце адпраўляць тэкставыя паведамленні каму хочаце, у тым ліку экстранным службам. Ваш тэлефон зноў падключыцца да мабільнай сеткі, калі яна стане даступнай."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Абмен паведамленнямі па спадарожнікавай сувязі можа займаць больш часу і быць даступным толькі ў некаторых рэгіёнах. На якасць спадарожнікавага падключэння могуць уплываць надвор’е і некаторыя віды пабудоў. Выклікі праз спадарожнікавую сувязь недаступныя. Пры гэтым дапускаецца магчымасць ажыццяўлення экстранных выклікаў.\n\nМожа спатрэбіцца некаторы час, каб змяненні ў вашым уліковым запісе з’явіліся ў наладах. Звяжыцеся з аператарам, каб даведацца больш."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Падрабязней пра абмен паведамленнямі па спадарожнікавай сувязі"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> можа займаць больш часу і быць даступным толькі ў некаторых рэгіёнах. На якасць спадарожнікавага падключэння могуць уплываць надвор’е і некаторыя віды пабудоў. Выклікі праз спадарожнікавую сувязь недаступныя. Пры гэтым дапускаецца магчымасць ажыццяўлення экстранных выклікаў.\n\nМожа спатрэбіцца некаторы час, каб змяненні ў вашым уліковым запісе з’явіліся ў наладах. Па падрабязныя звесткі звяртайцеся да аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Падрабязней пра \"<xliff:g id="SUBJECT">%1$s</xliff:g>\""</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Не ўдалося ўключыць функцыю \"<xliff:g id="FUNCTION">%1$s</xliff:g>\""</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Каб уключыць функцыю \"<xliff:g id="FUNCTION">%1$s</xliff:g>\", спачатку выканайце падключэнне да спадарожніка"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Спадарожнікавае падключэнне"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Спадарожнікавае падключэнне"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"спадарожнікавае падключэнне"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"абмен паведамленнямі па спадарожнікавай сувязі"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Ваш уліковы запіс дазваляе выкарыстоўваць перадачу даных"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Экстраннае спадарожнікавае падключэнне"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Пры немагчымасці падключыцца да мабільнай сеткі ці Wi-Fi адпраўце паведамленне экстранным службам"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"экстраннае спадарожнікавае падключэнне, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Інфармацыя пра экстраннае спадарожнікавае падключэнне"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Пры немагчымасці падключыцца да мабільнай сеткі ці Wi-Fi вы можаце адправіць паведамленне і сваё месцазнаходжанне экстранным службам. Гэты сэрвіс можа быць даступным не заўсёды і не ўсюды."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Пазваніце або адпраўце тэкставае паведамленне экстранным службам"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Адкажыце на пытанні пра экстранную сітуацыю"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Выканайце інструкцыі па падключэнні да спадарожніка"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Калі сігналу сувязі па мабільнай сетцы няма, на экране з’явіцца прапанова выканаць экстраннае спадарожнікавае падключэнне"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Для атрымання неабходнай дапамогі будуць адпраўляцца адказы ў экстранныя службы"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Пасля падключэння вы зможаце адпраўляць паведамленні экстранным службам"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Паспрабаваць у дэманстрацыйным рэжыме"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Калі вы звязваецеся з экстраннымі службамі праз спадарожнік, вашы імя, адрас электроннай пошты, нумар тэлефона, геаданыя, звесткі пра прыладу (IMEI, мова, мадэль, узровень зараду акумулятара) і інфармацыя пра кантакты для экстранных сітуацый будуць абагульвацца з экстраннымі службамі і пастаўшчыкамі паслуг спадарожнікавай сувязі. \n\nКаб функцыя экстраннага спадарожнікавага падключэння працавала, задайце Google Паведамленні ў якасці стандартнай праграмы для SMS. \n\nКалі аўтаматычны выбар сеткі быў выключаны, ён уключыцца і ваша прылада аўтаматычна падключыцца да любой сеткі."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Налады абагульвання"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Кантакты для экстранных сітуацый"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Ваш Уліковы запіс Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Прагледзьце або абнавіце інфармацыю, якую вы будзе абагульваць з экстраннымі службамі"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Назвы пунктаў доступу"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недаступна праз аператара \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца і ёсць рызыка страціць даныя, якія захоўваюцца на тэлефоне пры разблакіраваным загрузчыку. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, пераключыцеся на рэжым 4 КБ і заблакіруйце загрузчык на прыладзе. Пасля гэтага адбудзецца яе паўторны скід да заводскіх налад. Пасля загрузкі Android выключыце разблакіроўку OEM у Параметрах распрацоўшчыка. Калі на прыладзе не ўдаецца запусціць АС Android ці яе праца нестабільная, перапрашыйце прыладу, выкарыстоўваючы апошнія версіі заводскіх вобразаў, якія можна спампаваць тут: &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;. Або перайдзіце па спасылцы &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; і выберыце \"Ачысціць прыладу\", \"Заблакіраваць загрузчык\" і \"Перапрашыць усе раздзелы\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Чытаць далей"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Запусціць праграму ў рэжыме сумяшчальнасці з памерам старонкі"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Апрацоўшчык справаздачы пра памылкі"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Праграма, якая запускаецца пры націсканні на ярлык для адпраўкі справаздачы пра памылку."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Асабістая"</string>
@@ -5435,7 +5558,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Слухаць плынь"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Адсканіруйце QR-код аўдыяплыні для праслухоўвання на прыладзе \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Калі ажыццяўляецца абагульванне, змяняць пароль нельга. Каб змяніць пароль, выключыце абагульванне аўдыя."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Пароль павінен змяшчаць ад 4 да 16 сімвалаў і складацца толькі з літар, лічбаў і знакаў"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Сканер QR-кодаў"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Патрабуецца дапамога?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Шукаць у наладах"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"кантакты, сховішча, уліковы запіс"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Сховішча кантактаў"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Толькі прылада"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новыя кантакты не будуць сінхранізавацца з уліковым запісам"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Кантакты будуць стандартна захоўвацца на прыладзе і сінхранізавацца з уліковым запісам"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Падчас вызначэння стандартнага ўліковага запісу адбылася памылка"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Стандартны ўліковы запіс не вызначаны"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Толькі прылада"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Прылада і %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Каб пачаць, дадайце ўліковы запіс"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Дзе будуць захоўвацца кантакты"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Абвесці для пошуку"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Каб запусціць пошук з выкарыстаннем змесціва экрана, націсніце і ўтрымлівайце кнопку галоўнага экрана або маркер навігацыі."</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 631450ebb54..b736ea3c725 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Снежинка"</item>
     <item msgid="7952183800501346803">"Плажен чадър"</item>
     <item msgid="799139025758265891">"Инструменти за работилница"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
+    <item msgid="8112685757657659269">"Пиано"</item>
     <item msgid="3861584909935022342">"Филмов видеоколаж"</item>
     <item msgid="5827426100157335512">"Книга"</item>
     <item msgid="8585828346253128384">"Лотос"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5de71f7088f..296ea96c78b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Сдвояване на ново устройство"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматично включване утре"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ако изключите Bluetooth, функцията ще се включи отново утре"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Дясно ухо: Сдвояване"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Ляво ухо: Сдвояване"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Сдвояване на другото ухо"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Деактивиране на Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Деактивира Bluetooth LE Audio, ако устройството поддържа хардуер с възможност за LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Режим за Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Активиране на визуализацията на потребителския интерфейс за предаване чрез Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Активира визуализацията на потребителския интерфейс за споделяне чрез LE Audio, включително споделяне на персонално аудио и частно предаване"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Показване на превключват. за LE Audio в подробн. за у-вото"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Заобикаляне на списъка на разрешените устройства с Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Използване на LE Audio по подразбиране дори ако не е потвърдено, че периферното устройство с LE Audio отговаря на критериите на списъка на разрешените устройства."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Език за приложенията"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Предложени езици"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Всички езици"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Предложени"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Всички езици"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Всички региони"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Всички бройни системи"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Системен език"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Стандартно за системата"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Избирането на език за това приложение не е налице от настройките."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Промяна"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s не е налице"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Този език не може да се използва като системен, но уведомихте приложенията и уебсайтовете, че е предпочитан от вас."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Търсене"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Добавяне на език"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Предпочитание за региона"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Въведете име на език"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Още езикови настройки"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Регионални предпочитания"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Задаване на предпочитания за мерните единици и цифрите"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Разрешете на приложенията да осъществяват достъп до регионалните ви предпочитания, за да могат да персонализират практическата ви работа."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Приложенията ще използват регионалните ви предпочитания, когато е възможно."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Регионални предпочитания"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Първи ден от седмицата"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Предпочитания за числата"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Възможно е да ви бъдат начислени такси за роуминг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Автоматично задаване на часа"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Автоматично задаване"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Местоположението ще служи за задаване на часовата зона, когато превключвателят е включен"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Автоматични дата и час"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Автоматично задаване чрез мрежата и безжичните сигнали"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Автоматична часова зона"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Автоматично задаване въз основа на мобилните мрежи в близост до вас"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Автоматично задаване чрез местоположението на устройството ви, ако е налице"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Използване на стандартния формат за локала"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часов формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Вдигнете пръста, след което докоснете сензора отново"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Сензорът за отпечатъци не може да се използва"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Посетете оторизиран сервиз."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Отключване с отпечатък при изключен екран"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Използване на функцията за отключване с отпечатък дори когато екранът е изключен"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Изключен екран, отключване"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Още настройки за сигурност"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Заключване на служебен потребителски профил, шифроване и др."</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифроване, идентификационни данни и др."</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Задайте фигура за частното пространство"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Заключване"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Скриване"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Потвърдете фигурата за частното си пространство"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Въведете отново ПИН кода за частното пространство"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Въведете отново паролата за частното пространство"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> отпечатъка"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Добавихте максималния брой отпечатъци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не могат да се добавят още отпечатъци"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Вкл."</string>
     <string name="external_display_off" msgid="5634413756025351374">"Изкл."</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Външен екран"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Използване на външен екран"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Разделителна способност на екрана"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Връзката с външния екран е прекратена"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Промяната на настройката за завъртане или разделителна способност може да спре някои от приложенията, които се изпълняват в момента"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Устройството ви трябва да е свързано с външен екран, за да дублирате съдържанието на екрана си"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Още опции"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Задръжте и плъзнете, за да пренаредите екраните."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Предаване"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублиране"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Активир. на безжичния дисплей"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Проверете паролата и опитайте отново"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Свържете се с производителя на устройството"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Проверете връзката и опитайте отново"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Тази Wi‑Fi мрежа не е налице в момента"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Има проблем с този QR код. Опитайте да се свържете по друг начин."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Избиране на мрежа"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"За да свържете устройството си, изберете мрежа"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Да се добави ли това устройство към <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Научете повече за автоматичното завъртане"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Разделит. способност на екрана"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Висока разделителна способност"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Пълна разделителна способност"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Пълната разделителна способност изразходва батерията ви в по-голяма степен. Превключването на разделителната способност може да доведе до рестартирането на някои приложения."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Избрано"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Цветове"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Естествени"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Адаптивни"</string>
     <string name="brightness" msgid="6216871641021779698">"Ниво на яркостта"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Адаптивна яркост"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Всичко за адаптивната яркост"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Яркостта на екрана ще се коригира автоматично спрямо средата и активностите ви. Можете да преместите плъзгача ръчно, за да помогнете на функцията за адаптивна яркост да научи предпочитанията ви."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Вкл."</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Изключено"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Настройки за режима „Време за сън“"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режимите могат да активират и тъмната тема}=1{{mode_1} активира и тъмната тема}=2{{mode_1} и {mode_2} активират и тъмната тема}=3{{mode_1}, {mode_2} и {mode_3} активират и тъмната тема}other{{mode_1}, {mode_2} и още # активират и тъмната тема}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Настройки за режимите"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Допълнително затъмняване"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Допълнително затъмняване"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Разрешаване на допълнително затъмняване на екрана на устройството"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Време до автоматично изключване на екрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Услуги за местоположение"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Услуги за местоположение"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Използване на местоположението"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Използване на местоположението за часовата зона"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Часовата зона не може да се зададе автоматично"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Местоположението или услугите за местоположение са изключени"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Настройки за местоположението"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Поправяне на това"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Отказ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматичната часова зона е изключена"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Не е налице, когато автоматичното установяване на часовата зона е изключено"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Местоположението може да се използва с цел задаване на часова зона"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ако местоположението на устройството ви е налице, то може да се използва за задаване на часовата ви зона"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Преглед на състоянието, правната информация и версията на софтуера"</string>
     <string name="legal_information" msgid="7509900979811934843">"Правна информация"</string>
     <string name="manual" msgid="3651593989906084868">"Ръководство"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Опции"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Достъпност"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физическа клавиатура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Игнориране на многократ. натискане"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Клавиатурата пренебрегва бързите натискания на един и същ клавиш, повтарящи се в рамките на <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мсек"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Клавиатурата игнорира бързите повтарящи се натискания на един и същ клавиш"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Игнор. на многокр. натискане (праг)"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Изберете периода от време, през който клавиатурата ви ще игнорира повтарящите се натискания на даден клавиш"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 сек"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 сек"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 сек"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Персонализирано"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"персонализирана стойност"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Забавяне на сигнала от клавишите"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Коригира времето, необходимо за активиране след натискане на даден клавиш, на <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мсек"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Коригира времето, необходимо за активиране след натискане на даден клавиш"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Фиксирани клавиши"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Натискайте клавишите от съответните комбинации един по един, вместо да ги задържате заедно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Бутони на мишката"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Използвайте физическата клавиатура, за да управлявате мишката."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Използване на бутоните на мишката"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Използвайте клавиатурата, за да управлявате курсора"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обратно превъртане с мишката"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Превъртете нагоре, за да преместите страницата надолу"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Размяна на левия и десния бутон"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Използвайте левия бутон на мишката като десен"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Бутони на мишката за <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Използвайте клавишите <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>, за да местите курсора на мишката"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Използвайте клавиша <xliff:g id="CLICK_LABEL">%s</xliff:g>, за да кликнете с основния бутон на мишката"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Използвайте клавиша <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>, за да натиснете и задържите основния бутон на мишката"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Използвайте клавиша <xliff:g id="RELEASE_LABEL">%s</xliff:g>, за да освободите основния бутон на мишката"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Използвайте клавиша <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>, за да превключвате режима на превъртане. По този начин клавишите <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ще превключват изгледа нагоре, надолу, наляво или надясно"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Използвайте клавиша <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>, за да кликнете с вторичния бутон на мишката"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Клавишни комбинации"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показване на списък с клавишните комбинации"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавиатури и инструменти за служебния потр. профил"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"По подразбиране"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сензорен панел"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сензорен панел и мишка"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Мишка"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Скорост на курсора, жестове"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Кликване с докосване"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Преместване чрез докосване"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Кликване долу вдясно"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"За още опции кликнете в долния десен ъгъл на сензорния панел"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Скорост на курсора"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Използване на докосване с три пръста"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Цвят на курсора"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Запълване на курсора в черно"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Запълване на курсора в зелено"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Жестове със сензорния панел: Урок"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"тракпад, мишка, курсор, превъртане, плъзгане, кликване с десния бутон, кликване, показалец"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"кликване с десния бутон, докосване"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Кликване със средния бутон"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Стартиране на Асистент"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Към началото"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Преглед на скорошните приложения"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Към началния екран"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Прекарайте три пръста нагоре по сензорния панел"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Връщане назад"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете нов ключ за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Достъпност чрез физическата клавиатура"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Фиксирани клавиши, игнориране на многократни натискания, бутони на мишката"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Повтаряне на клавишите"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Забавяне преди повтаряне"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Честота на повторение"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Задържане на клавиш с цел повтаряне на съответния знак, докато клавишът не бъде пуснат"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Подредба: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По подразбиране"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматично: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Визуализация"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартни опции"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Език"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Размер на текста"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Размер на надписите"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил на надписите"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Персонализирани опции"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Цвят на фона"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Настройване на захранването"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Включени пакети"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Приложенията работят нормално"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Препоръчва се подмяна на батерията"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Капацитетът на батерията и ефективността на зареждане са намалени. Препоръчва се подмяна на батерията."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Нивото на батерията е ниско"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Включете режима за запазване на батерията, за да удължите живота ѝ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Удължаване на живота на батерията"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекратяване на връзката"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Версия <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Забравяне на вирт. частна мрежа (VPN)"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Да се замени ли съществуващата VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Да се зададе ли винаги включена виртуална частна мрежа (VPN)?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„9:00 – 17:00 ч. в делнични дни“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Събития в календара"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Режимът „{mode_1}“ е активен}=2{Режимите „{mode_1}“ и „{mode_2}“ са активни}=3{Режимите „{mode_1}“, „{mode_2}“ и „{mode_3}“ са активни}other{Режимите „{mode_1}“, „{mode_2}“ и още # са активни}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режим може да се включва автоматично}other{# режима могат да се включват автоматично}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не безпокойте}=1{{mode_1}}=2{{mode_1} и {mode_2}}other{{mode_1}, {mode_2} и {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ВКЛ."</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Не е зададено"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Деактивирано"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Разбрах"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Известия"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Продължителност"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Съобщения, събития и напомняния"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Готово"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Настройки"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Без визуално прекъсване или звук от известията"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Без звук от известията"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Няма да виждате, нито да чувате известията. Обажданията от контактите със звезда и повторно обаждащите се са разрешени."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Текуща настройка)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Да се променят ли настройките за известията в режима „Не безпокойте“?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Звуци за служебния потребителски профил"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Използване на звуците за личния потребителски профил"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Използване на същите звуци като за личния потребителски профил"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"След отключване да се отваря последно ползваният екран. Известията няма да се показват на закл. екран. Вижте ги с плъзгане надолу от горната част."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"заключен екран, пропускане, заобикаляне"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"При закл. служ. потреб. профил"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Свеждане на известията на заключения екран до минимум"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Показване на по-малко известия на заключения екран"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Показване само на новите известия на заключения екран"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Автоматично премахване на по-рано прегледаните известия от заключения екран"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Известия на заключения екран"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Показване на разговорите – стандартните и беззвучните"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Показване на разговорите – стандартните и беззвучните"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Показване на цялото съдържание на служ. известия"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Скриване на поверителното служебно съдържание"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Как искате да се показват известията от потребителския профил, когато устройството ви е заключено?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Когато получавате много известия за кратък пе­риод от време, устройството ви ще намали силата на звука си и ще сведе до минимум сигналите за период до две минути. Обажданията, будилниците и разговорите с приоритет няма да бъдат засегнати. \n\nПолучените по време на периода на изчакване известия могат да бъдат намерени, като плъзнете надолу от горната част на екрана."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Прилагане към служебните потребителски профили"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Прилагане за приложенията в служебния потребителски профил"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Групирани известия"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Вкл."</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Изкл."</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Използване на функцията за групиране на известията"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Известията с подобна тема ще бъдат заглушавани и групирани, за да не ви безпокоят. Групирането ще замени настройките за известия на съответното приложение."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Помощни услуги за VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Никое инсталирано приложение не е заявило да се изпълнява като помощна услуга за VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Искате ли <xliff:g id="SERVICE">%1$s</xliff:g> да има достъп като услуга за VR?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"разговори с приоритет"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Никакви"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Нито един}=1{1 разговор}other{# разговора}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Настройки за разговорите"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кой може да прекъсва режима"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Дори ако приложенията за съобщения или обаждания не могат да ви известят, хората, които посочите тук, пак могат да се свързват с вас чрез тези приложения"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Обаждания"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Всеки"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти със звезда"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Настройки на контактите"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Настройки за контактите със звезда"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Никакви"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Никой"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Будилници"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (служ.)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Изчислява се…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Настройки за приложенията"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешаване на приложения да отменят режима"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Приложения, които могат да прекъсват режима"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Създаване на режим"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Персонализиран режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Име на режима"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Името на режима трябва да се попълни"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Избор на икона"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Събития от календара"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Час на лягане и ставане"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"По време на шофиране"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Известия на цял екран"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Разрешаване на известията на цял екран от това приложение"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Разрешаване на това приложение да показва известия, които заемат целия екран, когато устройството е заключено. Приложенията могат да ги използват, за да открояват будилници, входящи обаждания или други спешни известия."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Запис на системни предпочитания"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Разрешаване на това приложение да променя системните предпочитания от ваше име"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Това разрешение позволява на дадено приложение да променя основните системни предпочитания."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Приложения за управление на мултимедията"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Разрешаване на прил. да управл. мултимедията"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ако е разрешено, това приложение може да променя или изтрива мултимедийните файлове, създадени чрез други приложения, без да ви попита. То трябва да има разрешение за достъп до файловете и мултимедията."</string>
@@ -4396,6 +4481,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Жестове"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Бързо отваряне на камерата"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"За да отворите бързо камерата, натиснете два пъти бутона за включване/изключване – това работи от всеки екран."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Докоснете два пъти бутона за захранване"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Използване на двукратно докосване"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Докоснете два пъти бутона за захранване"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Отваряне на Камера"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Достъп до Камера"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Отваряне на Wallet"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Достъп до Wallet"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Обръщане на камерата за селфи"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Режим на навигация"</string>
@@ -4793,11 +4885,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Сателитни съобщения"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Изпращайте и получавайте текстови съобщения чрез сателит. Услугата е включена с профила ви."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Изпращайте и получавайте текстови съобщения чрез сателит. Услугата не се предлага с профила ви."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Сателитни съобщения"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Информация за сателитните съобщения"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Можете да изпращате и получавате текстови съобщения чрез сателит, ако имате отговарящ на условията профил от <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Вашият план от <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Услугата за сателитни съобщения е включена с профила ви"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Услугата за сателитни съобщения не е включена с профила ви"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Научете повече"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Начин на работа"</string>
@@ -4805,10 +4900,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Телефонът ви ще се свърже автоматично със сателит. За оптимална връзка трябва да сте на място с ясен изглед към небето."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"След като телефонът ви се свърже със сателит"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Можете да изпращате текстови съобщения на когото пожелаете, включително на службите за спешни случаи. Телефонът ви ще се свърже отново с мобилна мрежа, когато е възможно."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Доставянето на сателитни съобщения може да отнеме по-дълго време. Услугата се предлага само в някои райони и сателитната връзка може да бъде повлияна от времето и определени структури. Не се поддържат обаждания чрез сателит, но е възможно спешните обаждания да бъдат извършени.\n\nМоже да измине известно време, докато промените в профила ви се покажат в настройките. За подробности се обърнете към оператора си."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Още за сателитните съобщения"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> не може да се включи"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"За да включите <xliff:g id="FUNCTION">%1$s</xliff:g>, първо прекратете сателитната връзка"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Свързване със сателит"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Имена на точки за достъп"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"име на точката за достъп"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Не е налице, когато е установена връзка с(ъс) <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5137,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Използвате опцията 16 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да превключите обратно към режим 4 KB и след това да заключите програмата за първоначално зареждане на устройството. Това отново ще възстанови фабричните настройки на устройството, както и тези на производствения режим. След като то стартира Android, деактивирайте настройката за отключване чрез OEM от опциите за програмисти. Ако устройството не стартира Android или е нестабилно, преинсталирайте го посредством най-новите фабрични образи на адрес &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; или използвайте &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; и изберете опцията за изчистване на всички данни от устройството, „Заключване на програмата за първоначално зареждане“ и опцията за принудително инсталиране на всички дялове."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим за съвместимост със страниците (16 KB)"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Прочетете още"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Изпълняване на приложението в режим на съвместимост с размера на страницата"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Манипулатор за сигналите за програмни грешки"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Определя кое приложение да обработва прекия път за сигнали за програмни грешки на устройството ви."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Лично"</string>
@@ -5433,7 +5578,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Слушане на потока"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Сканирайте QR кода за даден аудиопоток, за да го слушате на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Паролата не може да се редактира по време на споделяне. За да я промените, първо изключете функцията за споделяне на звука."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Паролата ви трябва да съдържа 4 – 16 знака и могат да се използват само букви, цифри и символи"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Скенер за QR кодове"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Нуждаете се от помощ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Търсене в настройките"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, хранилище, профил"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Хранилище на контакти"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Само на устройството"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новите контакти няма да се синхронизират с профил"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"По подразбиране контактите ще се запазват на устройството ви и ще се синхронизират с профила ви"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при задаването на стандартния профил"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Няма стандартен профил"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само чрез устройството"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Устройство и %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"За да започнете, добавете профил"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Къде да се запазват контактите"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Търсене с ограждане"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Докоснете и задръжте бутона „Начало“ или манипулатора за навигация, за да потърсите съдържанието на екрана."</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 5b14f56e457..d260c02d819 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"বরফের কণা"</item>
     <item msgid="7952183800501346803">"বিচ আমব্রেলা"</item>
     <item msgid="799139025758265891">"ওয়ার্কশপ টুল"</item>
-    <item msgid="1330084588359129896">"তাঁবু"</item>
+    <item msgid="8112685757657659269">"পিয়ানো"</item>
     <item msgid="3861584909935022342">"ফিল্ম রিল"</item>
     <item msgid="5827426100157335512">"বই"</item>
     <item msgid="8585828346253128384">"পদ্ম ফুল"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 5815ad85cda..ac344d0099d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"নতুন ডিভাইস পেয়ার করুন"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ব্লুটুথ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"আগামীকাল অটোমেটিক চালু হয়ে যাবে"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"আপনি ব্লুটুথ বন্ধ করে দিলে, পরের দিন সেটি আবার চালু হয়ে যায়"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ডান কানে পেয়ার করুন"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"বাঁ কানে পেয়ার করুন"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"অন্য হিয়ারিং এড পেয়ার করুন"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ব্লুটুথ LE অডিও বন্ধ করুন"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ডিভাইসে LE অডিও হার্ডওয়্যার কাজ করলে, ব্লুটুথ LE অডিও ফিচার বন্ধ করে।"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ব্লুটুথ LE অডিও মোড"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ব্লুটুথ LE অডিও ব্রডকাস্ট UI প্রিভিউ চালু করুন"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"LE অডিও শেয়ারিং প্রিভিউ সহ ব্যক্তিগত অডিও শেয়ারিং এবং ব্যক্তিগত ব্রডকাস্ট চালু করে"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ডিভাইসের বিবরণে LE অডিও টগল দেখুন"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ব্লুটুথ LE অডিও-এর সাদাতালিকা বাইপাস করুন"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE অডিও-এর সাদাতালিকার শর্ত পূর্ণ করতে LE অডিও-এর পেরিফেরাল যাাচাই করা না হলেও ডিফল্ট হিসেবে LE অডিও ব্যবহার করুন।"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"অ্যাপের ভাষা"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"সাজেস্ট করা ভাষা"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"সব ভাষা"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"সাজেস্ট করা হয়েছে"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"সব ভাষা"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"সব জায়গা"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"সব নম্বরের সিস্টেম"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"সিস্টেমের ভাষা"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"সিস্টেম ডিফল্ট"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"এই অ্যাপের জন্য \'সেটিংস\' থেকে ভাষা বেছে নেওয়ার সুবিধা উপলভ্য নেই।"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"পরিবর্তন করুন"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ভাষা উপলভ্য নেই"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"সিস্টেমের ভাষা হিসেবে এই ভাষা ব্যবহার করা যাবে না, তবে এটি যে আপনার পছন্দের ভাষা তা আপনি অ্যাপ ও ওয়েবসাইটে জানিয়েছেন।"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"সার্চ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"একটি ভাষা যোগ করুন"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"পছন্দের অঞ্চল"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ভাষার নাম লিখুন"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ভাষার আরও সেটিংস"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"আঞ্চলিক অভিরুচি"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ইউনিট ও নম্বর সংক্রান্ত পছন্দ সেট করুন"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"অ্যাপকে আপনার আঞ্চলিক অভিরুচি সম্পর্কে জানতে দিন, যাতে সেগুলি আপনার অভিজ্ঞতা পছন্দমতো করে তুলতে পারে।"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"যেখানে সম্ভব অ্যাপ সেখানে আপনার আঞ্চলিক অভিরুচি ব্যবহার করবে।"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"আঞ্চলিক পছন্দ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"তাপমাত্রা"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"সপ্তাহের প্রথম দিন"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"নম্বর সংক্রান্ত পছন্দ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"রোমিংয়ে থাকলেও ডেটা পরিষেবাতে কানেক্ট করুন"</string>
     <string name="roaming_disable" msgid="729512894708689604">"রোমিংয়ে থাকলেও ডেটা পরিষেবাতে কানেক্ট করুন"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"রোমিং চার্জ প্রযোজ্য হতে পারে।"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"সময় অটোমেটিক সেট করুন"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"অটোমেটিক সেট করুন"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"এই টগল চালু করা থাকলে টাইম জোন সেট করার জন্য লোকেশন ব্যবহার করা হবে"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"অটোমেটিক তারিখ ও সময়"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"আপনার নেটওয়ার্ক ও ওয়্যারলেস সিগন্যাল ব্যবহার করে অটোমেটিক সেট করুন"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"অটোমেটিক টাইম জোন"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"আপনার কাছাকাছি মোবাইল নেটওয়ার্কের উপর নির্ভর করে অটোমেটিক সেট করুন"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"উপলভ্য থাকলে, আপনার ডিভাইসের লোকেশন ব্যবহার করে অটোমেটিক সেট করুন"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"লোকেল ডিফল্ট ব্যবহার করুন"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘন্টার ফর্ম্যাট ব্যবহার করুন"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"সময়"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"আঙ্গুল তুলুন, তারপরে আবার সেন্সরে স্পর্শ করুন"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ফিঙ্গারপ্রিন্ট সেন্সর ব্যবহার করা যাচ্ছে না"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"এটি সারাতে পারবেন এমন কারওর কাছে যান।"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"স্ক্রিন-বন্ধ থাকা অবস্থায় \'ফিঙ্গারপ্রিন্ট আনলক\' ফিচার ব্যবহার করুন"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"\'ফিঙ্গারপ্রিন্ট আনলক\' ফিচার ব্যবহার করুন, এমনকি স্ক্রিন বন্ধ করা থাকলেও"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"স্ক্রিন-বন্ধ, আনলক করুন"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"আরও নিরাপত্তা সেটিংস"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"অফিস প্রোফাইল লক, এনক্রিপশন এবং আরও অনেক কিছু"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"এনক্রিপশন, ক্রেডেনশিয়াল এবং আরও অনেক কিছু"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"আপনার প্রাইভেট স্পেসের জন্য প্যাটার্ন সেট করুন"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"লক"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"লুকান"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"আপনার প্রাইভেট স্পেসের প্যাটার্ন কনফার্ম করুন"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"আপনার প্রাইভেট স্পেসের পিন আবার লিখুন"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"আপনার প্রাইভেট স্পেসের পাসওয়ার্ড আবার লিখুন"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"আপনি সর্বাধিক <xliff:g id="COUNT">%d</xliff:g>টি ফিঙ্গারপ্রিন্ট যোগ করতে পারবেন"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপনি অনুমোদিত সর্বোচ্চ সংখ্যক আঙ্গুলের ছাপ যোগ করেছেন"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"এর বেশি আঙ্গুলের ছাপ যোগ করা যাবে না"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"চালু আছে"</string>
     <string name="external_display_off" msgid="5634413756025351374">"বন্ধ আছে"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"এক্সটার্নাল ডিসপ্লে"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"এক্সটার্নাল ডিসপ্লে ব্যবহার করুন"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ডিসপ্লে রেজোলিউশন"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"এক্সটার্নাল ডিসপ্লে ডিসকানেক্ট হয়ে গেছে"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"রোটেশন বা রেজোলিউশন পরিবর্তন করা হলে, বর্তমানে চালু থাকা যেকোনও অ্যাপ বন্ধ হয়ে যেতে পারে"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"আপনার স্ক্রিন মিরর করার জন্য আপনার ডিভাইসকে কোনও এক্সটার্নাল ডিসপ্লের সাথে কানেক্ট করা থাকতে হবে"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"আরও বিকল্প"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ডিসপ্লে আবার সাজাতে হোল্ড করে টেনে আনুন।"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাস্ট করুন"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"মিরর"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"পাসওয়ার্ড দেখে নিয়ে আবার চেষ্টা করুন"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ডিভাইস প্রস্তুতকারকের সাথে যোগাযোগ করুন"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"কানেকশন দেখে নিয়ে আবার চেষ্টা করুন"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"এই ওয়াই-ফাই নেটওয়ার্ক এই মুহূর্তে উপলভ্য নেই"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"এই QR কোডে কোনও সমস্যা আছে। অন্যভাবে কানেক্ট করে দেখুন।"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"নেটওয়ার্ক বেছে নিন"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"আপনার ডিভাইস কানেক্ট করতে নেটওয়ার্ক বেছে নিন"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"এই ডিভাইস “<xliff:g id="SSID">%1$s</xliff:g>”-এ যোগ করতে চান?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"\'নিজে থেকে ঘুরবে\' সেটিং সম্পর্কে আরও জানুন"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"স্ক্রিন রেজোলিউশন"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"হাই রেজোলিউশন"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"সম্পূর্ণ রেজোলিউশন"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"সম্পূর্ণ রেজোলিউশন ব্যবহার করলে আপনার ব্যাটারির চার্জ বেশি খরচ হয়। রেজোলিউশন পরিবর্তন করা হলে কিছু অ্যাপ রিস্টার্ট হতে পারে।"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"বেছে নেওয়া হয়েছে"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"রঙ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"স্বাভাবিক"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"অভিযোজিত"</string>
     <string name="brightness" msgid="6216871641021779698">"উজ্জ্বলতার স্তর"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"পরিবেশের আলো অনুযায়ী উজ্জ্বলতা"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"পরিবেশের আলো অনুযায়ী উজ্জ্বলতা সম্পর্কে"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"আপনার পারিপার্শ্বিক অবস্থা এবং অ্যাক্টিভিটি অনুযায়ী স্ক্রিনের উজ্জ্বলতা নিজে থেকেই অ্যাডজাস্ট করে নেওয়া হবে। স্ক্রিন কতখানি উজ্জ্বল হলে আপনার সুবিধা হয়, তা আপনি স্লাইডারের মাধ্যমে নির্দিষ্ট করে দিতে পারেন।"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"চালু আছে"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"বন্ধ আছে"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"বেডটাইম মোডের সেটিংস"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{এছাড়া, মোড, ডার্ক থিম চালু করতে পারে}=1{এছাড়া, {mode_1} ডার্ক থিম চালু করে}=2{এছাড়া, {mode_1} ও {mode_2} ডার্ক থিম চালু করে}=3{এছাড়া, {mode_1}, {mode_2} ও {mode_3} ডার্ক থিম চালু করে}one{{mode_1}, {mode_2} ও আরও #টি মোড ডার্ক থিম চালু করে}other{{mode_1}, {mode_2} ও আরও #টি মোড ডার্ক থিম চালু করে}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"মোড সেটিংস"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"সাধারণ রেঞ্জের থেকেও কম"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"অতিরিক্ত কম ব্রাইটনেস"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ডিভাইসের স্ক্রিনের আলো স্বাভাবিক মাত্রার চেয়ে কম রাখুন"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"স্ক্রিন টাইমআউট"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"লোকেশন-ভিত্তিক পরিষেবা"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"লোকেশন ভিত্তিক পরিষেবা"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"লোকেশন ব্যবহার করুন"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"টাইম জোনের জন্য লোকেশন ব্যবহার করুন"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"টাইম জোন অটোমেটিক সেট করা যাচ্ছে না"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"লোকেশন বা \'লোকেশন পরিষেবা\' বন্ধ আছে"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"লোকেশন সেটিংস"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"এই সমস্যার সমাধান করুন"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"বাতিল করুন"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"অটোমেটিক টাইম জোন বন্ধ করা আছে"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"অটোমেটিক টাইম জোন বন্ধ থাকাকালীন উপলভ্য হয় না"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"টাইম জোন সেট করতে লোকেশন ব্যবহার করা হতে পারে"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"আপনার ডিভাইসের লোকেশন উপলভ্য থাকলে, এটি আপনার টাইম জোন সেট করার জন্য ব্যবহার করা হতে পারে"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার ভার্সন দেখুন"</string>
     <string name="legal_information" msgid="7509900979811934843">"আইনি তথ্য"</string>
     <string name="manual" msgid="3651593989906084868">"ম্যানুয়াল"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"বিকল্প"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"অ্যাক্সেসিবিলিটি"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ফিজিক্যাল কীবোর্ড"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"বাউন্স \'কী\'"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> মিলি সেকেন্ডের মধ্যে একই কী বারবার প্রেস করলে তা কীবোর্ড উপেক্ষা করে"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"একই \'কী\' দ্রুত বারবার প্রেস করলে কীবোর্ড তা উপেক্ষা করে"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"বাউন্স কী থ্রেশহোল্ড"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"আপনার কীবোর্ড কতক্ষণ পর্যন্ত কোনও একটি \'কী\' বারবার প্রেস করার ঘটনাকে উপেক্ষা করে সেই সময়সীমা বেছে নিন"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"০.২ সেকেন্ড"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"০.৪ সেকেন্ড"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"০.৬ সেকেন্ড"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"কাস্টম"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"কাস্টম ভ্যালু"</string>
     <string name="slow_keys" msgid="2891452895499690837">"স্লো \'কী\'"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"কোনও কী প্রেস করলে সেটি অ্যাক্টিভেট হতে যে সময় লাগে তা <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> মিলি সেকেন্ডে অ্যাডজাস্ট হয়"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"কোনও কী প্রেস করলে সেটি অ্যাক্টিভেট হতে যে সময় লাগে তা অ্যাডজাস্ট করে নেয়"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"স্টিকি \'কী\'"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"শর্টকাটের জন্য কীগুলি একসাথে ধরে রাখার পরিবর্তে একবারে একটি কী প্রেস করুন"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"মাউস \'কী\'"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"মাউস কন্ট্রোল করতে ফিজিক্যাল কীবোর্ড ব্যবহার করুন।"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"মাউস \'কী\' ব্যবহার করুন"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"পয়েন্টার নিয়ন্ত্রণ করতে আপনার কীবোর্ড ব্যবহার করুন"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"মাউস উল্টো দিকে স্ক্রল করা"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"পৃষ্ঠা নিচের দিকে নামাতে উপরের দিকে স্ক্রল করুন"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"বাঁদিক ও ডানদিকের বোতাম অদলবদল করুন"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"মাউসের বাঁদিকের বোতামটিকে ডানদিকের বোতাম হিসেবে ব্যবহার করুন"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>-এর জন্য মাউস \'কী\'"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"মাউস পয়েন্টার সরাতে <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> \'কী\' ব্যবহার করুন"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"প্রাথমিক মাউসের বোতাম ক্লিক করতে, <xliff:g id="CLICK_LABEL">%s</xliff:g> \'কী\' ব্যবহার করুন"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"প্রাথমিক মাউসের বোতাম প্রেস করে ধরে রাখতে, <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> \'কী\' ব্যবহার করুন"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"প্রাথমিক মাউসের রিলিজ করতে, <xliff:g id="RELEASE_LABEL">%s</xliff:g> \'কী\' ব্যবহার করুন"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"স্ক্রল মোড টগল করতে, <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> \'কী\' ব্যবহার করুন। এর ফলে <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> \'কী\' ব্যবহার করে উপরে, নিচে, বাঁদিকে অথবা ডানদিকে স্ক্রল করে দেখা যাবে"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"সেকেন্ডারি মাউসের বোতাম ক্লিক করতে, <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> \'কী\' ব্যবহার করুন"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"কীবোর্ড শর্টকাট"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"শর্টকাটের তালিকা দেখান"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"অফিসের প্রোফাইলের কীবোর্ড ও টুল"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ডিফল্ট"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"টাচপ্যাড"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"টাচপ্যাড ও মাউস"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"মাউস"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"পয়েন্টার স্পিড, জেসচার"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ক্লিক করতে ট্যাপ করা"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ট্যাপ করে টেনে আনা"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"একদম নিচে ডানদিকে ক্লিক করুন"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"আরও বিকল্পের জন্য টাচপ্যাডের নিচে ডানদিকের কোণায় ক্লিক করুন"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"পয়েন্টারের গতি"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"তিনটি আঙুল দিয়ে ট্যাপ করুন"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"পয়েন্টারের রঙ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"পয়েন্টার ফিল স্টাইল বদলে কালো করুন"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"পয়েন্টার ফিল স্টাইল বদলে সবুজ করুন"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"টাচপ্যাডের জেসচার সম্পর্কে জানুন"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ট্র্যাকপ্যাড, ট্র্যাক প্যাড, মাউস, কার্সর, স্ক্রল, সোয়াইপ, ডানদিকের বোতামে ক্লিক, ক্লিক, পয়েন্টার"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ডানদিকের বোতামে ক্লিক, ট্যাপ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"মাঝের বোতামে ক্লিক করুন"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant চালু করুন"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"হোমে যান"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ফিরে যান"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"সম্প্রতি ব্যবহার করা অ্যাপ দেখুন"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"হোম স্ক্রিনে যান"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"আপনার টাচপ্যাডে তিনটি আঙুলের সাহায্যে উপরের দিকে সোয়াইপ করুন"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ফিরে যান"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-এর জন্য নতুন \'কী\' বেছে নিন:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ফিজিক্যাল কীবোর্ডের অ্যাক্সেসিবিলিটি"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"স্টিকি কী, বাউন্স কী, মাউস কী"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"\'কী\' রিপিট করুন"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"রিপিট হওয়ার আগে বিলম্ব"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"রিপিটের হার"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"\'কী\' রিলিজ না হওয়া পর্যন্ত কোনও \'কী\'-এর অক্ষর রিপিট করতে সেই \'কী\' প্রেস করে ধরে থাকুন"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> লেআউট"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফল্ট"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"অটোমেটিক: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"প্রিভিউ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"মানক বিকল্পগুলি"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ভাষা"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"টেক্সট সাইজ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ক্যাপশনের সাইজ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ক্যাপশনের স্টাইল"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"কাস্টম বিকল্পগুলি"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"পশ্চাদপটের রঙ"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"বিদ্যুতের ব্যবহার সামঞ্জস্য করুন"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"অন্তর্ভুক্ত প্যাকেজগুলি"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"অ্যাপগুলি স্বাভাবিকভাবে কাজ করছে"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ব্যাটারি পাল্টানোর জন্য সাজেস্ট করা হয়েছে"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ব্যাটারির ক্ষমতা ও চার্জিং পারফর্ম্যান্স কমে গেছে এবং ব্যাটারি পাল্টানোর জন্য সাজেস্ট করা হয়েছে।"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ব্যাটারির লেভেল কমে গেছে"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ব্যাটারির আয়ু বাড়াতে ব্যাটারি সেভার চালু করুন"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ব্যাটারির আয়ু বাড়ান"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"এই VPN থেকে ডিসকানেক্ট করবেন?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ডিসকানেক্ট করুন"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ভার্সন"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ভার্সন <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN সরিয়ে দিন"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"বিদ্যমান VPN প্রতিস্থাপন করতে চান?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"সর্বদা-চালু VPN সেট করতে চান?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"কাজের দিন ৯ AM - ৫ PM\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ক্যালেন্ডার ইভেন্ট"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} চালু আছে}=2{{mode_1} ও {mode_2} চালু আছে}=3{{mode_1}, {mode_2} ও {mode_3} চালু আছে}one{{mode_1}, {mode_2} ও আরও #টি মোড চালু আছে}other{{mode_1}, {mode_2} ও আরও #টি মোড চালু আছে}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{১টি মোড অটোমেটিক চালু হতে পারে}one{#টি মোড অটোমেটিক চালু হতে পারে}other{#টি মোড অটোমেটিক চালু হতে পারে}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{বিরক্ত করবে না}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"চালু আছে"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"সেট করা নেই"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"বন্ধ করা হয়েছে"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"বুঝেছি"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"বিজ্ঞপ্তি"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"সময়কাল"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"মেসেজ, ইভেন্ট ও রিমাইন্ডার"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'বিরক্ত করবে না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"হয়ে গেছে"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"সেটিংস"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"বিজ্ঞপ্তি থেকে কোনও কিছু দেখা বা শোনা যাবে না"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"আপনি কোনও বিজ্ঞপ্তি দেখতে বা শুনতে পাবেন না। যারা তারা চিহ্নিত পরিচিতি এবং আগে যারা ফোন করেছেন তারা আবার ফোন করতে পারবেন।"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(বর্তমান সেটিং)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"বিরক্ত করবে না\" মোডের বিজ্ঞপ্তির সেটিংস পরিবর্তন করবেন?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"অফিস প্রোফাইলের সাউন্ড"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ব্যক্তিগত প্রোফাইলের সাউন্ড ব্যবহার করুন"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ব্যক্তিগত প্রোফাইলের সাউন্ডই ব্যবহার করুন"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"আনলক করার পরে, শেষ ব্যবহার করা স্ক্রিনে সরাসরি যান। লক স্ক্রিনে বিজ্ঞপ্তি দেখানো হবে না। সেগুলি দেখতে স্ক্রিনের উপর থেকে নিচের দিকে সোয়াইপ করুন।"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্রিন, লকস্ক্রিন, স্কিপ, বাইপাস"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"অফিস প্রোফাইল লক করা থাকলে"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"লক স্ক্রিনে কম বিজ্ঞপ্তি দেখানোর বিকল্প"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"লক স্ক্রিনে কম বিজ্ঞপ্তি দেখান"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"লক স্ক্রিনে শুধু নতুন বিজ্ঞপ্তি দেখানো"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"লক স্ক্রিন থেকে আগে থেকে দেখা বিজ্ঞপ্তি অটোমেটিক সরিয়ে দিন"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"লক স্ক্রিনে বিজ্ঞপ্তি"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"কথোপকথন দেখুন, ডিফল্ট ও আওয়াজ করবে না"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ডিফল্ট ও আওয়াজ করবে না এমন সব কথোপকথন দেখুন"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"কাজের সংবেদনশীল কন্টেন্ট লুকান"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"আপনার ডিভাইস লক করা অবস্থায় আপনি কীভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"আপনি অল্প সময়ের মধ্যে একসঙ্গে অনেকগুলি বিজ্ঞপ্তি পেলে আপনার ডিভাইস নিজের ভলিউম এবং সতর্কবার্তা সর্বাধিক ২ মিনিটের জন্য কমিয়ে দেবে। কল, অ্যালার্ম ও গুরুত্বপূর্ণ কথোপকথনের উপরে এর কোনও প্রভাব পড়ে না। \n\nস্ক্রিনের একেবারে উপর থেকে নিচের দিকে টেনে নামালে কুলডাউনের সময়ে পাওয়া বিজ্ঞপ্তি দেখতে পাওয়া যায়।"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"অফিস প্রোফাইলে প্রয়োগ করুন"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"অফিস প্রোফাইল অ্যাপে প্রয়োগ করুন"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"বান্ডেল করা বিজ্ঞপ্তি"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"চালু আছে"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"বন্ধ আছে"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"বিজ্ঞপ্তি বান্ডেলে রাখার সেটিংস ব্যবহার করুন"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"একই থিম রয়েছে এমন বিজ্ঞপ্তি সাইলেন্ট করে দেওয়া হবে এবং সাইলেন্ট অভিজ্ঞতার জন্য গ্রুপ করে রাখা হবে। বান্ডেল করে রাখলে অ্যাপের নিজের বিজ্ঞপ্তির সেটিংস ওভাররাইড হবে।"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআর(VR) সহায়তাকারী পরিষেবা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR সহায়তাকারী পরিষেবা হিসেবে চলার জন্য কোনও অ্যাপ ইনস্টল করা নেই৷"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য (ভিআর)VR পরিষেবার অ্যাক্সেসের অনুমতি দেবেন?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"গুরুত্বপূর্ণ কথোপকথন"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"এমন কেউ নেই"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{একটিও নেই}=1{১টি কথোপকথন}one{#টি কথোপকথন}other{#টি কথোপকথন}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"কথোপকথনের সেটিংস"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"যেগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"মেসেজিং বা কলিং অ্যাপ বিজ্ঞপ্তি না পাঠাতে পারলেও, আপনার বেছে নেওয়া লোকজন এখানে ওইসব অ্যাপের মাধ্যমে যোগাযোগ করতে পারবেন"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যেকেউ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"পরিচিতি"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তারা চিহ্নিত পরিচিতি"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"পরিচিতির সেটিংস"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"তারা চিহ্নিত পরিচিতির সেটিংস"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"কোনও কল করা যাবে না"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"কোনও মেসেজ নয়"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"অ্যালার্ম"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (অফিস)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"গণনা করা হচ্ছে…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"অ্যাপ সেটিংস"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"অ্যাপ ওভাররাইডের অনুমতি দিন"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"যে অ্যাপগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"মোড তৈরি করুন"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"কাস্টম মোড"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"মোডের নাম"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"মোডের নাম খালি রাখা যাবে না"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"একটি আইকন বেছে নিন"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ক্যালেন্ডার ইভেন্ট"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"বেডটাইম রুটিন"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ড্রাইভ করার সময়"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ফুল-স্ক্রিন বিজ্ঞপ্তি"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"এই অ্যাপকে ফুল-স্ক্রিনে বিজ্ঞপ্তি দেখানোর অনুমতি দিন"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ডিভাইস লক থাকার সময় এই অ্যাপকে ফুল স্ক্রিন জুড়ে বিজ্ঞপ্তি দেখানোর অনুমতি দিন। অ্যালার্ম, ইনকামিং কল অথবা অন্যান্য জরুরি বিজ্ঞপ্তি হাইলাইট করতে, অ্যাপ এগুলি ব্যবহার করতে পারে।"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"সিস্টেম সম্পর্কিত পছন্দ পরিবর্তনের অনুমতি দিন"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"আপনার পরিবর্তে এই অ্যাপকে সিস্টেম সম্পর্কিত পছন্দ পরিবর্তন করার অনুমতি দিন"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"কোনও অ্যাপকে এই অনুমতি দিলে সেটি সিস্টেমের কোর সিস্টেমে পরিবর্তন করতে পারবে।"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"মিডিয়া ম্যানেজমেন্ট অ্যাপ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"অ্যাপকে মিডিয়া ম্যানেজ করার অনুমতি দিন"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"অনুমতি দেওয়া হলে, এই অ্যাপ আপনাকে জিজ্ঞাসা না করেই অন্য অ্যাপের তৈরি করা মিডিয়া ফাইলে পরিবর্তন করতে বা তা মুছে ফেলতে পারবে। অ্যাপকে অবশ্যই ফাইল এবং মিডিয়া অ্যাক্সেস করার অনুমতি দিতে হবে।"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"জেসচার"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"দ্রুত ক্যামেরা খুলুন"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতাম দুবার প্রেস করুন৷ যেকোনও স্ক্রিনে কাজ করে৷"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"সেল্ফির জন্য ক্যামেরা ঘোরান"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"নেভিগেশন মোড"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"স্যাটেলাইট মেসেজিং"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"স্যাটেলাইটের মাধ্যমে টেক্সট মেসেজ পাঠান ও পান। আপনার অ্যাকাউন্টে অন্তর্ভুক্ত।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"স্যাটেলাইটের মাধ্যমে টেক্সট মেসেজ পাঠান ও পান। আপনার অ্যাকাউন্টের সাথে যোগ করা হয়নি।"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"স্যাটেলাইট মেসেজিং"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"স্যাটেলাইট মেসেজিং সম্পর্কে"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"উপযুক্ত <xliff:g id="CARRIER_NAME">%1$s</xliff:g> অ্যাকাউন্টের অংশ হিসেবে আপনি স্যাটেলাইটের মাধ্যমে টেক্সট মেসেজ পেতে ও পাঠাতে পারবেন"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"আপনার <xliff:g id="CARRIER_NAME">%1$s</xliff:g> প্ল্যান"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"আপনার অ্যাকাউন্টে স্যাটেলাইট মেসেজিং অন্তর্ভুক্ত আছে"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"আপনার অ্যাকাউন্টে স্যাটেলাইট মেসেজিং অন্তর্ভুক্ত নেই"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"আরও জানুন"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"এটি কীভাবে কাজ করে"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"আপনার ফোন স্যাটেলাইটের সাথে অটোমেটিক কানেক্ট হয়ে যাবে। সবচেয়ে ভাল কানেকশনের জন্য পরিষ্কার আকাশ দেখা যায় এমন জায়গায় থাকুন।"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"আপনার ফোন স্যাটেলাইটে কানেক্ট করার পরে"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"আপনি জরুরি পরিষেবা সহ যেকোনও ব্যক্তিকে মেসেজ পাঠাতে পারেন। মোবাইল নেটওয়ার্ক পাওয়া গেলে ফোন সেটির সাথে আবার কানেক্ট করবে।"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"স্যাটেলাইট মেসেজিংয়ে আরও বেশি সময় লাগতে পারে এবং এটি শুধু কিছু জায়গাতে উপলভ্য। আবহাওয়া এবং নির্দিষ্ট স্ট্রাকচার আপনার স্যাটেলাইট কানেকশন প্রভাবিত করতে পারে। স্যাটেলাইটের মাধ্যমে কল করার সুবিধা উপলভ্য নেই। জরুরি কলের জন্য এখনও কানেক্ট করা যেতে পারে।\n\n\'সেটিংস\'-এ অ্যাকাউন্ট পরিবর্তনের বিষয়টি দেখানোর জন্য কিছুটা সময় লাগতে পারে। বিবরণের জন্য আপনার পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন।"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"স্যাটেলাইট মেসেজিং সম্পর্কে আরও তথ্য"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> চালু করা যাচ্ছে না"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> চালু করতে, প্রথমে স্যাটেলাইট কানেকশন বন্ধ করুন"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"স্যাটেলাইট কানেক্টিভিটি"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"অ্যাক্সেস পয়েন্টের নাম"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-এ কনেক্ট থাকলে উপলভ্য থাকে না"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"আপনি পেজ-অ্যাগনোস্টিক মোডের ১৬কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারান্টি দেওয়া যায় না এবং বুটলোডার আনলক করা অবস্থায় ফোনে সেভ করে রাখা ডেটা নিয়ে ঝুঁকি থাকতে পারে। এই মোডে কিছু ফিচার বন্ধ করা থাকে, তাই কোনও কোনও অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, আপনাকে অবশ্যই ৪কেবি মোডে ফিরে যেতে হবে ও তারপরে ডিভাইসের বুটলোডার লক করতে হবে। এটি ডিভাইসটিকে আবার ফ্যাক্টরি রিসেট করবে এবং এটির প্রোডাকশন সেটিংস আগের মতো হয়ে যাবে। ডিভাইস Android-এ বুট হয়ে গেলে, ডেভেলপার বিকল্প থেকে OEM আনলক বন্ধ করুন। ডিভাইসটি Android-এ বুট করা না গেলে বা স্থিতিশীল না হলে, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; থেকে সাম্প্রতিক ফ্যাক্টরি ইমেজের সাথে ডিভাইসটি আবার ফ্ল্যাশ করুন অথবা &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ব্যবহার করুন এবং \'ডিভাইস ওয়াইপ করুন\', \'বুটলোডার লক করুন\' ও \'সব পার্টিশন ফোর্স ফ্ল্যাশ করুন\' বিকল্প বেছে নিন।"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"১৬ কেবি পেজ-অ্যাগনোস্টিক মোড"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"আরও পড়ুন"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"পেজ সাইজ কম্প্যাটিবিলিটি মোডে অ্যাপ রান করুন"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"সমস্যার রিপোর্টের পরিচালক"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"আপনার ডিভাইসে কোন অ্যাপটি সমস্যার রিপোর্টের শর্টকাট পরিচালনা করবে তা নির্ধারণ করে।"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ব্যক্তিগত"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"স্ট্রিম শুনুন"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-এর মাধ্যমে শুনতে অডিও স্ট্রিম QR কোড স্ক্যান করুন"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"শেয়ারিং চলাকালীন পাসওয়ার্ড এডিট করতে পারবেন না। পাসওয়ার্ড পরিবর্তন করতে, প্রথমে অডিও শেয়ারিং বন্ধ করুন।"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"আপনার পাসওয়ার্ডে অবশ্যই ৪-১৬টি অক্ষর থাকতে হবে এবং শুধু বর্ণ, সংখ্যা ও চিহ্ন ব্যবহার করতে হবে"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR কোড স্ক্যানার"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"সাহায্য প্রয়োজন?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"সেটিংস সার্চ করুন"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"পরিচিতি, স্টোরেজ, অ্যাকাউন্ট"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"পরিচিতি সংক্রান্ত স্টোরেজ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"শুধুমাত্র ডিভাইস"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"অ্যাকাউন্টের সাথে নতুন পরিচিতি সিঙ্ক হবে না"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"সাধারণত, পরিচিতি আপনার ডিভাইসে সেভ হবে এবং আপনার অ্যাকাউন্টের সাথে সিঙ্ক হবে"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ডিফল্ট অ্যাকাউন্ট সেট করার সময় কোনও সমস্যা হয়েছে"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"কোনও ডিফল্ট অ্যাকাউন্ট সেট করা নেই"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"শুধুমাত্র ডিভাইস"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ডিভাইস ও %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"শুরু করতে একটি অ্যাকাউন্ট যোগ করুন"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"পরিচিতি কোথায় সেভ করব"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"খোঁজার জন্য সার্কেল বানান"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"আপনার স্ক্রিনে কন্টেন্ট ব্যবহার করে সার্চ করতে হোম বোতাম বা নেভিগেশন হ্যান্ডেল টাচ করে ধরে রাখুন।"</string>
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 6b5a4985ecf..7fc43fb0074 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Pahuljica"</item>
     <item msgid="7952183800501346803">"Suncobran"</item>
     <item msgid="799139025758265891">"Alati radionice"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
+    <item msgid="8112685757657659269">"Klavir"</item>
     <item msgid="3861584909935022342">"Filmska traka"</item>
     <item msgid="5827426100157335512">"Knjiga"</item>
     <item msgid="8585828346253128384">"Cvijet lotosa"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e6fbac5ae86..1b57cef4feb 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ako isključite Bluetooth, uključit će se ponovo sljedećeg dana"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Upari desno uho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Upari lijevo uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Uparite drugo uho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Onemogući Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Onemogućava funkciju Bluetooth LE Audio ako uređaj podržava mogućnosti hardvera za LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Način rada Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Omogući pregled korisničkog interfejsa za emitiranje putem Bluetooth LE Audija"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Omogućava pregled korisničkog interfejsa za dijeljenje putem LE Audija, uključujući dijeljenje ličnog zvuka i privatno emitiranje"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Prikaži prekidač za LE Audio u detaljima o uređaju"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Zaobiđi Listu dozvoljenih za Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Koristite LE Audio prema zadanim postavkama čak i ako nije potvrđeno da LE Audio periferni uređaj ispunjava kriterije Liste dozvoljenih."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jezik aplikacije"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Predloženi jezici"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Svi jezici"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Predloženo"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Svi jezici"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Sve regije"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Svi sistemi numeriranja"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Jezik sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistemski zadano"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Odabir jezika za ovu aplikaciju nije dostupan u Postavkama."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Promijeni"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nije dostupan"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Taj jezik se ne može koristiti kao jezik sistema, ali ste ga postavili kao preferirani jezik za aplikacije i web lokacije."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pretraga"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dodajte jezik"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Izbor regije"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Upišite ime jezika"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Više postavki jezika"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionalne postavke"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Postavite preference za jedinice i brojeve"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Omogućite aplikacijama da znaju vaše regionalne postavke da mogu personalizirati vaše iskustvo."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacije će koristiti vaše regionalne postavke kada je to moguće."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionalne postavke"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prvi dan u sedmici"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Postavke brojeva"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Povezivanje na usluge prenosa podataka u romingu"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Povezivanje na usluge prenosa podataka u romingu"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Mogu nastati troškovi rominga."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Automatski postavi vrijeme"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Postavi automatski"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokacija će se koristiti za postavljanje vremenske zone kada je ovaj prekidač uključen"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatski datum i vrijeme"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatsko postavljanje putem mreže i bežičnih signala"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatsko postavljanje na osnovu mobilnih mreža u blizini"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Automatsko postavljanje putem lokacije uređaja, ako je dostupna"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi zadani format jezika/zemlje"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vrijeme"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Podignite prst, zatim ponovo dodirnite senzor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Nije moguće koristiti senzor za otisak prsta"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Posjetite pružaoca usluga za popravke."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Otključavanje isključenog ekrana otiskom prsta"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Koristite otključavanje otiskom prsta čak i kada je ekran isključen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Isključen ekran, otključavanje"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Više postavki sigurnosti"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zaključavanje radnog profila, šifriranje i drugo"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifriranje, akreditivi i drugo"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Postavite uzorak za privatni prostor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zaključaj"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Sakrij"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potvrdite uzorak za privatni prostor"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Ponovo unesite PIN za privatni prostor"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Ponovo unesite lozinku za privatni prostor"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Broj otisaka prstiju koje možete dodati: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nije moguće dodati još otisaka prstiju"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Uključeno"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Isključeno"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Vanjski ekran"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ugrađeni zaslon"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Koristi vanjski ekran"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rezolucija ekrana"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Veza s vanjskim ekranom je prekinuta"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Promjena rotacije ili rezolucije može zaustaviti sve trenutno pokrenute aplikacije"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Da preslikate ekran, uređaj mora biti povezan s vanjskim ekranom"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Više opcija"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Zadržite i prevucite da promijenite redoslijed ekrana."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikavanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Provjerite lozinku i pokušajte ponovo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontaktirajte proizvođača uređaja"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Provjerite vezu i pokušajte ponovo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ova WiFi mreža trenutno nije dostupna"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Postoji problem s ovim QR kodom. Pokušajte se povezati na drugi način."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Odaberite mrežu"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Za povezivanje uređaja, odaberite mrežu"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Dodati ovaj uređaj na mrežu “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saznajte više o automatskom rotiranju"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rezolucija ekrana"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Visoka rezolucija"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Puna rezolucija"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Puna rezolucija troši više baterije. Prebacivanje rezolucije može uzrokovati ponovo pokretanje nekih aplikacija."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimalna razlučivost"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimalna razlučivost više troši bateriju. Promjena razlučivosti može uzrokovati ponovno pokretanje nekih aplikacija."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Odabrano"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Prilagodljive"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivo osvijetljenosti"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Prilagodljiva osvijetljenost"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"O prilagodljivoj osvijetljenosti"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Osvijetljenost ekrana će se automatski prilagođavati vašem okruženju i aktivnostima. Klizač možete ručno pomjerati kako bi prilagodljiva osvijetljenost zapamtila vaše postavke."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Uključeno"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Isključeno"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Postavke načina rada za spavanje"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Načini rada također mogu aktivirati tamnu temu}=1{Način rada {mode_1} također aktivira tamnu temu}=2{Načini rada {mode_1} i {mode_2} također aktiviraju tamnu temu}=3{Načini rada {mode_1}, {mode_2} i {mode_3} također aktiviraju tamnu temu}one{Načini rada {mode_1} i {mode_2} te još # način rada također aktiviraju tamnu temu}few{Načini rada {mode_1} i {mode_2} te još # načina rada također aktiviraju tamnu temu}other{Načini rada {mode_1} i {mode_2} te još # načina rada također aktiviraju tamnu temu}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Postavke načina rada"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Još tamnije"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Dodatno zatamnjenje"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Dozvolite uređaju da bude tamniji nego inače"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Istek vremena ekrana"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Usluge lokacije"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Koristi lokaciju"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Koristi lokaciju za vremensku zonu"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Nije moguće automatski postaviti vremensku zonu"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokacija ili usluge lokacije su isključene"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Postavke lokacije"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Popravi ovo"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Otkaži"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nije dostupno kada je automatska vremenska zona isključena"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokacija se može koristiti za postavljanje vremenske zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ako je lokacija uređaja dostupna, može se koristiti za postavljanje vremenske zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="7509900979811934843">"Pravne informacije"</string>
     <string name="manual" msgid="3651593989906084868">"Ručno"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcije"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pristupačnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizička tastatura"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Slučajni pritisci tipki"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastatura zanemaruje brzo ponavljana pritiskanja iste tipke u rasponu od <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatura zanemaruje brzo ponavljane pritiske iste tipke"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag zanemarivanja slučajnih pritisaka"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Odaberite vrijeme u kojem će tastatura zanemarivati ponovljene pritiske tipki"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Prilagođeno"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"prilagođena vrijednost"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Sporo reagiranje tipki"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Prilagođava vrijeme potrebno za aktiviranje pritiskanja tipke na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Podešava vrijeme potrebno za aktiviranje pritiskanja tipke"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Ljepljive tipke"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Za prečice pritišćite jednu po jednu tipku umjesto da ih istovremeno zadržavate"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke miša"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Koristite fizičku tastaturu da upravljate mišem."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Koristi tipke miša"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Koristite tastaturu da upravljate pokazivačem"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto klizanje mišem"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Kliznite nagore da pomjerite stranicu nadolje"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamijeni lijevo i desno dugme"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Koristite lijevo dugme miša kao desno dugme"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tipke miša – <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Upotrijebite tipku <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> da pomaknete pokazivač miša"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Upotrijebite tipku <xliff:g id="CLICK_LABEL">%s</xliff:g> da kliknete na primarno dugme miša"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Upotrijebite tipku <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> da pritisnete i zadržite primarno dugme miša"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Upotrijebite tipku <xliff:g id="RELEASE_LABEL">%s</xliff:g> da pustite primarno dugme miša"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Upotrijebite tipku <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> da uključite/isključite način rada za klizanje. Ovo će omogućiti klizanje pregledom nagore, nadolje, ulijevo ili udesno pomoću tipki <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Upotrijebite tipku <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> da kliknete na sekundarno dugme miša"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Prečice tastature"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaz liste prečica"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatura i alati radnog profila"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Zadano"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Dodirna površina"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Dodirna podloga i miš"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Miš"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Brzina pokazivača, pokreti"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Dodir za klik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Prevlačenje dodirom"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik u donjem desnom uglu"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliknite u donjem desnom uglu dodirne podloge za više opcija"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Brzina pokazivača"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Koristi dodir s tri prsta"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Boja pokazivača"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Promjena ispune pokazivača u crnu"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Promjena ispune pokazivača u zelenu"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Naučite pokrete dodirne podloge"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"dodirna tabla, tabla na dodir, miš, kursor, klizanje, prevlačenje, desni klik, klik, pokazivač"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"desni klik, dodir"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Srednji klik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Pokreni Asistenta"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Idi na početnu stranicu"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Nazad"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Prikaži nedavne aplikacije"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Idite na početni ekran"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Prevucite nagore s tri prsta bilo gdje na dodirnoj podlozi"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Nazad"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tastature"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ljepljive tipke, tipke s dužim odzivom i tipke miša"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ponavljaj tipke"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Odgodi prije ponavljanja"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Brzina ponavljanja"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Zadržite tipku da ponavljate njen znak dok ne pustite tipku"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Raspored: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatski: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Veličina teksta"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titlova"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titlova"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Podesite potrošnju energije"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Uključeni paketi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacije rade uobičajeno"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Preporučuje se zamjena baterije"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapacitet baterije i performanse punjenja su smanjeni, pa preporučujemo zamjenu baterije."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nivo napunjenosti baterije je nizak"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Uključite uštedu baterije da produžite vijek trajanja baterije"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Poboljšajte vijek trajanja baterije"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Želite li prekinuti vezu s ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li zamijeniti postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li postaviti uvijek uključen VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00–17:00 radnim danima\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Događaji u kalendaru"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Način rada {mode_1} je aktivan}=2{Načini rada {mode_1} i {mode_2} su aktivni}=3{Načini rada {mode_1}, {mode_2} i {mode_3} su aktivni}one{Načini rada {mode_1} i {mode_2} te još # način rada su aktivni}few{Načini rada {mode_1} i {mode_2} te još # načina rada su aktivni}other{Načini rada {mode_1} i {mode_2} te još # načina rada su aktivni}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 način rada se može automatski uključivati}one{# način rada se može automatski uključivati}few{# načina rada se mogu automatski uključivati}other{# načina rada se može automatski uključivati}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne ometaj}=1{{mode_1}}=2{{mode_1} i {mode_2}}one{{mode_1}, {mode_2} i {mode_3}}few{{mode_1}, {mode_2} i {mode_3}}other{{mode_1}, {mode_2} i {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"UKLJUČENO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nije postavljeno"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Onemogućeno"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Razumijem"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Obavještenja"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trajanje"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Poruke, događaji i podsjetnici"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će se isključiti, osim za stavke kojim dozvolite iznad. Postavke poruka možete podesiti da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gotovo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Postavke"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bez vizuelnih elemenata ili zvuka obavještenja"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bez zvuka obavještenja"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Obavještenja nećete vidjeti ili čuti. Dozvoljeni su pozivi od kontakata označenih zvjezdicom i ponovljenih pozivalaca."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Trenutna postavka)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Promijeniti postavke obavještenja načina rada Ne ometaj?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvukovi radnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Koristi zvukove ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Koristite iste zvukove kao za lični profil"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Nakon otključavanja idite direktno na posljednji korišteni ekran. Obavještenja se ne prikazuju na zaključanom ekranu. Prevucite nadolje da ih vidite."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključani ekran, preskoči, zaobiđi"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kada je radni profil zaključan"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalizam obavještenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Prikaz manje obavještenja na zaključanom ekranu"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Prikazuj samo nova obavještenja na zaključanom ekranu"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatski uklonite prethodno prikazana obavještenja sa zaključanog ekrana"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Obavještenja na zaključanom ekranu"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Vidite razgovore, zadane i nečujne"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Prikaži zadane i nečujne razgovore"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Prikaži sav sadržaj obavještenja radnog profila"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Sakrij osjetljivi sadržaj radnog profila"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kada je uređaj zaključan, na koji način želite da se prikazuju obavještenja profila?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Obavještenja profila"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Obavještenja"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Obavještenja o aplikaciji"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kada unutar kratkog vremenskog raspona primite mnogo obavještenja, uređaj će smanjiti jačinu zvuka i minimizirati obavještenja do 2 minute. Ovo ne utiče na pozive, alarme i prioritetne razgovore. \n\nObavještenja primljena tokom stišavanja možete pronaći povlačenjem nadolje s vrha ekrana."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Primijeni na poslovne profile"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Primijenite na aplikacije radnog profila"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupisana obavještenja"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Uključeno"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Isključeno"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Koristi grupisanje obavještenja"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Obavještenja sa sličnim temama će se utišati i grupisati radi tišeg iskustva. Grupisanje će nadjačati vlastite postavke obavještenja aplikacije."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao usluga pomagača za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Dozvoliti pristup usluzi VR-a za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Postavke razgovora"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko vas može prekinuti"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Čak i ako vas aplikacije za razmjenu poruka ili pozivanje ne mogu obavijestiti, osobe koje ovdje odaberete će vas i dalje moći kontaktirati putem tih aplikacija"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Postavke kontakata"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Postavke kontakata označenih zvjezdicom"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ništa"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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š # mogu prekinuti}few{Aplikacije {app_1}, {app_2} i još # mogu prekinuti}other{Aplikacije {app_1}, {app_2} i još # mogu prekinuti}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (radno)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Računanje…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Postavke aplikacija"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dozvolite aplikacijama da zanemaruju"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacije koje vas mogu prekinuti"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Kreirajte način rada"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Prilagođeni način rada"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Naziv načina rada"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Naziv načina rada ne može biti prazan"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Odaberite ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Događaji u kalendaru"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina vremena za spavanje"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"U toku vožnje"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Obavještenja preko cijelog ekrana"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Dozvoli obavještenja ove aplikacije preko cijelog ekrana"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Dozvolite aplikaciji da prikazuje obavještenja koja zauzimaju cijeli ekran kada je uređaj zaključan. Aplikacije ih mogu koristiti da istaknu alarme, dolazne pozive ili druga hitna obavještenja."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Pisanje postavki sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Dozvoli ovoj aplikaciji da mijenja postavke sistema u moje ime"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Odobrenje dozvoljava aplikaciji da mijenja osnovne postavke sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacije za upravljanje medijima"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Dozvoli aplikaciji da upravlja medijima"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ako je dozvoljeno, ova aplikacija bez vašeg odobrenja može mijenjati ili brisati medijske fajlove kreirane pomoću drugih aplikacija. Aplikacija mora imati odobrenje za pristup fajlovima i medijima."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Pokreti"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Brzo otvaranje kamere"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Da brzo otvorite kameru, dvaput pritisnite dugme za uključivanje. Funkcionira na svim ekranima."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Obrtanje kamere za selfi"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Način rada za navigaciju"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelitska razmjena poruka"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Šaljite i primajte poruke putem satelita. Uključeno je uz račun."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Šaljite i primajte poruke putem satelita. Nije uključeno uz vaš račun."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelitska razmjena poruka"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"O satelitskoj razmjeni poruka"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Slanje poruka putem satelita, satelitska povezivost"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"O značajci <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Mogućnost slanja i primanja poruka putem satelita imate u okviru računa kod operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g> koji ispunjava uslove"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Vaš paket kod operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelitska razmjena poruka je uključena uz račun"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Slanje poruka uključeno je za vaš račun"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelitska razmjena poruka nije uključena uz račun"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saznajte više"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Kako funkcionira"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefon će se automatski povezati sa satelitom. Da veza bude najbolja, pogled na nebo ne smije biti zapriječen."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Nakon što se telefon poveže sa satelitom"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Poruke možete slati svakome, uključujući hitne službe. Telefon će se ponovo povezati s mobilnom mrežom kada bude dostupna."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satelitska razmjena poruka može trajati duže i dostupna je samo u nekim područjima. Vremenske prilike i određeni objekti mogu uticati na satelitsku vezu. Pozivanje putem satelita nije dostupno. Hitni pozivi se i dalje mogu uspostavljati.\n\nMože proći neko vrijeme dok se promjene računa ne prikažu u Postavkama. Za detalje se obratite operateru."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Više o satelitskoj razmjeni poruka"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Izvršavanje značajke <xliff:g id="SUBJECT">%1$s</xliff:g> moglo bi potrajati dulje, a ta je značajka dostupna samo u nekim područjima. Na vašu satelitsku vezu mogu utjecati vremenski uvjeti i određene strukture. Pozivanje putem satelita nije dostupno. Hitni pozivi i dalje se mogu povezati.\n\nMože proteći neko vrijeme dok se promjene računa prikažu u postavkama. Za pojedinosti se obratite mobilnom operateru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Više o značajci <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nije moguće uključiti <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Da uključite <xliff:g id="FUNCTION">%1$s</xliff:g>, prvo prekinite satelitsku vezu"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelitska povezivost"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelitska povezivost"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelitska povezivost"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"slanje poruka putem satelita"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Upotreba podataka uključena je za vaš račun"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS putem satelita"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Slanje poruka hitnim službama kad se ne možete povezati s mobilnom ili Wi‑Fi mrežom"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos putem satelita, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"O SOS-u putem satelita"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Možete slati poruke hitnim službama i dijeliti svoju lokaciju kad se ne možete povezati s mobilnom ili Wi-Fi mrežom. Ova usluga možda neće biti uvijek dostupna na svim lokacijama ili u svim okolnostima."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Nazovite hitne službe ili im pošaljite SMS poruku"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Odgovorite na pitanja o hitnom slučaju"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Slijedite korake za povezivanje sa satelitom"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ako niste povezani s mobilnom mrežom, prikazuje se opcija upotrebe SOS-a putem satelita"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Pošaljite odgovore hitnim službama da biste dobili odgovarajuću pomoć"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kad se povežete, možete slati poruke hitnim službama"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Isprobajte pokaznu verziju"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kad se povežete s hitnim službama putem satelita, vaše ime, e-adresa, telefonski broj, lokacija, podaci o uređaju (IMEI, jezik, model, razina baterije) i podaci za kontakt za hitne slučajeve dijele se s hitnim službama i davateljima satelitskih usluga. \n\nZa upotrebu SOS-a putem satelita Google poruke moraju biti zadana aplikacija za SMS-ove. \n\nAko je automatski odabir mreže isključen, on će se uključiti, a vaš će se uređaj automatski povezati s bilo kojom mrežom."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Postavke dijeljenja"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kontakti za hitne slučajeve"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Vaš Google račun"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Pregledajte ili ažurirajte informacije koje će se podijeliti s hitnim službama"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nazivi pristupne tačke"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"U načinu ste rada od 16 kB neovisnom o veličini stranice. Integritet softvera se ne može garantirati u ovom načinu rada i svi podaci pohranjeni na telefonu dok je program za učitavanje operativnog sistema otključan bi mogli biti izloženi riziku. Neke funkcije će biti onemogućene u ovim načinima rada, pa neke aplikacije možda neće funkcionirati. Da ponovo uđete u proizvodni način rada, morate se vratiti u način rada od 4 kB i zatim otključati program za učitavanje operativnog sistema na uređaju. To će ponovo vratiti uređaj na fabričke postavke i vratiti proizvodne postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere. Ako se uređaj ne pokrene u Androidu ili ako je nestabilan, reprogramirajte uređaj najnovijim fabričkim slikama sa &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ili upotrijebite &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; i odaberite \"Uništi sve podatke na uređaju\"\', \"Zaključaj program za učitavanje operativnog sistema\" i \"Prisilno programiraj sve particije\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Način rada od 16 kB neovisan o veličini stranice"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Pročitajte više"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Pokrenite aplikaciju u načinu rada za kompatibilnost s veličinom stranice"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Obrađivač izvještaja o greškama"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Određuje koja aplikacija obrađuje prečicu za Izvještaj o greškama na uređaju."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Lično"</string>
@@ -5160,7 +5283,7 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"Pomoć pri određivanju relativnog položaja uređaja u blizini koji imaju ultra široki opseg"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Isključite način rada u avionu da koristite UWB"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Ultra široki opseg nije dostupan na trenutnoj lokaciji"</string>
-    <string name="thread_network_settings_title" msgid="4212301030523859220">"Nit"</string>
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Koristi Thread"</string>
     <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread vam pomaže da povežete pametne kućne uređaje te povećate efikasnost i performanse.\n\nKada je ovo omogućeno, uređaj ispunjava uslove pridruživanja Thread mreži, što vam omogućava da upravljate uređajima s podržanim Matterom putem telefona."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Saznajte više o Threadu"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Slušajte prenos"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skenirajte QR kôd prenosa zvuka da slušate na uređaju <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Nije moguće urediti lozinku tokom dijeljenja. Da promijenite lozinku, prvo isključite dijeljenje zvuka."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Lozinka mora sadržavati između 4 i 16 znakova koji su samo slova, brojevi i simboli"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Skener QR koda"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Trebate pomoć?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Pretražite postavke"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakti, pohrana, račun"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Pohrana za kontakte"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Samo uređaj"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi kontakti se neće sinhronizirati s računom"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti će se sačuvati na uređaj i sinhronizirati s računom prema zadanim postavkama"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Došlo je do greške prilikom postavljanja zadanog računa"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Zadani račun nije postavljen"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da započnete"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdje pohranjivati kontakte"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Pretraživanje zaokruživanjem"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Dodirnite i zadržite dugme za početnu stranicu ili ručicu za navigaciju da pretražujete pomoću sadržaja na ekranu."</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index d3720eafb33..b6b086958e2 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Floc de neu"</item>
     <item msgid="7952183800501346803">"Para-sol"</item>
     <item msgid="799139025758265891">"Eines d\'un taller"</item>
-    <item msgid="1330084588359129896">"Tenda de campanya"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rodet de pel·lícula"</item>
     <item msgid="5827426100157335512">"Llibre"</item>
     <item msgid="8585828346253128384">"Flor de lotus"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 43744310054..bdab0f30768 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincula un dispositiu nou"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activa automàticament demà"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Si desactives el Bluetooth, es tornarà a activar l\'endemà"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Vincula la dreta"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Vincula l\'esquerra"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Vincula l\'altra orella"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Desactiva Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Desactiva la funció Bluetooth LE Audio si el dispositiu admet les funcions de maquinari d\'LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Mode Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Activa la previsualització de la IU de difusió de Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Activa la previsualització de la IU de compartició de LE Audio, que inclou la compartició d\'àudio personal i la difusió privada"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Botó d\'LE Audio a Detalls del dispositiu"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omet la llista d\'accés permès de Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Utilitza LE Audio de manera predeterminada encara que no s\'hagi verificat si el perifèric d\'LE Audio compleix els criteris de la llista d\'accés permès"</string>
@@ -136,7 +139,7 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra-ho tot"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Mostra-ho tot"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"Llapis òptic"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"Prem el botó del darrere"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"Premuda del botó del darrere"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (perfil de treball)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escriu als camps de text"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignora totes les premudes del botó del llapis òptic"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma de l\'aplicació"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomes suggerits"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Tots els idiomes"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggeriments"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Tots els idiomes"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Totes les regions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tots els sistemes de numeració"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma del sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Valor predeterminat del sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La selecció d\'idioma per a aquesta aplicació no està disponible des de Configuració."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Canvia"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Aquest idioma (%s) no està disponible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Aquest idioma no es pot utilitzar com a idioma del sistema, però has permès que les aplicacions i els llocs web sàpiguen quin prefereixes."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Cerca"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Afegeix un idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferència de regió"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Escriu el nom de l\'idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Més opcions de configuració d\'idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferències regionals"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Estableix preferències d\'unitats i de números"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permet a les aplicacions conèixer les preferències regionals perquè puguin personalitzar la teva experiència."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Les aplicacions utilitzaran les teves preferències regionals quan sigui possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferències regionals"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primer dia de la setmana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferències de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connecta\'t a serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connecta\'t a serveis de dades en itinerància"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Es poden aplicar càrrecs per itinerància."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Defineix l\'hora automàticament"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Defineix automàticament"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"La ubicació s\'utilitzarà per definir la zona horària quan s\'activi aquesta funció"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data i hora automàtiques"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Estableix automàticament amb la xarxa i els senyals sense fil"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zona horària automàtica"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Estableix automàticament segons les xarxes mòbils properes"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Estableix automàticament amb la ubicació del dispositiu, si està disponible"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utilitza la configuració regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utilitza el format de 24 hores"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Aixeca el dit i, a continuació, torna a tocar el sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"No es pot utilitzar el sensor d\'empremtes digitals"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visita un proveïdor de reparacions."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueig amb empremta digital amb la pantalla apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Utilitza Desbloqueig amb empremta digital fins i tot quan la pantalla estigui apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Pantalla apagada, desbloqueig"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Més opcions de configuració de seguretat"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueig del perfil de treball, encriptació i més"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encriptació, credencials i més"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Defineix un patró per a l\'espai privat"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloqueja"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Amaga"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma el patró de l\'espai privat"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Torna a introduir el PIN de l\'espai privat"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Torna a introduir la contrasenya de l\'espai privat"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Pots afegir un màxim de <xliff:g id="COUNT">%d</xliff:g> empremtes digitals"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Has afegit el nombre màxim d\'empremtes digitals"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No es poden afegir més empremtes digitals"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activat"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desactivat"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Pantalla externa"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Pantalla integrada"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Utilitza la pantalla externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolució de la pantalla"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"La pantalla externa està desconnectada"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Canviar la rotació o la resolució pot aturar les aplicacions que s\'estiguin executant ara mateix"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"El dispositiu ha d\'estar connectat a una pantalla externa per duplicar la pantalla"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Més opcions"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Mantén premut i arrossega per reorganitzar les pantalles."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emet"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplicar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activa pantalla sense fil"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Comprova la contrasenya i torna-ho a provar"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contacta amb el fabricant del dispositiu"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comprova la connexió i torna-ho a provar"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Aquesta xarxa Wi‑Fi no està disponible ara mateix"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Hi ha un problema amb aquest codi QR. Prova de connectar-te d\'una altra manera."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Tria una xarxa"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Per connectar el dispositiu, tria una xarxa"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Vols afegir aquest dispositiu a \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Més informació sobre el gir automàtic"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolució de pantalla"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolució"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolució completa"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"La resolució completa consumeix més bateria. Si canvies la resolució, és possible que algunes aplicacions es reiniciïn."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Resolució màxima"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"La resolució màxima consumeix més bateria. Si canvies la resolució, és possible que algunes aplicacions es reiniciïn."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seleccionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colors"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturals"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptatius"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivell de brillantor"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brillantor adaptativa"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Sobre la brillantor adaptativa"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"La brillantor de la pantalla s\'ajustarà automàticament al teu entorn i a la teva activitat. Pots moure el control lliscant manualment perquè la brillantor adaptativa aprengui les teves preferències."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activat"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desactivat"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Configuració del mode Hora de dormir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Els modes també poden activar el tema fosc}=1{{mode_1} també activa el tema fosc}=2{{mode_1} i {mode_2} també activen el tema fosc}=3{{mode_1}, {mode_2} i {mode_3} també activen el tema fosc}other{{mode_1}, {mode_2} i # més també activen el tema fosc}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Configuració dels modes"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Encara més atenuat"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Atenuació extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permet que el dispositiu s\'atenuï més de l\'habitual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Temps d\'espera de la pantalla"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Serveis d\'ubicació"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Serveis d\'ubicació"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Utilitza la ubicació"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Utilitza la ubicació per a la zona horària"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"No es pot definir la zona horària automàticament"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"La ubicació o els serveis d\'ubicació estan desactivats"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Configuració d\'ubicació"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corregeix-ho"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancel·la"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horària automàtica està desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"No està disponible quan la zona horària automàtica 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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Pot ser que la ubicació s\'utilitzi per definir la zona horària"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Si la ubicació del dispositiu està disponible, pot ser que s\'utilitzi per definir la teva zona horària"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Mostra informació legal, estat, versió de programari"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informació legal"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcions"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilitat"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclat físic"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Tecles de rebot"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"El teclat ignora les pulsacions repetides ràpidament de la mateixa tecla en un interval de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"El teclat ignora les pulsacions repetides ràpidament de la mateixa tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Llindar de la tecla de rebot"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Tria el temps que vols que el teclat ignori les pulsacions repetides de tecles"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalitzat"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalitzat"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tecles lentes"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta el temps que tarda la pulsació d\'una tecla en activar-se a <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta el temps que tarda la pulsació d\'una tecla en activar-se"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tecles permanents"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Prem una tecla cada vegada per a les dreceres en lloc de mantenir premudes les tecles alhora"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tecles del ratolí"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Utilitza el teclat físic per controlar el ratolí."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Utilitza les tecles del ratolí"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utilitza el teclat per controlar el punter"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplaçament invers del ratolí"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplaça\'t cap amunt per moure la pàgina cap avall"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Canvia els botons dret i esquerre"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utilitza el botó esquerre del ratolí com si fos el dret"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tecles del ratolí per a <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Utilitza les tecles <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> per moure el punter del ratolí"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Utilitza la tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> per fer clic al botó principal del ratolí"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Utilitza la tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> per mantenir premut el botó principal del ratolí"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Utilitza la tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> per deixar anar el botó principal del ratolí"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Utilitza la tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> per canviar el mode de desplaçament. Això farà que les tecles <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> desplacin la visualització cap amunt, cap avall, cap a l\'esquerra o cap a la dreta."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Utilitza la tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> per fer clic al botó secundari del ratolí"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tecles de drecera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra la llista de dreceres"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclats i eines del perfil de treball"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predeterminat"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Ratolí tàctil"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Ratolí tàctil i ratolí"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Ratolí"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocitat del punter, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Toca per fer clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Toca i arrossega"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Fes clic a la part inferior dreta"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Fes clic a l\'extrem inferior dret del ratolí per a més opcions"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocitat del punter"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Utilitza el toc amb tres dits"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Color del punter"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Canvia emplenament del punter a negre"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Canvia emplenament del punter a verd"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Aprèn els gestos del ratolí tàctil"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ratolí tàctil, ratolí, cursor, desplaçar-se, lliscar, fer clic amb el botó dret, fer clic, punter"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"fer clic amb el botó dret, tocar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic central"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Inicia l\'Assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ves a la pàgina d\'inici"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Torna"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Mostra les aplicacions recents"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ves a la pàgina d\'inici"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Fes lliscar tres dits cap amunt al ratolí tàctil"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Torna"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Tria una tecla nova per a <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilitat del teclat físic"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tecles permanents, tecles de rebot, tecles del ratolí"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeteix les tecles"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Retard abans de la repetició"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Freqüència de repetició"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mantén premuda una tecla per repetir-ne el caràcter fins que la deixis anar"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Disseny de <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminat"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automàtic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Previsualització"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opcions estàndard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Mida del text"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Mida dels subtítols"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estil dels subtítols"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opcions personalitzades"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fons"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Redueix el consum de la bateria"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquets inclosos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Les aplicacions funcionen correctament"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Es recomana substituir la bateria"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"La capacitat de la bateria i el rendiment de la càrrega han disminuït; es recomana substituir la bateria."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nivell de bateria baix"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activa Estalvi de bateria per allargar la durada de la bateria"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Millora la durada de la bateria"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vols desconnectar aquesta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconnecta"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versió"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versió <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Oblida la VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vols substituir la VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vols definir la VPN sempre activa?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"De 9:00 a 17:00 entre setmana\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Esdeveniments del calendari"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} està actiu}=2{{mode_1} i {mode_2} estan actius}=3{{mode_1}, {mode_2} i {mode_3} estan actius}other{{mode_1}, {mode_2} i # més estan actius}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode es pot activar automàticament}other{# modes es poden activar automàticament}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{No molestis}=1{{mode_1}}=2{{mode_1} i {mode_2}}other{{mode_1}, {mode_2} i {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVAT"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"No definit"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desactivat"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Entesos"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificacions"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durada"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Missatges, esdeveniments i recordatoris"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Fet"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Configuració"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Notificacions sense so ni elements visuals"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Notificacions sense so"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"No veuràs ni sentiràs notificacions. Estan permeses les trucades dels contactes destacats i les trucades repetides."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(configuració actual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Vols canviar la configuració de notificacions del mode No molestis?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons del perfil de treball"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Utilitza sons del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Utilitza els mateixos sons que el teu perfil personal"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"En desbloquejar, aniràs a la darrera pantalla utilitzada. Les notificacions no es mostraran a la pantalla de bloqueig. Llisca des de dalt per veure-les."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantalla de bloqueig, bloqueig, ometre, saltar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Amb el perfil de treball bloquejat"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalisme en les notificacions de la pantalla de bloqueig"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostra menys notificacions a la pantalla de bloqueig"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostra només notificacions noves a la pantalla de bloqueig"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Suprimeix automàticament de la pantalla de bloqueig les notificacions vistes anteriorment"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificacions a la pantalla de bloqueig"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostra les converses, predeterminades i silencioses"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostra les converses, predeterminades i silencioses"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostra tot el contingut de notificacions de feina"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Amaga el contingut de feina sensible"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Com vols que es mostrin les notificacions del perfil quan el dispositiu estigui bloquejat?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificacions del perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificacions"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificacions d\'aplicacions"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Quan rebis moltes notificacions en poc temps, el dispositiu abaixarà el volum i minimitzarà les alertes durant un màxim de 2 minuts. Les trucades, les alarmes i les converses prioritàries no es veuran afectades. \n\nLes notificacions rebudes durant el període de moderació es podran trobar en lliscar cap avall des de la part superior de la pantalla."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplica als perfils de treball"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplica a les aplicacions del perfil de treball"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificacions agrupades"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activat"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desactivat"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Utilitza les agrupacions de notificacions"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Les notificacions amb temes similars se silenciaran i s\'agruparan per oferir una experiència més tranquil·la. L\'agrupació anul·larà la configuració de notificacions de l\'aplicació."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serveis d\'ajuda per a RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Cap aplicació instal·lada no ha sol·licitat que s\'executi com un servei d\'ajuda per a RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vols permetre que <xliff:g id="SERVICE">%1$s</xliff:g> accedeixi al servei RV?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"converses prioritàries"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Cap"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Cap}=1{1 conversa}other{# converses}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Configuració de les converses"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui pot interrompre"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Encara que les aplicacions de missatgeria o de trucades no et puguin enviar notificacions, les persones que triïs aquí podran contactar amb tu a través d\'aquestes aplicacions"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Trucades"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Configuració dels contactes"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Configuració dels contactes destacats"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Cap"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Cap"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (treball)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"S\'està calculant…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Configuració de les aplicacions"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permet que les aplicacions ignorin el mode No molestis"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplicacions que poden interrompre"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea un mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode personalitzat"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nom del mode"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"El nom del mode no pot ser buit"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Tria una icona"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Esdeveniments del calendari"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Hora de dormir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Mentre condueixes"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificacions de pantalla completa"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permet les notificacions de pantalla completa d\'aquesta aplicació"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permet que aquesta aplicació mostri notificacions que ocupen tota la pantalla quan el dispositiu està bloquejat. Les aplicacions poden utilitzar aquesta opció per destacar alarmes, trucades entrants o altres notificacions urgents."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Escriure les preferències del sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permet que aquesta aplicació modifiqui les preferències del sistema en nom teu"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Aquest permís permet que una aplicació modifiqui les preferències principals del sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplicacions de gestió multimèdia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permet a l\'app gestionar fitxers multimèdia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Si ho permets, aquesta aplicació podrà modificar o suprimir fitxers multimèdia creats amb altres aplicacions sense demanar-te permís. L\'aplicació ha de tenir permís per accedir a fitxers i contingut multimèdia."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Obre la càmera ràpidament"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Per obrir ràpidament la càmera, prem el botó d\'engegada dues vegades. Funciona des de qualsevol pantalla."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Gira la càmera per fer una selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mode de navegació"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Missatges per satèl·lit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envia i rep missatges de text per satèl·lit. S\'inclou amb el teu compte."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envia i rep missatges de text per satèl·lit. No s\'inclou amb el teu compte."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Missatges per satèl·lit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Sobre els missatges per satèl·lit"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Missatges per satèl·lit, connectivitat per satèl·lit"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Sobre <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Pots enviar i rebre missatges de text per satèl·lit com a part d\'un compte de <xliff:g id="CARRIER_NAME">%1$s</xliff:g> apte"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"El teu pla de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Els missatges per satèl·lit s\'inclouen amb el teu compte"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Els missatges s\'inclouen amb el teu compte"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Els missatges per satèl·lit no s\'inclouen amb el teu compte"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Més informació"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Com funciona"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"El telèfon es connectarà automàticament a un satèl·lit. Per obtenir la millor connexió possible, has de ser en una zona en què es vegi bé el cel."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Quan el telèfon es connecti a un satèl·lit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Pots enviar missatges de text a qualsevol persona, inclosos els serveis d\'emergències. El telèfon es tornarà a connectar a una xarxa mòbil quan estigui disponible."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Els missatges per satèl·lit poden tardar més i només estan disponibles en algunes zones. Les condicions meteorològiques i determinades estructures poden afectar la teva connexió per satèl·lit. Les trucades per satèl·lit no estan disponibles. És possible que puguis continuar fent trucades d\'emergència.\n\nÉs possible que els canvis al teu compte tardin una estona a mostrar-se a Configuració. Contacta amb l\'operador per obtenir-ne més informació."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Més informació sobre els missatges per satèl·lit"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Els <xliff:g id="SUBJECT">%1$s</xliff:g> poden tardar més i només estan disponibles en algunes zones. Les condicions meteorològiques i determinades estructures poden afectar la teva connexió per satèl·lit. Les trucades per satèl·lit no estan disponibles. És possible que puguis continuar fent trucades d\'emergència.\n\nÉs possible que els canvis al teu compte tardin una estona a mostrar-se a Configuració. Contacta amb <xliff:g id="CARRIER_NAME">%1$s</xliff:g> per obtenir més informació."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Més informació sobre <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"No es pot activar <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Per activar <xliff:g id="FUNCTION">%1$s</xliff:g>, primer finalitza la connexió per satèl·lit"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Connectivitat per satèl·lit"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Connectivitat per satèl·lit"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"connectivitat per satèl·lit"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"missatges per satèl·lit"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"L\'ús de dades s\'inclou amb el teu compte"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS per satèl·lit"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Envia missatges als serveis d\'emergències quan no puguis connectar-te a una xarxa mòbil o Wi‑Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS per satèl·lit, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Sobre SOS per satèl·lit"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Envia missatges als serveis d\'emergències i comparteix la ubicació quan no puguis connectar-te a una xarxa mòbil o Wi‑Fi És possible que aquest servei no estigui disponible en tot moment ni en totes les ubicacions o circumstàncies."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Truca o envia missatges als serveis d\'emergències"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Respon a preguntes sobre l\'emergència"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Segueix els passos per connectar-te al satèl·lit"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Si no tens una xarxa mòbil, veuràs una opció per utilitzar SOS per satèl·lit"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Envia respostes als serveis d\'emergències per poder ajudar-te de la millor manera possible"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Un cop t\'hagis connectat, podràs enviar missatges als serveis d\'emergències"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Prova una demostració"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Quan connectes amb els serveis d\'emergències per satèl·lit, el teu nom, la teva adreça electrònica, el teu número de telèfon, la teva ubicació, la informació del dispositiu (inclosos l\'IMEI, l\'idioma, el model i el nivell de la bateria) i la informació dels contactes d\'emergència es comparteixen amb els serveis d\'emergències i els proveïdors de serveis per satèl·lit. \n\nPer utilitzar SOS per satèl·lit, l\'aplicació d\'SMS predeterminada ha de ser Missatges de Google. \n\nSi la selecció automàtica de xarxes està desactivada, s\'activarà i el dispositiu es connectarà automàticament a qualsevol xarxa."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Preferències de compartició"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Contactes d\'emergència"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"El teu Compte de Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Revisa o actualitza la informació que es compartirà amb els serveis d\'emergències"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Noms de punts d\'accés"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No està disponible quan està connectat a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Estàs utilitzant l\'opció de 16 kB del mode independent de la pàgina. No es pot garantir la integritat del programari en aquest mode, i les dades que estiguin emmagatzemades al dispositiu mentre el bootloader està desbloquejat poden estar en perill. Com que es desactivaran algunes funcions en aquests modes, és possible que algunes aplicacions no funcionin. Per entrar al mode de producció de nou, has de tornar al mode de 4 kB i, a continuació, bloquejar el bootloader del dispositiu. Aquesta acció tornarà a restablir les dades de fàbrica del dispositiu i en restaurarà la configuració de producció. Quan el dispositiu s\'iniciï a Android correctament, desactiva el desbloqueig OEM a Opcions per a desenvolupadors. Si el dispositiu no es pot iniciar a Android o és inestable, torna a instal·lar-hi les darreres imatges de fàbrica des de &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; o utilitza &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; i selecciona Neteja el dispositiu, Bloqueja el bootloader i Força la instal·lació de totes les particions."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Mode independent de la pàgina de 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Més informació"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Executa l\'aplicació amb el mode de compatibilitat amb la mida de la pàgina"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gestor d\'informes d\'errors"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina quina aplicació gestiona la drecera de l\'informe d\'errors al dispositiu."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Escolta el flux d\'àudio"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Escaneja el codi QR d\'un flux d\'àudio per escoltar-lo amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"No es pot editar la contrasenya durant la compartició. Per canviar la contrasenya, primer desactiva la compartició d\'àudio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"La contrasenya ha de tenir entre 4 i 16 caràcters i només pot contenir lletres, números i símbols"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Escàner de codis QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Necessites ajuda?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Configuració de la cerca"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactes, emmagatzematge, compte"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Emmagatzematge de contactes"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Només dispositiu"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Els contactes nous no se sincronitzaran amb un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Els contactes es desaran al dispositiu i se sincronitzaran amb el teu compte de manera predeterminada"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Hi ha hagut un error en definir el compte predeterminat"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Cap compte predeterminat definit"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Només dispositiu"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositiu i %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Afegeix un compte per començar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"On desar els contactes"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Encercla per cercar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Mantén premut el botó d\'inici o l\'ansa de navegació per cercar utilitzant el contingut de la pantalla."</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 5bfe0082963..84386e3d91e 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Sněhová vločka"</item>
     <item msgid="7952183800501346803">"Plážový slunečník"</item>
     <item msgid="799139025758265891">"Dílenské nástroje"</item>
-    <item msgid="1330084588359129896">"Stan"</item>
+    <item msgid="8112685757657659269">"Klavír"</item>
     <item msgid="3861584909935022342">"Filmový pás"</item>
     <item msgid="5827426100157335512">"Kniha"</item>
     <item msgid="8585828346253128384">"Lotosový květ"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e77a04c32bb..c7d8975dd61 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Spárovat nové zařízení"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Zítra automaticky zapnout"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Pokud Bluetooth vypnete, další den se znovu zapne"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Spárovat pravé ucho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Spárovat levé ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Spárovat druhé ucho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Deaktivovat Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Vypne funkci zvuku přes Bluetooth LE, pokud zařízení podporuje hardwarové zvukové funkce LE."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Režim Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Povolit náhled uživatelského rozhraní vysílání přes Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Umožňuje zobrazit náhled uživatelského rozhraní sdílení LE Audio včetně osobního sdílení zvuku a soukromého vysílání"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Zobrazit přepínač LE Audio v Podrobnostech o zařízení"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Obejít seznam povolených pro Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Ve výchozím nastavení použít LE Audio i v případě, že u periferního zařízení LE Audio nebylo ověřeno splnění kritérií na seznamu povolených."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jazyk aplikace"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Navrhované jazyky"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Všechny jazyky"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Navrženo"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Všechny jazyky"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Všechny oblasti"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Všechny systémy číslování"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Jazyk systému"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Výchozí nastavení systému"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"V Nastavení nelze vybrat jazyk pro tuto aplikaci."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Změnit"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s není k dispozici"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Tento jazyk nelze použít jako jazyk systému, ale dali jste aplikacím a webům vědět, že ho preferujete."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Vyhledávání"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Přidání jazyka"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferovaná oblast"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Zadejte jazyk"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Další jazyková nastavení"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionální preference"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Nastavení předvoleb jednotek a čísel"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Sdělte aplikacím své regionální preference, aby vám mohly přizpůsobit prostředí."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikace vaše regionální preference použijí všude, kde je to možné."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionální preference"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Teplota"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"První den týdne"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Předvolby číslic"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Při roamingu používat datové služby"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Při roamingu používat datové služby"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Mohou vám být účtovány poplatky za roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Nastavovat čas automaticky"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Nastavovat automaticky"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Když je tento přepínač zapnutý, bude se k nastavení časového pásma používat poloha"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatické datum a čas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Nastavit automaticky pomocí sítě a bezdrátových signálů"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatické časové pásmo"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nastavit automaticky podle mobilních sítí v okolí"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Nastavit automaticky podle polohy zařízení (pokud je k dispozici)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používat výchozí nastavení jazyka"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používat 24hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Čas"</string>
@@ -361,7 +376,7 @@
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Odemykejte telefon pomocí obličeje"</string>
     <string name="security_settings_fingerprint" msgid="6387775386189204201">"Otisk prstu"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Otisk prstu"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Při odemykání otiskem prstu"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Použivání funkce Odemknutí otiskem prstu"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Otisk prstu pro práci"</string>
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Přidat otisk prstu"</string>
     <string name="security_settings_fingerprint_preference_summary" msgid="8486134175759676037">"{count,plural, =1{Otisk byl přidán}few{Byly přidány # otisky}many{Bylo přidáno # otisku}other{Bylo přidáno # otisků}}"</string>
@@ -369,7 +384,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Nastavení otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"Povolit odemk. otiskem prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Použití otisku prstu"</string>
-    <string name="security_settings_fingerprint_settings_footer_learn_more" msgid="2508322993726483601">"Další informace o odemknutí otiskem prstu"</string>
+    <string name="security_settings_fingerprint_settings_footer_learn_more" msgid="2508322993726483601">"Další informace o funkci Odemknutí otiskem prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vše máte ve svých rukou"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"Vy a dítě máte vše pod kontrolou"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Upozornění"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Prst opakovaně zvedejte a přikládejte na senzor."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Snímač otisků prstů nelze použít"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Navštivte servis."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Odemknutí otiskem prstu při vypnuté obrazovce"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Používat funkci Odemknutí otiskem prstu, i když je obrazovka vypnutá"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Vypnutá obrazovka, odemknutí"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Další nastavení zabezpečení"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zámek pracovního profilu, šifrování a další"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifrování, přihlašovací údaje a další"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Nastavte vzor pro svůj soukromý prostor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zamykání"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Skrytí"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potvrďte gesto soukromého prostoru"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Znovu zadejte PIN soukromého prostoru"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Znovu zadejte heslo soukromého prostoru"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maximální počet otisků prstů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Přidali jste maximální počet otisků prstů"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Další otisky prstů nelze přidat"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Zapnuto"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Vypnuto"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Externí displej"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Použít externí displej"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rozlišení displeje"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Externí displej je odpojen"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Změna otočení nebo rozlišení může zastavit všechny aktuálně spuštěné aplikace"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Aby bylo možné zrcadlit obrazovku, musí být zařízení připojeno k externímu displeji"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Další možnosti"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Uspořádání displejů můžete změnit přetažením."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Odesílání"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcadlení"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povolit bezdrátové zobrazení"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Zkontrolujte heslo a zkuste to znovu"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontaktujte výrobce zařízení"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Zkontrolujte připojení a zkuste to znovu"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Tato síť Wi-Fi momentálně není dostupná"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Došlo k problému s tímto QR kódem. Zkuste se připojit jinak."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Vybrat síť"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Chcete-li zařízení připojit, vyberte síť"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Přidat toto zařízení do sítě <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Další informace o automatickém otáčení"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rozlišení obrazovky"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Vysoké rozlišení"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Plné rozlišení"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Plné rozlišení využívá baterii intenzivněji. Po přepnutí rozlišení se některé aplikace mohou restartovat."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Vybráno"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barvy"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Přirozené"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptivní"</string>
     <string name="brightness" msgid="6216871641021779698">"Úroveň jasu"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptivní jas"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Informace o adaptivním jasu"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Jas obrazovky se automaticky přizpůsobí okolí a činnostem. Ručním posunutím posuvníku informujete funkci adaptivního jasu o svých preferencích."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Zapnuto"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Vypnuto"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Nastavení režimu nočního klidu"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Režimy mohou také aktivovat tmavý motiv}=1{Režim {mode_1} také aktivuje tmavý motiv}=2{Režimy {mode_1} a {mode_2} také aktivují tmavý motiv}=3{Režimy {mode_1}, {mode_2} a {mode_3} také aktivují tmavý motiv}few{Režimy {mode_1}, {mode_2} a # další také aktivují tmavý motiv}many{Režimy {mode_1}, {mode_2} a # dalšího také aktivují tmavý motiv}other{Režimy {mode_1}, {mode_2} a # dalších také aktivují tmavý motiv}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Nastavení režimů"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ještě tmavší"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Velmi tmavé"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Povolit větší ztmavení zařízení než obvykle"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Interval vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povolte aplikacím a službám vyhledávat zařízení v okolí, 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="location_services_preference_title" msgid="604317859531782159">"Služby určování polohy"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Služby určování polohy"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Používat polohu"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Použít polohu k určení časového pásma"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Časové pásmo nelze nastavit automaticky"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Poloha nebo služby určování polohy jsou vypnuté"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Nastavení polohy"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Opravit problém"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Zrušit"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatické časové pásmo je vypnuté"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Není k dispozici, když je vypnuté automatické časové pásmo"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Časové pásmo se může nastavit podle polohy"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Pokud je k dispozici poloha vašeho zařízení, může být použita k nastavení časového pásma"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Zobrazí právní informace, stav a verzi softwaru"</string>
     <string name="legal_information" msgid="7509900979811934843">"Právní informace"</string>
     <string name="manual" msgid="3651593989906084868">"Příručka"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Možnosti"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Přístupnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fyzická klávesnice"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Ignorovat opakovaná stisknutí"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klávesnice ignoruje opakovaná stisknutí jedné klávesy do <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klávesnice ignoruje opakovaná stisknutí jedné klávesy"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limit opakovaného stisknutí"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Vyberte dobu, po kterou bude klávesnice ignorovat opakované stisknutí klávesy"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Vlastní"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"vlastní hodnota"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Zpomalení kláves"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Upraví čas aktivace po stisknutí klávesy na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Upraví čas aktivace po stisknutí klávesy"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Jedním prstem"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Místo držení více kláves aktivujte zkratky postupným tisknutím jednotlivých kláves"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Klávesy pro myš"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Ovládání myši pomocí fyzické klávesnice"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Používat klávesy myši"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ukazatel můžete ovládat pomocí klávesnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Opačné posouvání myší"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Při posunutí nahoru posunout stránku dolů"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Prohodit levé a pravé tlačítko"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Používat levé tlačítko myši jako pravé"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Klávesy myši na klávesnici <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"K přesunutí ukazatele myši používat klávesy <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Ke kliknutí primárním tlačítkem myši používat klávesu <xliff:g id="CLICK_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"K podržení primárního tlačítka myši používat klávesu <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"K uvolnění primárního tlačítka myši používat klávesu <xliff:g id="RELEASE_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"K přepnutí režimu posouvání používat klávesu <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. Klávesy <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> tak budou sloužit k posunutí zobrazení nahoru, dolů, doleva nebo doprava"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Ke kliknutí sekundárním tlačítkem myši používat klávesu <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klávesové zkratky"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Zobrazit seznam zkratek"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klávesnice a nástroje v pracovním profilu"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Výchozí"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad a myš"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Myš"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Rychlost kurzoru, gesta"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Kliknutí klepnutím"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Přesunutí klepnutím a tažením"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kliknutí pravým tlačítkem dole"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliknutím na pravý dolní roh touchpadu zobrazíte další možnosti"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Rychlost kurzoru"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Klepnutí třemi prsty"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Barva ukazatele"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Změnit vyplnění ukazatele na černé"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Změnit vyplnění ukazatele na zelené"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Naučte se gesta touchpadu"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, myš, kurzor, posouvání, přejetí, kliknutí pravým tlačítkem, kliknutí, ukazatel"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kliknutí pravým tlačítkem, klepnutí"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Kliknutí prostředním tlačítkem"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Asistent spuštění"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Přejít na domovskou stránku"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Zpět"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Zobrazit nedávné aplikace"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Přejít na domovskou stránku"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Přejeďte třemi prsty nahoru kdekoli na touchpadu"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Zpět"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte novou klávesu pro <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Přístupnost na fyzické klávesnici"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Funkce Jedním prstem, klávesy pro opuštění, klávesy pro myš"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Opakovat klávesy"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Prodleva před opakováním"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Rychlost opakování"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Při podržení klávesy se bude znak opakovaně zadávat, dokud klávesu neuvolníte"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Rozvržení <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Výchozí"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatické: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Náhled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardní možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jazyk"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Velikost písma"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Velikost titulků"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Styl titulků"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Vlastní možnosti"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Barva pozadí"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Zahrnuté balíčky"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikace běží normálně"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Doporučujeme výměnu baterie"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapacita a výkon baterie při nabíjení jsou snížené. Doporučujeme výměnu baterie."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Baterie je slabá"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Pokud chcete prodloužit výdrž baterie, zapněte Spořič baterie"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Prodloužení životnosti baterie"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odpojit tuto síť VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odpojit"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verze"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verze <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zapomenout VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Nahradit stávající síť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nastavit trvalou síť VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„9:00–17:00, pracovní dny“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Události v kalendáři"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Režim {mode_1} je aktivní}=2{Režimy {mode_1} a {mode_2} jsou aktivní}=3{Režimy {mode_1}, {mode_2} a {mode_3} jsou aktivní}few{Režimy {mode_1}, {mode_2} a # další jsou aktivní}many{Režimy {mode_1}, {mode_2} a # dalšího jsou aktivní}other{Režimy {mode_1}, {mode_2} a # dalších je aktivních}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 režim se může zapnout automaticky}few{# režimy se mohou zapnout automaticky}many{# režimu se může zapnout automaticky}other{# režimů se může zapnout automaticky}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Nerušit}=1{{mode_1}}=2{{mode_1}, {mode_2}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ZAPNUTO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nenastaveno"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Vypnuto"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Rozumím"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Oznámení"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trvání"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Zprávy, události a připomenutí"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Hotovo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Nastavení"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Oznámení bez zobrazení i zvuku"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Oznámení bez zvuku"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Oznámení nebudou vidět ani slyšet. Hovory od kontaktů s hvězdičkou a lidí, co volají opakovaně, jsou povoleny."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktuální nastavení)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Chcete změnit nastavení oznámeni režimu Nerušit?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvuky pracovního profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Používat zvuky osobního profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Používat stejné zvuky jako v osobním profilu"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Po odemknutí přejdete přímo na naposledy používanou obrazovku. Oznámení se na obrazovce uzamčení nebudou zobrazovat. Zobrazíte je přejetím prstem dolů."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Obrazovka uzamčení, přeskočení, obejití"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Když je pracovní profil uzamčen"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalizovat počet oznámení na obrazovce uzamčení"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Zobrazovat na obrazovce uzamčení méně oznámení"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Na obrazovce uzamčení zobrazovat pouze nová oznámení"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Z obrazovky uzamčení automaticky odstraňovat dříve zobrazená oznámení"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Oznámení na obrazovce uzamčení"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Zobrazovat konverzace a výchozí i tichá oznámení"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Zobrazovat konverzace a výchozí i tichá oznámení"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Zobrazí se veškerý obsah pracovních oznámení"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Skrýt citlivý pracovní obsah"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Jak chcete zobrazovat profilová oznámení, když bude zařízení uzamčeno?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilová oznámení"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Oznámení"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Oznámení z aplikací"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Když během krátké doby obdržíte mnoho oznámení, zařízení až na dvě minuty sníží hlasitost a minimalizuje upozornění. Hovorů, budíků a prioritních konverzací se to nedotkne. \n\nOznámení přijatá během zeslabení zobrazíte přejetím prstem dolů z horního okraje obrazovky."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplikovat u pracovních profilů"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Používat u aplikací v pracovním profilu"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Seskupená oznámení"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Zapnuto"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Vypnuto"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Seskupovat oznámení"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Oznámení s podobnými tématy se ztlumí a seskupí dohromady, aby se snížilo rušení. Seskupování přepíše nastavení oznámení v aplikaci."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žádné nainstalované aplikace nepožádaly o spuštění jako pomocná služba VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Povolit službě <xliff:g id="SERVICE">%1$s</xliff:g> přístup ke službě virtuální reality?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritní konverzace"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Žá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_from_conversations_settings" msgid="2411930666794576607">"Nastavení konverzací"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo smí vyrušovat"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"U lidí, které zde vyberte, vás příslušné aplikace pořád můžou upozornit na příchozí hovor nebo zprávu."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Volání"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Nastavení kontaktů"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Nastavení kontaktů označených hvězdičkou"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nikdo"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nikdo"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Budíky"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Vyrušovat nemůžou žá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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (pracovní)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Výpočet…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Nastavení aplikací"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Povolit přepisování aplikací"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikace, které smí vyrušovat"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Vytvoření režimu"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Vlastní režim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Název režimu"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Název režimu nemůže být prázdný"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Vyberte ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Události v kalendáři"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Sled činností Noční klid"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Při řízení"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Oznámení na celou obrazovku"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Povolit oznámení z této aplikace na celou obrazovku"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Aplikaci můžete povolit zobrazovat oznámení přes celou obrazovku, když bude zařízení zamknuté. Aplikace tak mohou zvýraznit budíky, příchozí hovory a další důležitá oznámení."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Zápis systémových preferencí"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Umožnit aplikaci měnit systémové preference vaším jménem"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Toto oprávnění umožňuje aplikaci měnit klíčové systémové preference."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikace pro správu médií"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Povolit aplikaci spravovat média"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Když tuto možnost povolíte, aplikace bude moci bez zeptání upravovat a mazat mediální soubory vytvořené v jiných aplikacích. Aplikace musí mít oprávnění pro přístup k souborům a médiím."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gesta"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Rychle otevřít fotoaparát"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Pokud chcete rychle spustit fotoaparát, stiskněte dvakrát vypínač. Funguje to na všech obrazovkách."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Přepnout fotoaparát na selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Režim navigace"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelitní zprávy"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Odesílání a přijímání textových zpráv přes satelit. Je součástí vašeho účtu."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Odesílání a příjem textových zpráv přes satelit. Ve vašem účtu není zahrnuto."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelitní zprávy"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Informace o satelitních zprávách"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Můžete odesílat a přijímat textové zprávy přes satelit v rámci způsobilého účtu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Váš tarif <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelitní zprávy jsou součástí vašeho účtu"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelitní zprávy nejsou součástí vašeho účtu"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Další informace"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Jak to funguje"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Váš telefon se automaticky připojí k satelitu. Nejlepšího připojení dosáhnete na otevřeném prostranství."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Jakmile se telefon připojí k satelitu"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Můžete posílat textové zprávy komukoli, včetně tísňových linek. Telefon se opět připojí k mobilní síti, až bude k dispozici."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Odesílání satelitních zpráv může trvat déle a je dostupné pouze v některých oblastech. Na satelitní připojení může mít vliv počasí i některé stavby. Volání přes satelit není dostupné. Tísňová volání se můžou spojit.\n\nMůže chvíli trvat, než se změny účtu projeví v Nastavení. Na podrobnosti se zeptejte mobilního operátora."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Další informace o satelitních zprávách"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> nelze zapnout"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Pokud chcete zapnout <xliff:g id="FUNCTION">%1$s</xliff:g>, nejdřív ukončete satelitní připojení"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Připojení přes satelit"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Názvy přístupových bodů"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Aktuálně používáte 16KB verzi stránkově agnostického režimu. V tomto režimu nelze zaručit integritu softwaru a veškerá data uložená v telefonu při odemknutém bootloaderu mohou být ohrožena. Některé funkce budou v těchto režimech zakázány, takže některé aplikace nemusí fungovat. Pokud chcete znovu aktivovat produkční režim, musíte přepnout zpět na 4KB režim a poté uzamknout bootloader zařízení. Tím zařízení znovu resetujete do továrního nastavení zařízení a obnovíte v něm produkční nastavení. Až se systém Android v zařízení úspěšně spustí, vypněte v sekci Pro vývojáře možnost Odemknutí OEM. Pokud se systém Android v zařízení nespustí nebo nebude stabilní, flashujte zařízení na nejnovější tovární obrazy ze stránky &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers .google.com/android/images&lt;/a&gt; nebo použijte nástroj &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; a vyberte Wipe Device (Vymazat zařízení), Lock Bootloader (Zamknout bootloader) a Force Flash all partitions (Flashovat všechny oddíly)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB stránkově agnostický režim"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Další informace"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Spustit aplikaci v režimu kompatibility s velikostí stránky"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Nástroj pro zprávy o chybách"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Určuje, která aplikace na vašem zařízení zpracovává zkratku k odeslání zprávy o chybě."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Osobní"</string>
@@ -5163,7 +5315,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB v aktuální lokalitě není k dispozici"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Použít síť Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread pomáhá propojit zařízení pro chytrou domácnost a zvyšuje přitom efektivitu i výkon.\n\nKdyž je tato možnost povolená, toto zařízení se může připojit k síti Thread, což umožní ovládat prostřednictvím tohoto telefonu zařízení podporující standard Matter."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread pomáhá propojit zařízení pro chytrou domácnost a zvyšuje přitom její efektivitu i výkon.\n\nKdyž je tato možnost zapnutá, toto zařízení se může připojit k síti Thread. To vám umožní ovládat podporovaná zařízení Matter tímto telefonem."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Další informace o síti Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Přístup k fotoaparátu"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Přístup k mikrofonu"</string>
@@ -5435,7 +5587,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Poslouchat stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Naskenujte QR kód zvukového streamu a poslouchejte na zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Heslo nelze upravit během sdílení. Pokud chcete změnit heslo, nejdříve vypněte sdílení zvuku."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Heslo musí mít 4–16 znaků a může obsahovat jen písmena, číslice a symboly"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Čtečka QR kódů"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Potřebujete poradit?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Vyhledat v nastavení"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakty, úložiště, účet"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Úložiště kontaktů"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Pouze zařízení"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nové kontakty se nebudou synchronizovat s účtem"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty se ve výchozím nastavení uloží do zařízení a synchronizují s účtem"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Při nastavování výchozího účtu došlo k chybě"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Žádné výchozí nastavení"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Pouze zařízení"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Zařízení a %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začněte tím, že přidáte účet"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam uložit kontakty"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zakroužkuj a hledej"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Pokud chcete vyhledávat pomocí obsahu na obrazovce, podržte tlačítko plochy nebo navigační úchyt."</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 1ff620f694e..20c4aba32ec 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snefnug"</item>
     <item msgid="7952183800501346803">"Parasol"</item>
     <item msgid="799139025758265891">"Værktøj"</item>
-    <item msgid="1330084588359129896">"Telt"</item>
+    <item msgid="8112685757657659269">"Klaver"</item>
     <item msgid="3861584909935022342">"Filmspole"</item>
     <item msgid="5827426100157335512">"Bog"</item>
     <item msgid="8585828346253128384">"Lotusblomst"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1dd1ccf8aa3..cce77bdc6f8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Par en ny enhed"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivér automatisk i morgen"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Hvis du deaktiverer Bluetooth, aktiveres det igen næste dag"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Par højre øre"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Par venstre øre"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Par det andet høreapparat"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Deaktiver Bluetooth LE-lyd"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Deaktiverer funktionen Bluetooth LE-lyd, hvis enheden understøtter denne LE-lyd til hardware."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Tilstanden Bluetooth LE-lyd"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Aktivér preview af brugerfladen for broadcast af Bluetooth LE-lyd"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Aktiverer preview af brugerfladen for LE-lyddeling, herunder personlig lyddeling og privat broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Vis kontakten til LE-lyd i Enhedsoplysninger"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omgå tilladelsesliste for Bluetooth LE-lyd"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Brug LE-lyd som standard, selvom det ikke er verificeret, at den eksterne LE-lydenhed opfylder kriterierne for tilladelseslisten."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Appsprog"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Foreslåede sprog"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alle sprog"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Forslag"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alle sprog"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alle regioner"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alle nummersystemer"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Systemsprog"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Systemstandard"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Sprogvalg for denne app er ikke tilgængeligt i Indstillinger."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Rediger"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s er ikke tilgængeligt"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Dette sprog kan ikke bruges som et systemsprog, men du har oplyst apps og websites om, at du foretrækker dette sprog."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Søg"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Tilføj et sprog"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regionpræferencer"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Angiv sprog"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Flere sprogindstillinger"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionsindstillinger"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Angiv præferencer for måleenheder og numre"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Giv apps besked om dine regionsindstillinger, så de kan foretage personlig tilpasning af din brugeroplevelse."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps anvender dine regionsindstillinger, når det er muligt."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionsindstillinger"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Ugens første dag"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Præferencer for tal"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Opret forbindelse til datatjenester ved roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Opret forbindelse til datatjenester ved roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Du skal muligvis betale roaminggebyrer."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Indstil klokkeslættet automatisk"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Indstil automatisk"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokationen anvendes til indstilling af tidszonen, når denne kontakt er slået til"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatisk dato og klokkeslæt"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Indstil automatisk ved hjælp af dit netværk og trådløse signaler"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidszone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Indstil automatisk baseret på mobilnetværk i nærheden af dig"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Angiv automatisk ved hjælp af din enhedslokation, hvis det er muligt"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Brug landestandard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Brug 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Klokkeslæt"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Løft fingeren, og tryk på sensoren igen"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Fingeraftrykssensoren kan ikke bruges"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Få den repareret."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Fingeroplåsning ved slukket skærm"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Brug fingeroplåsning, selv når skærmen er slukket"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Oplåsning ved slukket skærm"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Flere sikkerhedsindstillinger"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Lås til arbejdsprofil, kryptering og mere"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Kryptering, loginoplysninger og mere"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Angiv et mønster til dit private område"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lås"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Skjul"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Bekræft mønsteret til dit private område"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Angiv pinkoden til dit private område igen"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Angiv adgangskoden til dit private område igen"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> fingeraftryk"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har tilføjet det maksimale antal fingeraftryk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Du kan ikke tilføje flere fingeraftryk"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Til"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Fra"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ekstern skærm"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Indbygget skærm"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Brug ekstern skærm"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Skærmopløsning"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Forbindelse til ekstern skærm afbrudt"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Hvis skærmretningen eller opløsningen ændres, kan du risikere, at aktive apps stopper"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Din enhed skal have forbindelse til en ekstern skærm for at spejle skærmen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Flere valgmuligheder"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold og træk for at omarrangere skærmene."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spejl"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivér trådløs skærm"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Tjek adgangskoden, og prøv igen"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakt producenten af enheden"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Tjek forbindelsen, og prøv igen"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Dette Wi‑Fi-netværk er ikke tilgængeligt lige nu"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Der er et problem med denne QR-kode. Prøv at oprette forbindelse på en anden måde."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Vælg netværk"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Vælg et netværk for at oprette forbindelse til din enhed"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Vil du føje denne enhed til \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Få flere oplysninger om automatisk rotering"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Skærmopløsning"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Høj opløsning"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Fuld opløsning"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Fuld opløsning bruger mere batteri. Nogle apps genstarter muligvis, hvis du skifter opløsning."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimal opløsning"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimal opløsning bruger mere batteri. Nogle apps genstarter muligvis, hvis du skifter opløsning."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Valgt"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farver"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlige"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptiv"</string>
     <string name="brightness" msgid="6216871641021779698">"Lysstyrke"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptiv lysstyrke"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Om adaptiv lysstyrke"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe automatisk lysstyrke med at lære dine præferencer."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Til"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Fra"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Indstillinger for sengetid"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Tilstande kan også aktivere mørkt tema}=1{{mode_1} aktiverer også mørkt tema}=2{{mode_1} og {mode_2} aktiverer også mørkt tema}=3{{mode_1}, {mode_2} og {mode_3} aktiverer også mørkt tema}one{{mode_1}, {mode_2} og # anden aktiverer også mørkt tema}other{{mode_1}, {mode_2} og # andre aktiverer også mørkt tema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Indstillinger for tilstande"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Nedton yderligere"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ekstra dæmpet belysning"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Tillad, at enheden nedtones mere end normalt"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Timeout for skærmen"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1623,7 +1647,7 @@
     <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 lokationsbaserede funktioner og tjenester."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Lokationstjenester"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Lokationstjenester"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Anvend lokation"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Brug lokation til tidszone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Tidszonen kan ikke angives automatisk"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokation eller Lokationstjenester er deaktiveret"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Lokationsindstillinger"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Løs dette problem"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Luk"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidszone er deaktiveret"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ikke tilgængelig, når automatisk tidszone er deaktiveret"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Registrering af tidszone ved hjælp af lokation er deaktiveret"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Registrering af tidszone ved hjælp af lokation understøttes ikke"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ændringer i forbindelse med registrering af tidszone ved hjælp af lokation er ikke tilladt"</string>
-    <string name="location_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokation kan anvendes til at angive tidszonen"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Hvis din enhedslokation er tilgængelig, kan den bruges til at indstille din tidszone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Se juridisk info, status, softwareversion"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juridiske oplysninger"</string>
     <string name="manual" msgid="3651593989906084868">"Brugervejledning"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Valgmuligheder"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Hjælpefunktioner"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysisk tastatur"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Elastiktaster"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastaturet ignorerer gentagende, hurtige tryk på den samme tast inden for <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastaturet ignorerer gentagende, hurtige tryk på den samme tast"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grænse for elastiktaster"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Vælg, hvor lang tid dit tastatur skal ignorere gentagne tastetryk"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sekunder"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sekunder"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sekunder"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Tilpasset"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"tilpasset værdi"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Langsomtaster"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Juster tiden det tager, inden et tryk på en tast aktiveres, til <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Justerer den tid, det tager, før et tastetryk aktiveres"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Træge taster"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tryk på én tast ad gangen for at bruge genveje i stedet for at holde flere taster nede på samme tid"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Musetaster"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Brug det fysiske tastatur til at styre musen"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Brug musetaster"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Brug dit tastatur til at styre markøren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvendt rulning på mus"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rul opad for at gå ned på siden"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Byt om på knapperne (venstre og højre)"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Brug venstre museknap som højre"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Musetaster på <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Brug tasterne <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> til at flytte musemarkøren"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Brug <xliff:g id="CLICK_LABEL">%s</xliff:g>-tasten til at klikke med den primære museknap"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Brug <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>-tasten til at holde den primære museknap nede"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Brug <xliff:g id="RELEASE_LABEL">%s</xliff:g>-tasten til at slippe den primære museknap"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Brug <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>-tasten til at skifte tilstand for rulning. Dette får tasterne <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> til at rulle visningerne op, ned, til venstre eller til højre"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Brug <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>-tasten til at klikke med den sekundære museknap"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tastaturgenveje"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Vis liste over genveje"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatur og værktøjer for arbejdsprofil"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Standard"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchplade"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchplade og mus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Markørens hastighed, bevægelser"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tryk for at klikke"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tryk og træk"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik nederst til højre"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klik nederst til højre på touchpladen for flere valgmuligheder"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Markørens hastighed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Tryk med tre fingre"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Markørfarve"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Skift udfyldningsstil for markør til sort"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Skift udfyldningsstil for markør til grøn"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Se bevægelser på touchpladen"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"touchplade, touch plade, mus, markør, rul, stryg, højreklik, klik, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"højreklik, tryk"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Midterklik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Åbn Assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Gå til startsiden"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Gå tilbage"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Se seneste apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Gå til startskærmen"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Stryg opad med tre fingre et vilkårligt sted på touchpladen"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Gå tilbage"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vælg en ny ændringstast til <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Hjælpefunktioner til fysisk tastatur"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Træge taster, elastiktaster, musetaster"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Gentagelsestaster"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Forsinkelse før gentagelse"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Gentagelsesfrekvens"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold fingeren på en tast for at gentage dens tegn, indtil du slipper tasten"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatisk: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forhåndsvisning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardindstillinger"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Sprog"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tekststørrelse"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Underteksternes størrelse"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Underteksttype"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tilpassede valgmuligheder"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Baggrundsfarve"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbrug"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Inkluderede pakker"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps kører normalt"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Udskiftning af batteri anbefales"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batterikapaciteten og opladningseffektiviteten er reduceret, og det anbefales, at du udskifter batteriet."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Lavt batteriniveau"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Aktivér Batterisparefunktion for at forlænge batteritiden"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Forlæng batteritid"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vil du afbryde dette VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Afbryd forbindelse"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Glem VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Erstat det eksisterende VPN-netværk?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vil du konfigurere konstant VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Kl. 9-17 på hverdage\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalenderbegivenheder"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} er aktiveret}=2{{mode_1} og {mode_2} er aktiveret}=3{{mode_1}, {mode_2} og {mode_3} er aktiveret}one{{mode_1}, {mode_2} og # anden er aktiveret}other{{mode_1}, {mode_2} og # andre er aktiveret}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 tilstand kan aktiveres automatisk}one{# tilstand kan aktiveres automatisk}other{# tilstande kan aktiveres automatisk}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Forstyr ikke}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"TIL"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ikke konfigureret"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Deaktiveret"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifikationer"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Varighed"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Beskeder, begivenheder og påmindelser"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontakter kan få fat i dig."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Udfør"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Indstillinger"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ingen lyd eller visuelle signaler fra notifikationer"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ingen lyd fra notifikationer"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Notifikationer kan ikke ses eller høres. Opkald fra stjernemarkerede kontakter og gentagne opkald er tilladt."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(aktuel indstilling)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Vil du ændre notifikationsindstillingerne for Forstyr ikke?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Lyde for arbejdsprofil"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Brug lyde fra din personlige profil"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Brug de samme lyde som på din personlige profil"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Gå direkte til den seneste skærm efter oplåsning. Notifikationer vises ikke på låseskærmen. Stryg nedad fra toppen for at se dem."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskærm, lås skærm, spring over, tilsidesæt"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Når arbejdsprofilen er låst"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalt antal af notifikationer på låseskærmen"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Vis færre notifikationer på låseskærmen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Vis kun nye notifikationer på låseskærmen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Fjern automatisk tidligere sete notifikationer fra låseskærmen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifikationer på låseskærmen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Vis samtaler, standard og lydløs"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Vis samtaler, standard og lydløs"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Vis alt indhold i arbejdsnotifikationer"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Skjul følsomt arbejdsindhold"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hvordan skal profilunderretninger vises, når din enhed er låst?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilunderretninger"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifikationer"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Appnotifikationer"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Hvis du får mange notifikationer inden for kort tid, skruer enheden ned for lydstyrken og minimerer underretninger på skærmen i op til 2 minutter. Opkald, alarmer og prioriterede samtaler påvirkes ikke. \n\nDu kan se de notifikationer, du modtager i denne periode, ved at trække nedad fra toppen af skærmen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Anvend på arbejdsprofiler"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Anvend på apps på arbejdsprofilen"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupperede notifikationer"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Til"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Fra"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Brug notifikationsgruppering"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifikationer med lignende emner gøres lydløse og grupperes for at give en roligere brugeroplevelse. Grupperingen tilsidesætter en apps egne notifikationsindstillinger."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-hjælpetjenester"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen installerede apps har anmodet om at blive kørt som VR-hjælpetjenester."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillade, at <xliff:g id="SERVICE">%1$s</xliff:g> får adgang til VR-tjenesten?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriterede samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Samtaleindstillinger"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan forstyrre?"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Selv hvis besked- og opkaldsapps ikke kan underrette dig, kan de personer, du vælger her, stadig kontakte dig via de pågældende apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Opkald"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktindstillinger"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Indstillinger for stjernemarkerede kontakter"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ingen"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmer"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Ingen apps 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}one{{app_1}, {app_2} og # mere kan forstyrre}other{{app_1}, {app_2} og # andre kan forstyrre}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (arbejde)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Beregner…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Appindstillinger"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillad, at apps tilsidesætter"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps, der kan forstyrre"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Opret en tilstand"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Tilpasset tilstand"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Navn på tilstand"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Navnet på tilstanden skal angives"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Vælg et ikon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalenderbegivenheder"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutinen Sengetid"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Under kørsel"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notifikationer i fuld skærm"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Tillad notifikationer i fuld skærm fra denne app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Tillad appen at vise notifikationer, der fylder hele skærmen, når enheden er låst. Apps kan benytte denne mulighed til at fremhæve alarmer, indgående opkald og andre presserende notifikationer."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Skriv systempræferencer"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Tillad, at denne app ændrer systemindstillinger på dine vegne"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Denne tilladelse giver en app tilladelse til at ændre de grundlæggende systempræferencer."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps til administration af medier"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Tillad, at appen administrerer medier"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Hvis du tillader dette, kan denne app redigere og slette mediefiler, der er oprettet med andre apps, uden at spørge dig. Appen skal have adgangstilladelse til filer og medier."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Bevægelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Åbn hurtigt kameraet"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Denne genvej fungerer fra enhver skærm."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Vend kameraet for at tage en selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigationstilstand"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellitbeskeder"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send og modtag beskeder via satellit. Inkluderet på din konto."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send og modtag beskeder via satellit. Ikke tilgængeligt på din konto."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellitbeskeder"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Om satellitbeskeder"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satellitbeskeder, satellitforbindelse"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Om <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Du kan sende og modtage beskeder via satellit som en del af en kvalificeret <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-konto"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Dit <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-abonnement"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Din konto omfatter satellitbeskeder"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Muligheden for at sende beskeder er inkluderet på din konto"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Din konto omfatter ikke satellitbeskeder"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Få flere oplysninger"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Sådan fungerer det"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Din telefon opretter automatisk forbindelse til en satellit. Du opnår den bedst mulige forbindelse, hvis du står udenfor med frit udsyn til himlen."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Når din telefon har oprettet forbindelse til en satellit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Du kan sende en besked til alle, herunder nødtjenester. Din telefon opretter forbindelse til et mobilnetværk igen, når det er tilgængeligt."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellitbeskeder kan tage længere tid og er kun tilgængelige i nogle regioner. Vejret og visse fysiske betingelser kan påvirke din satellitforbindelse. Opkald via satellit er ikke muligt. Nødopkald kan muligvis stadig gå igennem.\n\nDer kan gå lidt tid, før kontoændringerne vises i Indstillinger. Kontakt dit mobilselskab for at få flere oplysninger."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Flere oplysninger om satellitbeskeder"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> kan tage længere tid og er kun tilgængelig i nogle områder. Vejret og visse fysiske betingelser kan påvirke din satellitforbindelse. Opkald via satellit er ikke muligt. Nødopkald kan muligvis stadig gå igennem.\n\nDer kan gå lidt tid, før kontoændringerne vises i Indstillinger. Kontakt <xliff:g id="CARRIER_NAME">%1$s</xliff:g> for at få flere oplysninger."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Mere om <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> kan ikke aktiveres"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Hvis du vil aktivere <xliff:g id="FUNCTION">%1$s</xliff:g>, skal du først afslutte satellitforbindelsen"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellitforbindelse"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satellitforbindelse"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satellitforbindelse"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satellitbeskeder"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Brug af data er inkluderet på din konto"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS-meldinger via satellit"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Send beskeder til nødtjenester, når du ikke kan oprette forbindelse til et mobil- eller Wi-Fi-netværk"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS-meldinger via satellit, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Om SOS-meldinger via satellit"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Du kan sende beskeder til nødtjenester og dele din lokation, når du ikke kan oprette forbindelse til et mobil- eller Wi-Fi-netværk. Funktionen er muligvis ikke tilgængelig på alle tidspunkter, på alle lokationer og i alle situationer."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Ring eller send en besked til nødtjenester"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Svar på spørgsmål om nødsituationen"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Følg anvisningerne for at oprette forbindelse til satellitten"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Hvis du ikke har et mobilnetværk, vil du se en valgmulighed for SOS-meldinger via satellit"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Send svar til nødtjenester, så du kan få den rette hjælp"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Når du har oprettet forbindelse, kan du sende en besked til nødtjenesterne"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Prøv en demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Når du kontakter nødtjenester via satellit, deles dit navn, din mailadresse, dit telefonnummer, din lokation, dine enhedsoplysninger (IMEI, sprog, model, batteriniveau) og nødkontaktoplysninger med nødtjenester og udbydere af satellittjenester. \n\nHvis du vil bruge SOS-meldinger via satellit, skal Google Beskeder være din standardapp til sms. \n\nHvis automatisk netværksvalg er deaktiveret, aktiveres det, og din enhed opretter automatisk forbindelse til ethvert netværk."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Deling af præferencer"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Nødkontakter"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Din Google-konto"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Gennemgå eller opdater de oplysninger, der skal deles med nødtjenester"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Adgangspunkter"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Du er i den sideagnostiske tilstand med 16 kB. Softwareintegriteten kan ikke garanteres i denne tilstand, og eventuelle data, der gemmes på telefonen, mens bootloaderen er ulåst, kan være sårbare. Nogle funktioner deaktiveres i disse tilstande, så nogle apps fungerer muligvis ikke. Hvis du vil vende tilbage til produktionstilstand, skal du skifte tilbage til tilstanden med 4 kB og derefter låse bootloaderen på enheden. Denne handling gendanner enhedens fabriksindstillinger til produktionsindstillingerne. Når enheden er startet i Android, skal du deaktivere OEM-oplåsning via Indstillinger for udviklere. Hvis enheden ikke kan starte i Android, eller hvis den er ustabil, skal du flashe enheden igen med de oprindelige systembilleder fra &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; eller bruge &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; og vælge \"Ryd enhed\", \"Lås bootloader\" og \"Gennemtving flash af alle partitioner\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Den sideagnostiske tilstanden med 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Læs mere"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Kør appen i kompatibilitetstilstand for sidestørrelse"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Håndtering af fejlrapport"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Afgør, hvilken app der håndterer genvejen til fejlrapporten på din enhed."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personlig"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Lyt til stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan en QR-kode til en lydstream for at lytte via <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Adgangskoden kan ikke ændres under deling. Deaktiver lyddeling for at ændre adgangskoden."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Din adgangskode skal indeholde 4-16 tegn og må kun bestå af bogstaver, tal og symboler"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kodescanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Har du brug for hjælp?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Søg i Indstillinger"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakter, lagerplads, konto"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Lagerplads for kontakter"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Kun via GPS"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nye kontakter synkroniseres ikke med en konto"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter gemmes på din enhed og synkroniseres med din konto som standard"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Der opstod en fejl under konfigurationen af standardkontoen"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Der er ikke angivet nogen standardkonto"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Kun via GPS"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Enhed og %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tilføj en konto for at komme godt i gang"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvor kontakter skal gemmes"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Hold fingeren på knappen Hjem eller navigationshåndtaget for at søge ved hjælp af indholdet på skærmen."</string>
 </resources>
diff --git a/res/values-de-feminine/strings.xml b/res/values-de-feminine/strings.xml
new file mode 100644
index 00000000000..852ff45a90d
--- /dev/null
+++ b/res/values-de-feminine/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Nur noch # Schritt und du bist Entwicklerin.}other{Nur noch # Schritte und du bist Entwicklerin.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Du bist jetzt Entwicklerin!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Okay, du bist bereits Entwicklerin."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Eigentümerin"</string>
+</resources>
diff --git a/res/values-de-masculine/strings.xml b/res/values-de-masculine/strings.xml
new file mode 100644
index 00000000000..e7e351d94f2
--- /dev/null
+++ b/res/values-de-masculine/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Nur noch # Schritt und du bist Entwickler.}other{Nur noch # Schritte und du bist Entwickler.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Du bist jetzt Entwickler!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Okay, du bist bereits Entwickler."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Eigentümer"</string>
+</resources>
diff --git a/res/values-de-neuter/strings.xml b/res/values-de-neuter/strings.xml
new file mode 100644
index 00000000000..e7e351d94f2
--- /dev/null
+++ b/res/values-de-neuter/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Nur noch # Schritt und du bist Entwickler.}other{Nur noch # Schritte und du bist Entwickler.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Du bist jetzt Entwickler!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Okay, du bist bereits Entwickler."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Eigentümer"</string>
+</resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index fd23c5bdbfc..bb3241d6dc9 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Schneeflocke"</item>
     <item msgid="7952183800501346803">"Sonnenschirm"</item>
     <item msgid="799139025758265891">"Workshop-Tools"</item>
-    <item msgid="1330084588359129896">"Zelt"</item>
+    <item msgid="8112685757657659269">"Klavier"</item>
     <item msgid="3861584909935022342">"70er-Jahre-Film"</item>
     <item msgid="5827426100157335512">"Buch"</item>
     <item msgid="8585828346253128384">"Lotusblume"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 61952e9bdbf..610568ed213 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Neues Gerät koppeln"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Morgen automatisch aktivieren"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Wenn du Bluetooth deaktivierst, wird es am nächsten Tag wieder aktiviert"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Rechtes Gerät koppeln"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Linkes Gerät koppeln"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Anderes Ohr koppeln"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio deaktivieren"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Deaktiviert die Bluetooth LE Audio-Funktion, wenn das Gerät LE Audio-Hardwarefunktionen unterstützt."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio-Modus"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Vorschau für Benutzeroberfläche der Bluetooth LE Audioübertragung aktivieren"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Aktiviert die Vorschau für die Benutzeroberfläche der LE Audiofreigabe, einschließlich der persönlichen Audiofreigabe und der privaten Übertragung"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Ein/Aus für LE Audio in Gerätedetails"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio-Zulassungsliste umgehen"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio wird standardmäßig verwendet, selbst wenn ein LE Audio-Peripheriegerät nicht die Kriterien der Zulassungsliste erfüllt."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App-Sprache"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Vorgeschlagene Sprachen"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alle Sprachen"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Vorgeschlagen"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alle Sprachen"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alle Regionen"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alle Zahlensysteme"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Systemsprache"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Standardeinstellung des Systems"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Für diese App ist in den Einstellungen keine Sprachauswahl verfügbar."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Ändern"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nicht verfügbar"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Diese Sprache kann nicht als Systemsprache verwendet werden, aber Apps und Websites werden darüber informiert, dass du diese Sprache bevorzugst."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Suche"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Sprache hinzufügen"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region auswählen"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Sprache eingeben"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Weitere Spracheinstellungen"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionale Einstellungen"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Einstellungen für Einheiten und Zahlen festlegen"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Wenn du Apps deine regionalen Einstellungen mitteilst, können ihre Dienste für dich personalisiert werden."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps verwenden regionale Einstellungen, wo immer dies möglich ist."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionale Einstellungen"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Erster Tag der Woche"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Einstellungen für Zahlen"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Mobile Daten auch bei Roaming nutzen"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Mobile Daten auch bei Roaming nutzen"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Eventuell fallen Roaminggebühren an."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Zeit automatisch einstellen"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Automatische Einstellung"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Wenn diese Einstellung aktiviert ist, wird dein Standort verwendet, um die Zeitzone einzustellen"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Datum und Uhrzeit automatisch einstellen"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Einstellung erfolgt automatisch über Netzwerk- und WLAN-Signale"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zeitzone automatisch einstellen"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Einstellung erfolgt automatisch auf der Grundlage von Mobilfunknetzen in deiner Nähe"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Einstellung erfolgt automatisch anhand des Gerätestandorts, wenn verfügbar"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standardformat für die gewählte Spracheinstellung verwenden"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-Stunden-Format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Uhrzeit"</string>
@@ -549,12 +564,15 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Hebe den Finger und berühre den Sensor dann noch einmal"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Der Fingerabdrucksensor kann nicht verwendet werden"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Suche einen Reparaturdienstleister auf."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Entsperrung per Fingerabdruck bei ausgeschaltetem Display"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Entsperrung per Fingerabdruck auch bei ausgeschaltetem Display verwenden"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Display aus, Entsperrung"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Weitere Sicher­heits­einstellungen"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Sperre des Arbeitsprofils, Verschlüsselung und mehr"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Verschlüsselung, Anmeldedaten und mehr"</string>
     <string name="security_advanced_settings_keywords" msgid="5294945170370974974">"Sicherheit, weitere Sicherheitseinstellungen, weitere Einstellungen, erweiterte Sicherheitseinstellungen"</string>
     <string name="privacy_advanced_settings" msgid="8828215456566937719">"Weitere Datenschutzeinstellungen"</string>
-    <string name="more_security_privacy_settings" msgid="123465614090328851">"Mehr Sicherheit und Datenschutz"</string>
+    <string name="more_security_privacy_settings" msgid="123465614090328851">"Mehr Sicherheit &amp; Datenschutz"</string>
     <string name="security_header" msgid="961514795852103424">"Sicherheit"</string>
     <string name="privacy_header" msgid="5526002421324257007">"Datenschutz"</string>
     <string name="work_profile_category_header" msgid="85707750968948517">"Arbeitsprofil"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Muster für vertrauliches Profil einrichten"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Sperren"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Verbergen"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Muster für vertrauliches Profil bestätigen"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"PIN für vertrauliches Profil noch einmal eingeben"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Passwort für vertrauliches Profil noch einmal eingeben"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Fingerabdrücke hinzufügen."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du hast die maximale Anzahl an Fingerabdrücken hinzugefügt"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Es können keine Fingerabdrücke mehr hinzugefügt werden"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"An"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Aus"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Externes Display"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Externes Display verwenden"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Displayauflösung"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Das externe Display ist nicht verbunden"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Das Ändern der Ausrichtung oder der Auflösung kann dazu führen, dass Apps, die momentan ausgeführt werden, angehalten werden"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Dein Gerät muss mit einem externen Display verbunden sein, um deinen Bildschirm spiegeln zu können"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Weitere Optionen"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Zum Neuanordnen der Displays halten und ziehen."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Streamen"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spiegeln"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kabellose Übertragung aktivieren"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Prüfe das Passwort und versuch es noch einmal"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Wende dich an den Hersteller des Geräts"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Prüfe die Verbindung und versuche es noch einmal"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Dieses WLAN ist momentan nicht verfügbar"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Es gibt ein Problem mit diesem QR‑Code. Versuche es mit einer anderen Methode."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Netzwerk auswählen"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Wenn du dein Gerät verbinden möchtest, wähle ein Netzwerk"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Dieses Gerät zu \"<xliff:g id="SSID">%1$s</xliff:g>\" hinzufügen?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Weitere Informationen zum automatischen Drehen"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Bildschirmauflösung"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Hohe Auflösung"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Volle Auflösung"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Die volle Auflösung verbraucht mehr Akku. Wenn du die Auflösung änderst, werden einige Apps möglicherweise neu gestartet."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Ausgewählt"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farben"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natürlich"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptiv"</string>
     <string name="brightness" msgid="6216871641021779698">"Helligkeit"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Automatische Helligkeit"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Informationen zur automatischen Helligkeit"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Die Helligkeit des Displays passt sich automatisch an deine Umgebung und deine Aktivitäten an. Mit dem Schieberegler kannst du sie manuell nach Wunsch anpassen und die Funktion „Automatische Helligkeit“ merkt sich deine Präferenz."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"An"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Aus"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Schlafenszeitmodus – Einstellungen"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modi können auch das dunkle Design aktivieren}=1{{mode_1} aktiviert auch das dunkle Design}=2{{mode_1} und {mode_2} aktivieren auch das dunkle Design}=3{{mode_1}, {mode_2} und {mode_3} aktivieren auch das dunkle Design}other{{mode_1}, {mode_2} und # weitere Modi aktivieren auch das dunkle Design}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Einstellungen für Modi"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Noch dunkler"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extradunkel"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Erlauben, dass das Gerät dunkler als normal wird"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Display automatisch ausschalten"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Wenn diese Funktion aktiviert ist, dürfen Apps und Dienste 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="location_services_preference_title" msgid="604317859531782159">"Standortdienste"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Standortdienste"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Standort verwenden"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Standort für Zeitzone verwenden"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Zeitzone kann nicht automatisch eingestellt werden"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Standort oder Standortdienste sind deaktiviert"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Standorteinstellungen"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Beheben"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Abbrechen"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatische Zeitzone ist deaktiviert"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nicht verfügbar, wenn „Zeitzone automatisch einstellen“ deaktiviert ist"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Der Standort kann verwendet werden, um die Zeitzone festzulegen"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Wenn der Standort deines Geräts verfügbar ist, kann er verwendet werden, um deine Zeitzone festzulegen"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
     <string name="legal_information" msgid="7509900979811934843">"Rechtliche Hinweise"</string>
     <string name="manual" msgid="3651593989906084868">"Handbuch"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Optionen"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Barrierefreiheit"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physische Tastatur"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce-Tasten"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Schnell aufeinanderfolgende Betätigungen derselben Taste innerhalb von <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms werden auf der Tastatur ignoriert"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Schnell aufeinanderfolgende Betätigungen derselben Taste auf der Tastatur werden ignoriert"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grenzwert für Bounce-Tasten"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Wähle aus, wie lange wiederholtes Drücken der Tasten auf der Tastatur ignoriert werden soll"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 Sek."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 Sek."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 Sek."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Benutzerdefiniert"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"benutzerdefinierter Wert"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Anschlagverzögerung"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Zeit zum Aktivieren eines Tastendrucks wird auf <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms festgelegt"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Passt die Zeit an, die eine Taste gedrückt werden muss, um sie zu aktivieren"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Einfingerbedienung"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Bei Tastenkombinationen Tasten einzeln drücken, statt sie zusammen gedrückt zu halten"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tastaturmaus"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Die Maus kann über die physische Tastatur gesteuert werden"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Tastaturmaus verwenden"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Zum Steuern des Mauszeigers die Tastatur verwenden"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mausrad-Scrollrichtung umkehren"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Wenn du nach oben scrollst, wird die Seite nach unten verschoben"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Linke und rechte Taste tauschen"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Die linke Maustaste übernimmt die Funktion der rechten Maustaste (und umgekehrt)"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tastaturmaus für <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Mauszeiger bewegen: Tasten „<xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>“ verwenden"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Mit der primären Maustaste klicken: Taste „<xliff:g id="CLICK_LABEL">%s</xliff:g>“ verwenden"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Primäre Taste gedrückt halten: Taste „<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>“ verwenden"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Primäre Taste loslassen: Taste „<xliff:g id="RELEASE_LABEL">%s</xliff:g>“ verwenden"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Scrollmodus aktivieren oder deaktivieren: Taste „<xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>“ verwenden; anschließend kannst du mit den Tasten „<xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>“ in der Ansicht nach oben, unten, links oder rechts scrollen"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Sekundäre Maustaste drücken: Taste „<xliff:g id="RELEASE_2_LABEL">%s</xliff:g>“ verwenden"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tastenkürzel"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Liste der Tastenkombinationen anzeigen"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastaturen und Tools für das Arbeitsprofil"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Standard"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad und Maus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Maus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Zeigergeschwindigkeit, Touch-Gesten"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Touchpad-Klick"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Antippen und ziehen"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"In rechte untere Ecke tippen"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Unten rechts auf das Touchpad tippen, um weitere Optionen anzuzeigen"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Zeigergeschwindigkeit"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"„Mit drei Fingern tippen“ verwenden"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Zeigerfarbe"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Zeigerfüllfarbe in Schwarz ändern"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Zeigerfüllfarbe in Grün ändern"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Informationen zu Touchpad-Gesten"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"Touchpad, Touch-Pad, Maus, Cursor, scrollen, wischen, rechtsklicken, klicken, Zeiger"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"rechtsklicken, tippen"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Mit mittlerer Maustaste klicken"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant starten"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Zur Startseite"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Zurück"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Letzte Apps aufrufen"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Zum Start­bildschirm"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Wische irgendwo auf dem Touchpad mit drei Fingern nach oben"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Zurück"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wähle eine neue Taste für <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Bedienungshilfen für physische Tastaturen"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Einfingerbedienung, Bounce-Tasten, Tastaturmaus"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Tasteneingabewiederholung"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Verzögerung vor Wiederholung"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Wiederholungsrate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Wenn du eine Taste gedrückt hältst, wird das entsprechende Zeichen so lange immer wieder eingegeben, bis du die Taste loslässt"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layout: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatisch: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vorschau"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardoptionen"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Sprache"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Textgröße"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Größe der Untertitel"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Untertitelstil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Benutzerdefinierte Optionen"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Hintergrundfarbe"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Energieverbrauch anpassen"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Enthaltene Pakete"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps funktionieren normal"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Akkutausch empfohlen"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Die Akkukapazität und Ladeleistung sind reduziert. Ein Akkutausch wird empfohlen."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Akkustand niedrig"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Energiesparmodus aktivieren, um Akkulaufzeit zu erhöhen"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Akkulaufzeit optimieren"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Verbindung zu diesem VPN trennen?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Verbindung trennen"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN entfernen"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Aktuelles VPN ersetzen?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Durchgehend aktives VPN aktivieren?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„Von 9 Uhr bis 17 Uhr an Wochentagen“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalendertermine"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ist aktiv}=2{{mode_1} und {mode_2} sind aktiv}=3{{mode_1}, {mode_2} und {mode_3} sind aktiv}other{{mode_1}, {mode_2} und # weitere Modi sind aktiv}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 Modus kann automatisch aktiviert werden}other{# Modi können automatisch aktiviert werden}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Bitte nicht stören}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AN"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nicht festgelegt"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Deaktiviert"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ok"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Benachrichtigungen"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Dauer"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Nachrichten, Termine &amp; Erinnerungen"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Wenn „Bitte nicht stören“ aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollen. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Fertig"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Einstellungen"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Kein optisches oder akustisches Signal bei Benachrichtigungen"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Kein Ton bei Benachrichtigungen"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Du siehst oder hörst keine Benachrichtigungen. Anrufe von markierten Kontakten und wiederholten Anrufern sind erlaubt."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktuelle Einstellung)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Einstellungen für „Bitte nicht stören“ ändern?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Töne für Arbeitsprofil"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Töne des privaten Profils verwenden"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Dieselben Töne verwenden wie beim privaten Profil"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Nach dem Entsperren wird direkt der zuletzt genutzte Bildschirm angezeigt. Um Benachrichtigungen auf dem Sperrbildschirm zu sehen, von oben wischen."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sperrbildschirm, überspringen, umgehen"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Wenn das Arbeitsprofil gesperrt ist"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Benachrichtigungen auf dem Sperrbildschirm verringern"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Weniger Benachrichtigungen auf dem Sperrbildschirm anzeigen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Nur neue Benachrichtigungen auf dem Sperrbildschirm anzeigen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Zuvor angesehene Benachrichtigungen werden automatisch vom Sperrbildschirm entfernt"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Benachrichtigungen auf Sperrbildschirm"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Lautlose und Standardunterhaltungen anzeigen"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Alle Benachrichtigungen anzeigen"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Alle geschäftlichen Benachrichtigungen anzeigen"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Vertrauliche geschäftliche Inhalte ausblenden"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Wie sollen Profilbenachrichtigungen angezeigt werden, wenn dein Gerät gesperrt ist?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilbenachrichtigungen"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Benachrichtigungen"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App-Benachrichtigungen"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Wenn du viele Benachrichtigungen hintereinander erhältst, verringert dein Gerät für bis zu 2 Minuten die Lautstärke der Benachrichtigungssignale und minimiert die Benachrichtigungen. Anrufe, Wecker und priorisierte Unterhaltungen sind davon nicht betroffen. \n\nDie während dieser Zeit eingegangenen Benachrichtigungen kannst du dir ansehen, indem du vom oberen Rand des Displays nach unten wischst."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Auf Arbeitsprofile anwenden"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Auf Apps im Arbeitsprofil anwenden"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Gruppierte Benachrichtigungen"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"An"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Aus"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Benachrichtigungsgruppierung verwenden"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Benachrichtigungen mit ähnlichen Themen werden stummgeschaltet und in einer Gruppe zusammengefasst, damit du seltener gestört wirst. Die Gruppierungsfunktion überschreibt die in den jeweiligen Apps festgelegten Benachrichtigungseinstellungen."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-Hilfsdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Keine installierte App hat die Ausführung als VR-Hilfsdienst angefordert."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-Dienstzugriff für <xliff:g id="SERVICE">%1$s</xliff:g> erlauben?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"vorrangige Unterhaltungen"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Keine"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Keine}=1{1 Unterhaltung}other{# Unterhaltungen}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Einstellungen für Unterhaltungen"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wer unterbrechen darf"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Nachrichten- oder Anruf-Apps können dich zwar nicht benachrichtigen, aber die von dir hier ausgewählten Nutzer können dich trotzdem über diese Apps erreichen"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrufe"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontakteinstellungen"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Einstellungen für markierte Kontakte"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Keine"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Keine"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Wecker"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Keine App kann unterbrechen}=1{{app_1} kann unterbrechen}=2{{app_1} und {app_2} können unterbrechen}=3{{app_1}, {app_2} und {app_3} können unterbrechen}other{{app_1}, {app_2}, und # weitere können unterbrechen}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (geschäftlich)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Wird berechnet…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Apps-Einstellungen"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Überschreiben durch Apps zulassen"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps, die unterbrechen dürfen"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Modus erstellen"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Benutzerdefinierter Modus"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Modusname"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Der Name des Modus darf nicht leer sein"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Symbol auswählen"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendertermine"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Ablauf „Schlafenszeit“"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Beim Fahren"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Vollbildbenachrichtigungen"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Vollbildbenachrichtigungen von dieser App erlauben"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Diese App darf Benachrichtigungen anzeigen, die das gesamte Display ausfüllen, wenn das Gerät gesperrt ist. Apps können diese verwenden, um Wecker, eingehende Anrufe oder andere dringende Benachrichtigungen hervorzuheben."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Systemeinstellungen schreiben"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Dieser App erlauben, Systemeinstellungen für dich zu ändern"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Wenn du diese Berechtigung erteilst, darf eine App grundlegende Systemeinstellungen ändern."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps zur Medienverwaltung"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"App erlauben, Medien zu verwalten"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Wenn du es erlaubst, kann diese App mit anderen Apps erstellte Mediendateien ändern oder löschen, ohne dich zu fragen. Die App muss berechtigt sein, auf Mediendateien zuzugreifen."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Touch-Gesten &amp; Bewegungen"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kamera schnell öffnen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Ein-/Aus-Taste zweimal drücken, um die Kamera direkt zu starten. Funktioniert auch, wenn eine andere App geöffnet ist."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Für Selfie-Modus Handgelenk drehen"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigationsmodus"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Nachrichten per Satellit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Nachrichten per Satellitenfunk senden und empfangen. Dein Konto unterstützt diesen Dienst."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Nachrichten per Satellitenfunk senden und empfangen. Dein Konto unterstützt diesen Dienst nicht."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Nachrichten per Satellit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Über Nachrichten per Satellit"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Mit einem berechtigten <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-Konto kannst du Nachrichten per Satellitenfunk versenden und empfangen."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Mein <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-Vertrag"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Dein Konto unterstützt Nachrichten per Satellit"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Dein Konto unterstützt keine Nachrichten per Satellit"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Weitere Informationen"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"So funktionierts"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Dein Smartphone stellt automatisch eine Satellitenverbindung her. Für die bestmögliche Verbindung sollte eine freie Sicht zum Himmel bestehen."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Nach Verbindung deines Smartphones mit einem Satelliten"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Du kannst Nachrichten an beliebige Empfänger versenden, auch an den Rettungsdienst. Sobald wieder ein Mobilfunknetz verfügbar ist, verbindet sich dein Smartphone damit."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Das Senden von Nachrichten per Satellit kann länger dauern und ist nicht überall verfügbar. Wetterbedingungen und bestimmte Gebäude, Bäume usw. können die Satellitenverbindung beeinträchtigen. Anrufe per Satellit sind nicht verfügbar. Notrufe werden eventuell trotzdem verbunden.\n\nEs kann einige Zeit dauern, bis Kontoänderungen in den Einstellungen angezeigt werden. Weitere Informationen erhältst du bei deinem Mobilfunkanbieter."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mehr zu Nachrichten per Satellit"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Aktivieren von „<xliff:g id="FUNCTION">%1$s</xliff:g>“ fehlgeschlagen"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Um die Funktion „<xliff:g id="FUNCTION">%1$s</xliff:g>“ zu aktivieren, beende zuerst die Satellitenverbindung"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellitenverbindung"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Zugangspunkte (APNs)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Du befindest dich im 16‑KB-Modus des speicherseitenunabhängigen Modus. Beachte, dass bei entsperrtem Bootloader die Softwareintegrität nicht sichergestellt werden kann und alle auf dem Smartphone gespeicherten Daten gefährdet sind. Einige Funktionen werden in diesen Modi deaktiviert, weshalb bestimmte Anwendungen möglicherweise nicht funktionieren. Wenn du wieder in den Produktionsmodus wechseln möchtest, musst du zurück zum 4‑KB-Modus wechseln und dann den Bootloader des Geräts sperren. Dadurch wird das Gerät wieder auf die Werkseinstellungen zurückgesetzt und die Produktionseinstellungen werden wiederhergestellt. Nachdem das Gerät hochgefahren und Android gestartet wurde, deaktiviere in den Entwickleroptionen die OEM-Entsperrung. Wenn Android auf dem Gerät nicht gestartet werden kann oder das Gerät instabil ist, flashe das aktuelle Factory Image unter &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; oder verwende &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; und wähle „Gerätedaten löschen“, „Bootloader sperren“ und „Flashen aller Partitionen erzwingen“ aus."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Speicherseitenunabhängiger 16‑KB-Modus"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Weitere Informationen"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"App im Kompatibilitätsmodus für die Seitengröße ausführen"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Fehlerbericht-Handler"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Bestimmt, welche App die Verknüpfung zum Fehlerbericht auf deinem Gerät verarbeitet"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Persönlich"</string>
@@ -5161,7 +5313,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB ist an deinem derzeitigen Standort nicht verfügbar"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread verwenden"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Ein Thread kann deine Smart-Home-Geräte verbinden und dabei helfen, die Effizienz und Leistung zu steigern.\n\nWenn diese Option aktiviert ist, kann dieses Gerät einem Thread-Netzwerk beitreten, was die Steuerung von Matter-kompatiblen Geräte über dieses Smartphone ermöglicht."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread kann deine Smart-Home-Geräte verbinden und dabei helfen, die Effizienz und Leistung zu steigern.\n\nWenn diese Option aktiviert ist, kann dieses Gerät einem Thread-Netzwerk beitreten, was die Steuerung von Matter-kompatiblen Geräten über dieses Smartphone ermöglicht."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Weitere Informationen zu Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Kamerazugriff"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonzugriff"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Stream anhören"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Den QR-Code eines Audiostreams scannen, um den Stream auf <xliff:g id="DEVICE_NAME">%1$s</xliff:g> anzuhören"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Während der Freigabe kann das Passwort nicht geändert werden. Wenn du das Passwort ändern möchtest, deaktiviere zuerst die Audiofreigabe."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Dein Passwort muss zwischen 4 und 16 Zeichen lang sein und darf nur aus Buchstaben, Zahlen und Symbolen bestehen"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR‑Code-Scanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Benötigst du Hilfe?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"In Einstellungen suchen"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"Kontakte, Speicher, Konto"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakte-Speicher"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Nur Gerät"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Neue Kontakte werden nicht mit einem Konto synchronisiert"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakte werden standardmäßig auf deinem Gerät gespeichert und mit deinem Konto synchronisiert"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Fehler beim Festlegen des Standardkontos"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Kein Standard festgelegt"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Nur Gerät"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Gerät und %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Füge ein Konto hinzu, um loszulegen"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Speicherort für Kontakte"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Halte die Startbildschirmtaste oder den Navigationsziehpunkt gedrückt, um anhand des Inhalts auf dem Bildschirm zu suchen."</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 2bad60edeb6..3765c8bbd44 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Νιφάδα χιονιού"</item>
     <item msgid="7952183800501346803">"Ομπρέλα παραλίας"</item>
     <item msgid="799139025758265891">"Εργαλεία εργαστηρίου"</item>
-    <item msgid="1330084588359129896">"Σκηνή"</item>
+    <item msgid="8112685757657659269">"Πιάνο"</item>
     <item msgid="3861584909935022342">"Ρετρό φιλμ"</item>
     <item msgid="5827426100157335512">"Βιβλίο"</item>
     <item msgid="8585828346253128384">"Λουλούδι λωτού"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a94211331bb..3b6c7838f7e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Σύζευξη νέας συσκευής"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Αυτόματη ενεργοποίηση αύριο"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Αν απενεργοπ. το Bluetooth, θα ενεργοπ. την επόμενη ημέρα"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Σύζευξη δεξιού"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Σύζευξη αριστερού"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Σύζευξη του άλλου αυτιού"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Απενεργοποίηση Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Απενεργοποιεί τη λειτουργία Bluetooth LE Audio αν η συσκευή υποστηρίζει δυνατότητες εξοπλισμού LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Λειτουργία Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Ενεργοποίηση προεπισκόπησης διεπαφής χρήστη για μετάδοση Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ενεργοποιεί την προεπισκόπηση της διεπαφής χρήστη για την κοινή χρήση LE Audio, συμπεριλαμβανομένης της κοινής χρήσης προσωπικού ήχου και της ιδιωτικής μετάδοσης"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Εναλλαγή LE Audio στις λεπτομ. συσκευής"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Παράκαμψη λίστας επιτρεπομένων Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Χρήση του LE Audio από προεπιλογή, ακόμα και αν το περιφερειακό LE Audio δεν έχει επαληθευτεί, ώστε να πληροί τα κριτήρια της λίστας επιτρεπομένων."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Γλώσσα εφαρμογής"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Προτεινόμενες γλώσσες"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Όλες οι γλώσσες"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Προτεινόμενα"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Όλες οι γλώσσες"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Όλες οι περιοχές"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Όλα τα συστήματα αρίθμησης"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Γλώσσα συστήματος"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Προεπιλογή συστήματος"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Η δυνατότητα επιλογής γλώσσας για αυτή την εφαρμογή δεν είναι διαθέσιμη από τις Ρυθμίσεις."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Αλλαγή"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Τα %s δεν είναι διαθέσιμα"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Αυτή η γλώσσα δεν μπορεί να χρησιμοποιηθεί ως γλώσσα συστήματος, αλλά έχετε ενημερώσει εφαρμογές και ιστοτόπους ότι την προτιμάτε."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Αναζήτηση"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Προσθήκη γλώσσας"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Προτίμηση περιοχής"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Εισαγ. όνομα γλώσσας"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Περισσότερες ρυθμίσεις γλώσσας"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Προτιμήσεις περιοχής"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Ορισμός προτιμήσεων μονάδων και αριθμών"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Επιτρέψτε στις εφαρμογές να γνωρίζουν τις προτιμήσεις περιοχής, ώστε να εξατομικεύουν την εμπειρία σας"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Οι εφαρμογές θα χρησιμοποιούν τις προτιμήσεις περιοχής όποτε αυτό είναι δυνατόν."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Προτιμήσεις περιοχής"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Θερμοκρασία"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Πρώτη ημέρα της εβδομάδας"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Προτιμήσεις για αριθμούς"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Ενδέχεται να ισχύουν χρεώσεις περιαγωγής."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Αυτόματος ορισμός ώρας"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Αυτόματη ρύθμιση"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Η τοποθεσία θα χρησιμοποιείται για ρύθμιση της ζώνης ώρας όταν το στοιχείο εναλλαγής είναι ενεργοπ."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Αυτόματη ημερομηνία και ώρα"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Αυτόματος ορισμός με χρήση του δικτύου σας και των ασύρματων σημάτων"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Αυτόματη ζώνη ώρας"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Αυτόματος ορισμός με βάση τα δίκτυα κινητής τηλεφωνίας κοντά σας"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Αυτόματος ορισμός με χρήση της τοποθεσίας συσκευής, αν είναι διαθέσιμη"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Χρήση προεπιλογής τοπικών ρυθμίσεων"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Χρήση μορφής 24ώρου"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ώρα"</string>
@@ -361,7 +376,7 @@
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Χρησιμοποιήστε τη λειτουργία Ξεκλείδωμα με το πρόσωπο για το ξεκλείδωμα του τηλεφώνου σας."</string>
     <string name="security_settings_fingerprint" msgid="6387775386189204201">"Δακτυλικό αποτύπωμα"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Δακτυλικό αποτύπωμα"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Στη χρήση του Ξεκλειδώματος με δακτυλικό αποτύπωμα"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Κατά τη χρήση του Ξεκλειδώματος με δακτυλικό αποτύπωμα"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Δακτυλικό αποτύπωμα για επ. χρήση"</string>
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Προσθήκη δακτ. αποτυπώματος"</string>
     <string name="security_settings_fingerprint_preference_summary" msgid="8486134175759676037">"{count,plural, =1{Προστέθηκε δακτυλικό αποτύπωμα}other{Προστέθηκαν # δακτυλικά αποτυπώματα}}"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Σηκώστε το δάχτυλο και, στη συνέχεια, αγγίξτε ξανά τον αισθητήρα"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Δεν είναι δυνατή η χρήση του αισθητήρα δακτυλικών αποτυπωμάτων"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Επισκεφτείτε έναν πάροχο υπηρεσιών επισκευής."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ξεκλείδωμα με δακτυλικό αποτύπωμα με απενεργοποιημένη οθόνη"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Χρησιμοποιήστε το Ξεκλείδωμα με δακτυλικό αποτύπωμα ακόμα και όταν η οθόνη είναι απενεργοποιημένη"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Απενεργοποημένη οθόνη, ξεκλείδωμα"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Περισσότερες ρυθμίσεις ασφαλείας"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Κλείδωμα προφίλ εργασίας, κρυπτογράφηση και περισσότερα"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Κρυπτογράφηση, διαπιστευτήρια και περισσότερα"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Ορισμός μοτίβου ιδιωτικού χώρου"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Κλείδωμα"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Απόκρυψη"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Επιβεβαίωση μοτίβου ιδιωτικού χώρου"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Εισαγάγετε ξανά το PIN ιδιωτικού χώρου"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Εισαγάγετε τον κωδικό πρόσβασης ιδιωτικού χώρου"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> δακτυλικά αποτυπώματα"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Έχετε προσθέσει τον μέγιστο αριθμό δακτυλικών αποτυπωμάτων"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Δεν είναι δυνατή η προσθήκη περισσότερων δακτυλικών αποτυπωμάτων"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Ενεργή"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Ανενεργή"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Εξωτερική οθόνη"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Χρήση εξωτερικής οθόνης"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ανάλυση οθόνης"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Η εξωτερική οθόνη δεν είναι συνδεδεμένη"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Εάν αλλάξετε την περιστροφή ή την ανάλυση, ενδέχεται να σταματήσουν τυχόν εφαρμογές που εκτελούνται αυτή τη στιγμή"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Η συσκευή σας πρέπει να είναι συνδεδεμένη σε μια εξωτερική οθόνη προκειμένου να είναι δυνατός ο κατοπτρισμός της οθόνης σας"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Περισσότερες επιλογές"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Πατήστε παρατεταμένα και σύρετε για αναδιάταξη των οθονών."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Μετάδοση"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"κατοπτρισμός"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ενεργοποίηση ασύρματης οθόνης"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Ελέγξτε τον κωδικό πρόσβασης και δοκιμάστε ξανά."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Επικοινωνήστε με τον κατασκευαστή της συσκευής."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Ελέγξτε τη σύνδεση και δοκιμάστε ξανά"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Αυτό το δίκτυο Wi‑Fi δεν είναι διαθέσιμο αυτή τη στιγμή"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Παρουσιάστηκε πρόβλημα με αυτόν τον κωδικό QR. Δοκιμάστε να συνδεθείτε με άλλο τρόπο."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Επιλογή δικτύου"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Για να συνδέσετε τη συσκευή σας, επιλέξτε ένα δίκτυο"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Θέλετε να προσθέσετε αυτήν τη συσκευή στο \"<xliff:g id="SSID">%1$s</xliff:g>\";"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Μάθετε περισσότερα σχετικά με την αυτόματη περιστροφή"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ανάλυση οθόνης"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Υψηλή ανάλυση"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Πλήρης ανάλυση"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Η πλήρης ανάλυση χρησιμοποιεί περισσότερο την μπαταρία. Η αλλαγή της ανάλυσης μπορεί να προκαλέσει επανεκκίνηση ορισμένων εφαρμογών."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Επιλέχθηκε"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Χρώματα"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Φυσικό"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Προσαρμοστικό"</string>
     <string name="brightness" msgid="6216871641021779698">"Επίπεδο φωτεινότητας"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Προσαρμοστική φωτεινότητα"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Σχετικά με την προσαρμοστική φωτεινότητα"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Η φωτεινότητα της οθόνης σας θα προσαρμοστεί αυτόματα στο περιβάλλον και τις δραστηριότητές σας. Μπορείτε να μετακινήσετε χειροκίνητα το ρυθμιστικό, για να ενημερωθεί η προσαρμοστική φωτεινότητα σχετικά με τις ρυθμίσεις σας."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Ενεργή"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Ανενεργή"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Ρυθμίσεις λειτουργίας Ώρα για ύπνο"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Οι λειτουργίες μπορούν επίσης να ενεργοποιούν το σκούρο θέμα}=1{Η λειτουργία {mode_1} ενεργοποιεί επίσης το σκούρο θέμα}=2{Οι λειτουργίες {mode_1} και {mode_2} ενεργοποιούν επίσης το σκούρο θέμα}=3{Οι λειτουργίες {mode_1}, {mode_2} και {mode_3} ενεργοποιούν επίσης το σκούρο θέμα}other{Οι λειτουργίες {mode_1}, {mode_2} και # ακόμη ενεργοποιούν επίσης το σκούρο θέμα}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Ρυθμίσεις λειτουργιών"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ακόμα χαμηλότερη φωτεινότητα"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Επιπλέον μείωση φωτεινότητας"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Να επιτρέπεται χαμηλότερη φωτεινότητα στη συσκευή απ\' ό,τι συνήθως"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Λήξη χρονικού ορίου οθόνης"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για κοντινές συσκευές ανά πάσα στιγμή, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Υπηρεσίες τοποθεσίας"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Υπηρεσίες τοποθεσίας"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Χρήση τοποθεσίας"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Χρήση τοποθεσίας για ζώνη ώρας"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Δεν είναι δυνατή η αυτόματη ρύθμιση της ζώνης ώρας"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Η Τοποθεσία ή οι Υπηρεσίες τοποθεσίας είναι απενεργοποιημ."</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Ρυθμίσεις τοποθεσίας"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Επιδιόρθωση"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Ακύρωση"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Η αυτόματη ζώνη ώρας είναι απενεργοποιημένη"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Δεν διατίθεται, όταν η αυτόματη ζώνη ώρας είναι απενεργοποιημένη"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Μπορεί να χρησιμοποιηθεί η τοποθεσία για τον ορισμό της ζώνης ώρας"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Εάν η τοποθεσία της συσκευής σας είναι διαθέσιμη, μπορεί να χρησιμοποιηθεί για τον ορισμό της ζώνης ώρας"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Προβολή νομικών πληροφοριών, κατάστασης, έκδοσης λογισμικού"</string>
     <string name="legal_information" msgid="7509900979811934843">"Νομικές πληροφορίες"</string>
     <string name="manual" msgid="3651593989906084868">"Εγχειρίδιο χρήσης"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Επιλογές"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Προσβασιμότητα"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Φυσικό πληκτρολόγιο"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Ελαστικά πλήκτρα"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Το πληκτρολόγιο αγνοεί τα γρήγορα, επαναλαμβανόμενα πατήματα του ίδιου πλήκτρου εντός <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Το πληκτρολόγιο αγνοεί τα γρήγορα, επαναλαμβανόμενα πατήματα του ίδιου πλήκτρου"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Όριο ελαστικών πλήκτρων"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Επιλέξτε το χρονικό διάστημα κατά το οποίο το πληκτρολόγιο θα παραβλέπει τα επαναλαμβανόμενα πατήματα πλήκτρων"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 δ."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 δ."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 δ."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Προσαρμοσμένη"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"προσαρμοσμένη τιμή"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Αργά πλήκτρα"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Προσαρμόζει τον χρόνο που απαιτείται για την ενεργοποίηση ενός πατήματος πλήκτρου στα <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Προσαρμόζει τον χρόνο που απαιτείται για την ενεργοποίηση ενός πατήματος πλήκτρου"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Ασύγχρονα πλήκτρα"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Για τις συντομεύσεις, αντί να πατάτε παρατεταμένα όλα τα κουμπιά μαζί, φροντίστε να πατάτε ένα πλήκτρο κάθε φορά"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Πλήκτρα ποντικιού"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Χρησιμοποιήστε το πληκτρολόγιο για να χειριστείτε το ποντίκι."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Χρήση των πλήκτρων ποντικιού"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Χρησιμοποιήστε το πληκτρολόγιο, για να ελέγξετε τον δείκτη"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Αντίστροφη κύλιση με το ποντίκι"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Κάντε κύλιση προς τα επάνω, για να μετακινήσετε τη σελίδα προς τα κάτω."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Εναλλαγή αριστερού και δεξιού κουμπιού"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Χρησιμοποιήστε το αριστερό κουμπί του ποντικιού ως δεξί κουμπί"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Πλήκτρα ποντικιού για το <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Χρησιμοποιήστε τα πλήκτρα <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>, για να μετακινήσετε τον δείκτη του ποντικιού"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Χρησιμοποιήστε το πλήκτρο <xliff:g id="CLICK_LABEL">%s</xliff:g>, για να κάνετε κλικ στο κύριο κουμπί του ποντικιού"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Χρησιμοποιήστε το πλήκτρο <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>, για να πατήσετε παρατεταμένα το κύριο κουμπί του ποντικιού"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Χρησιμοποιήστε το πλήκτρο <xliff:g id="RELEASE_LABEL">%s</xliff:g>, για να απελευθερώσετε το κύριο κουμπί του ποντικιού"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Χρησιμοποιήστε το πλήκτρο <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> για εναλλαγή της λειτουργίας κύλισης. Με αυτόν τον τρόπο, τα πλήκτρα <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> θα μετακινούν με κύλιση την προβολή προς τα επάνω, προς τα κάτω, προς τα αριστερά ή προς τα δεξιά"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Χρησιμοποιήστε το πλήκτρο <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>, για να κάνετε κλικ στο δευτερεύον κουμπί του ποντικιού"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Συντομεύσεις πληκτρολογίου"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Εμφάνιση λίστας συντομεύσεων"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Πληκτρολόγιο και εργαλεία προφίλ εργασίας"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Προεπιλογή"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Επιφάνεια αφής"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Επιφάνεια αφής και ποντίκι"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Ποντίκι"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Ταχύτητα δείκτη, κινήσεις"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Πατήστε για κλικ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Μεταφορά με πάτημα"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Πατήστε κάτω δεξιά για δεξί κλικ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Πατήστε κάτω δεξιά στην επιφάνεια αφής για άλλες επιλογές"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Ταχύτητα δείκτη"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Χρήση πατήματος με τρία δάχτυλα"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Χρώμα δείκτη"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Αλλαγή στιλ γεμίσμ. δείκτη σε μαύρο"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Αλλαγή στιλ γεμίσ. δείκ. σε πράσινο"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Μάθετε κινήσεις επιφάνειας αφής"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"επιφάνειας αφής, επιφάνεια, ποντίκι, δείκτης, κύλιση, σάρωση, δεξί κλικ, κλικ, δείκτης"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"δεξί κλικ, πάτημα"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Μεσαίο κλικ"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Εκκίνηση Βοηθού"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Μετάβαση στην αρχική σελίδα"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Επιστροφή"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Προβολή πρόσφατων εφαρμογών"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Μετάβαση στην αρχική οθόνη"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Σύρετε επάνω με τρία δάχτ. από οποιοδ. σημείο της επιφ. αφής"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Επιστροφή"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Επιλέξτε ένα νέο κλειδί για <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Προσβασιμότητα φυσικού πληκτρολογίου"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ασύγχρονα πλήκτρα, Ελαστικά πλήκτρα, Πλήκτρα ποντικιού"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Επανάληψη πλήκτρων"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Καθυστέρηση πριν από την επανάληψη"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Ρυθμός επανάληψης"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Κρατήστε πατημένο ένα πλήκτρο, για επανάληψη του χαρακτήρα του μέχρι να αφήσετε το πλήκτρο"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Διάταξη <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Προεπιλογή"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Αυτόματο: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Προεπισκόπηση"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Βασικές επιλογές"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Γλώσσα"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Μέγεθος κειμένου"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Μέγεθος υπότιτλων"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Στιλ υποτίτλων"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Προσαρμοσμένες επιλογές"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Χρώμα φόντου"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Προσαρμογή χρήσης ισχύος"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Συμπεριλαμβανόμενα πακέτα"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Οι εφαρμογές εκτελούνται κανονικά"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Συνιστάται αντικατάσταση της μπαταρίας"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Η χωρητικότητα μπαταρίας και η απόδοση φόρτισης έχουν μειωθεί και συνιστάται αντικατάσταση της μπαταρίας."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Χαμηλή ισχύς μπαταρίας"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Ενεργοποιήστε την Εξοικονόμηση μπαταρίας για να επεκτείνετε τη διάρκεια ζωής της μπαταρίας"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Βελτιώστε τη διάρκεια ζωής της μπαταρίας"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Να αποσυνδεθεί αυτό το VPN;"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Αποσύνδεση"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Έκδοση"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Έκδοση <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Διαγραφή VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Αντικατάσταση υπάρχοντος VPN;"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ενεργοποίηση του μονίμως ενεργού VPN;"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 π.μ.-5 μ.μ. τις εργάσιμες ημέρες\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Συμβάντα ημερολογίου"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Η λειτουργία {mode_1} είναι ενεργή}=2{Οι λειτουργίες {mode_1} και {mode_2} είναι ενεργές}=3{Οι λειτουργίες {mode_1}, {mode_2} και {mode_3} είναι ενεργές}other{Οι λειτουργίες {mode_1}, {mode_2} και # ακόμη είναι ενεργές}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 λειτουργία μπορεί να ενεργοποιηθεί αυτόματα}other{# λειτουργίες μπορούν να ενεργοποιηθούν αυτόματα}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Μην ενοχλείτε}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ΕΝΕΡΓΗ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Δεν έχει οριστεί"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Απενεργοποιημένη"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Το κατάλαβα"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Ειδοποιήσεις"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Διάρκεια"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Μηνύματα, συμβάντα και υπενθυμίσεις"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και στην οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Τέλος"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ρυθμίσεις"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ειδοποιήσεις χωρίς ήχο"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Δεν θα βλέπετε και δεν θα ακούτε ειδοποιήσεις. Επιτρέπονται οι κλήσεις από επαφές με αστέρι και καλούντες κατ\' επανάληψη."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Τρέχουσα ρύθμιση)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Θέλετε να αλλάξετε τις ρυθμίσεις ειδοποιήσεων της λειτουργίας \"Μην ενοχλείτε\";"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Ήχοι προφίλ εργασίας"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Χρήση ήχων προσωπικού προφίλ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Χρήση των ίδιων ήχων με το προσωπικό σας προφίλ"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Μετά το ξεκλείδωμα, μετάβαση στην τελευταία οθόνη που χρησιμοποιήθηκε. Δεν θα βλέπετε ειδοποιήσεις στην οθόνη κλειδ. Σύρετε προς τα κάτω για εμφάνιση."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Οθόνη κλειδώματος, Κλειδωμένη οθόνη, Παράβλεψη, Παράκαμψη"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Με κλειδωμένο προφίλ εργασίας"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Μινιμαλιστικές ειδοποιήσεις στην οθόνη κλειδώματος"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Εμφανίζονται λιγότερες ειδοποιήσεις στην οθόνη κλειδώματος"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Εμφάνιση μόνο νέων ειδοποιήσεων στην οθόνη κλειδώματος"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Αυτόματη κατάργηση από την οθόνη κλειδώματος των ειδοποιήσεων που έχουν προβληθεί"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Ειδοποιήσεις στην οθόνη κλειδώματος"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Εμφάνιση συζητήσεων, προεπιλεγμένων και αθόρυβων"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Εμφάνιση προεπιλεγμένων και αθόρυβων συζητήσεων"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Εμφάνιση όλου του περιεχομ. ειδοποιήσεων εργασίας"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Απόκρυψη ευαίσθητου περιεχομένου εργασίας"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Πώς θέλετε να εμφανίζονται οι ειδοποιήσεις προφίλ στη συσκευή σας, όταν η συσκευή σας είναι κλειδωμένη;"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Όταν λαμβάνετε πολλές ειδοποιήσεις μέσα σε σύντομο χρονικό διάστημα, η συσκευή σας μειώνει την ένταση του ήχου και ελαχιστοποιεί τις ειδοποιήσεις για έως και 2 λεπτά. Οι κλήσεις, τα ξυπνητήρια και οι συζητήσεις προτεραιότητας δεν επηρεάζονται. \n\nΓια να βρείτε τις ειδοποιήσεις που λαμβάνετε κατά τη διάρκεια της περιόδου cooldown, σύρετε προς τα κάτω από το πάνω μέρος της οθόνης."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Εφαρμογή σε προφίλ εργασίας"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Εφαρμογή σε εφαρμογές με προφίλ εργασίας"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Ομαδοποιημένες ειδοποιήσεις"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Ενεργό"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Ανενεργό"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Χρήση ομαδοποίησης ειδοποιήσεων"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Οι ειδοποιήσεις με παρόμοια θέματα θα τίθενται σε σίγαση και θα ομαδοποιούνται για μια πιο αθόρυβη εμπειρία. Η ομαδοποίηση θα παρακάμψει τις ρυθμίσεις ειδοποιήσεων της εφαρμογής."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Βοηθητικές υπηρεσίες Εικονικής Πραγματικότητας"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Δεν έχει ζητηθεί η εκτέλεση εγκατεστημένων εφαρμογών ως βοηθητικών υπηρεσιών Εικονικής Πραγματικότητας."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Να επιτρέπεται στην υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> να έχει πρόσβαση στην υπηρεσία Εικονικής Πραγματικότητας;"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"συζητήσεις προτεραιότητας"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Καμία"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Καμία}=1{Μία συζήτηση}other{# συζητήσεις}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Ρυθμίσεις συζητήσεων"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ποιος μπορεί να διακόπτει"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Ακόμη και αν οι εφαρμογές ανταλλαγής μηνυμάτων ή κλήσεων δεν μπορούν να σας ειδοποιήσουν, τα άτομα που επιλέγετε εδώ θα μπορούν ακόμη να επικοινωνούν μαζί σας μέσω αυτών των εφαρμογών"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Κλήσεις"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Όλοι"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Επαφές"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Επαφές με αστέρι"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Ρυθμίσεις επαφών"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Ρυθμίσεις επαφών με αστέρι"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Καμία"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Κανένα"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Ξυπνητήρια"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Εργασία)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Υπολογισμός…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Ρυθμίσεις εφαρμογών"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Να επιτρέπεται στις εφαρμογές η παράκαμψη"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Εφαρμογές που μπορούν να διακόπτουν"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Δημιουρ. λειτουργίας"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Προσαρμοσμένη λειτουργία"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Όνομα λειτουργίας"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Απαιτείται όνομα λειτουργίας"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Επιλέξτε εικονίδιο"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Συμβάντα ημερολογίου"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Ρουτίνα ωρών ύπνου"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Κατά την οδήγηση"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Ειδοποιήσεις σε πλήρη οθόνη"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Να επιτρέπονται οι ειδοποιήσεις σε πλήρη οθόνη από αυτή την εφαρμογή"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Να επιτρέπεται στην εφαρμογή η εμφάνιση ειδοποιήσεων σε πλήρη οθόνη όταν η συσκευή είναι κλειδωμένη. Οι εφαρμογές ενδέχεται να χρησιμοποιούν αυτή τη λειτουργία για επισήμανση ξυπνητηριών, εισερχόμενων κλήσεων ή άλλων επειγουσών ειδοποιήσεων."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Εγγραφή προτιμήσεων συστήματος"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Να επιτρέπεται σε αυτή την εφαρμογή να τροποποιεί τις προτιμήσεις συστήματος εκ μέρους σας"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Αυτή η άδεια επιτρέπει σε μια εφαρμογή την τροποποίηση των βασικών προτιμήσεων συστήματος."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Εφαρμογές διαχείρισης μέσων"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Να επιτραπεί στην εφαρμογή η διαχείριση μέσων"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Εάν επιτραπεί, αυτή η εφαρμογή θα μπορεί να τροποποιεί ή να διαγράφει αρχεία μέσων που έχουν δημιουργηθεί με άλλες εφαρμογές, χωρίς να σας ρωτήσει. Η εφαρμογή πρέπει να έχει άδεια για πρόσβαση σε αρχεία και μέσα."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Κινήσεις"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Γρήγορο άνοιγμα κάμερας"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Για να ανοίξετε γρήγορα την κάμερα, πατήστε δύο φορές το κουμπί λειτουργίας. Αυτή η ενέργεια μπορεί να πραγματοποιηθεί από οποιαδήποτε οθόνη."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Αναστροφή κάμερας για selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Λειτουργία πλοήγησης"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Ανταλλαγή μηνυμάτων μέσω δορυφόρου"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Στείλτε και λάβετε μηνύματα κειμένου μέσω δορυφόρου. Περιλαμβάνεται στον λογαριασμό σας."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Στείλτε και λάβετε μηνύματα κειμένου μέσω δορυφόρου. Δεν περιλαμβάνεται στον λογαριασμό σας."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Ανταλλαγή μηνυμάτων μέσω δορυφόρου"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Πληροφορίες για την ανταλλαγή μηνυμάτων μέσω δορυφόρου"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Μπορείτε να στέλνετε και να λαμβάνετε μηνύματα κειμένου μέσω δορυφόρου στο πλαίσιο ενός κατάλληλου λογαριασμού <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Το πρόγραμμά σας <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Η ανταλλαγή μηνυμάτων μέσω δορυφόρου συμπεριλαμβάνεται στον λογαριασμό σας"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Η ανταλλαγή μηνυμάτων μέσω δορυφόρου δεν συμπεριλαμβάνεται στον λογαριασμό σας"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Μάθετε περισσότερα"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Πώς λειτουργεί"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Το τηλέφωνό σας θα συνδεθεί αυτόματα με έναν δορυφόρο. Για την καλύτερη δυνατή σύνδεση, φροντίστε να φαίνεται ο ουρανός χωρίς να παρεμβάλλονται εμπόδια."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Μετά τη σύνδεση του τηλεφώνου σας με έναν δορυφόρο"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Μπορείτε να στέλνετε μηνύματα σε οποιονδήποτε, ακόμα και στις υπηρεσίες έκτακτης ανάγκης. Το τηλέφωνό σας θα συνδεθεί ξανά σε ένα δίκτυο κινητής τηλεφωνίας όταν είναι διαθέσιμο."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Η ανταλλαγή μηνυμάτων μέσω δορυφόρου μπορεί να διαρκέσει περισσότερο και είναι διαθέσιμη μόνο σε ορισμένες περιοχές. Ο καιρός και ορισμένες κατασκευές ενδέχεται να επηρεάσουν τη δορυφορική σύνδεση. Η σύνδεση μέσω δορυφόρου δεν είναι διαθέσιμη. Μπορεί να υπάρχει ακόμη δυνατότητα για κλήσεις έκτακτης ανάγκης.\n\nΊσως χρειαστεί λίγος χρόνος για να εμφανιστούν οι αλλαγές λογαριασμού στις Ρυθμίσεις. Επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας που χρησιμοποιείτε για λεπτομέρειες."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Περισσότερες πληροφορίες για την ανταλλαγή μηνυμάτων μέσω δορυφόρου"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Δεν είναι δυνατή η ενεργοποίηση της επιλογής <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Για να ενεργοποιήσετε την επιλογή <xliff:g id="FUNCTION">%1$s</xliff:g>, αρχικά τερματίστε τη σύνδεση μέσω δορυφόρου"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Δορυφορική συνδεσιμότητα"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Ονόματα σημείων πρόσβασης"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Δεν διατίθεται κατά τη σύνδεση σε <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Βρίσκεστε στη λειτουργία 16 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Αυτή η ενέργεια θα είχε ως αποτέλεσμα την εκ νέου επαναφορά των εργοστασιακών ρυθμίσεων, καθώς και την επαναφορά της συσκευής στις ρυθμίσεις παραγωγής. Μετά την επιτυχημένη εκκίνηση της συσκευής στο Android, απενεργοποιήστε το OEM ξεκλείδωμα στις Επιλογές για προγραμματιστές. Αν η συσκευή δεν ολοκληρώσει την εκκίνηση στο Android με επιτυχία ή είναι ασταθής, εγκαταστήστε εκ νέου τις πιο πρόσφατες εργοστασιακές εικόνες στη συσκευή από τη διεύθυνση &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ή χρησιμοποιήστε το &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; και επιλέξτε Εκκαθάριση συσκευής, Κλείδωμα προγράμματος φόρτωσης εκκίνησης και Αναγκαστικό flash όλων των διαμερισμάτων."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Λειτουργία 16 KB που δεν εξαρτάται από το μέγεθος σελίδας"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Διαβάστε περισσότερα"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Εκτέλεση εφαρμογής σε λειτουργία συμβατότητας με μέγεθος σελίδας"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Χειρισμός Αναφοράς σφάλματος"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Καθορίζει ποια εφαρμογή διαχειρίζεται τη συντόμευση της Αναφοράς σφάλματος στη συσκευή σας."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Προσωπικό"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ακρόαση ροής"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Σαρώστε τον κωδικό QR μιας ροής ήχου για να ακούσετε με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Δεν είναι δυνατή η επεξεργασία του κωδικού πρόσβασης κατά την κοινή χρήση. Για να αλλάξετε τον κωδικό πρόσβασης, αρχικά, απενεργοποιήστε την κοινή χρήση ήχου."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Ο κωδικός πρόσβασης πρέπει να περιέχει 4-16 χαρακτήρες και να χρησιμοποιεί μόνο γράμματα, αριθμούς και σύμβολα"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Σάρωση κωδικών QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Χρειάζεστε βοήθεια;"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Ρυθμίσεις αναζήτησης"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"επαφές, αποθηκευτικός χώρος, λογαριασμός"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Αποθηκευτικός χώρος επαφών"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Μόνο στη συσκευή"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Οι νέες επαφές δεν θα συγχρονίζονται με κάποιον λογαριασμό"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Οι επαφές θα αποθηκεύονται στη συσκευή σας και θα συγχρονίζονται με τον λογαριασμό σας από προεπιλογή"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Σφάλμα κατά τον ορισμό προεπιλεγμένου λογαριασμού"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Δεν ορίστηκε προεπιλογή"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Μόνο από συσκευή"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Συσκευή και %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Για να ξεκινήσετε, προσθέστε λογαριασμό"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Πού μπορείτε να αποθηκεύσετε επαφές"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Κυκλώστε για αναζήτηση"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Πατήστε παρατεταμένα το κουμπί αρχικής οθόνης ή τη λαβή πλοήγησης, για να κάνετε αναζήτηση χρησιμοποιώντας το περιεχόμενο στην οθόνη σας."</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 53465e70a2f..9cb3e2798a6 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Book"</item>
     <item msgid="8585828346253128384">"Lotus flower"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a4756b2eef2..3a77aee93a7 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"If you turn off Bluetooth, it turns on again the next day"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Pair right ear"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Pair left ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pair your other ear"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Disable Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Disables the Bluetooth LE audio feature if the device supports LE audio hardware capabilities."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio mode"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Enable Bluetooth LE Audio Broadcast UI preview"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Enables the LE Audio Sharing UI preview including personal audio sharing and private broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Show LE Audio toggle in Device details"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bypass Bluetooth LE Audio allowlist"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Use LE Audio by default even if LE Audio peripheral hasn\'t been verified to meet allowlist criteria."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App language"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Suggested languages"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"All languages"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggested"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"All languages"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"All regions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"All numbering systems"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"System language"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"System default"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Language selection for this app isn’t available from Settings."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Change"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s not available"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"This language can’t be used as a system language, but you’ve let apps and websites know that you prefer this language."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Search"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Add a language"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region preference"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Type language name"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"More language settings"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regional preferences"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Set units and number preferences"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Let apps know your regional preferences so that they can personalise your experience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps will use your regional preferences where possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regional preferences"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperature"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"First day of week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbers preferences"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connect to data services when roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roaming charges may apply."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Set automatically"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Location will be used for setting the time zone when this toggle is on"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatic date and time"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Set automatically using your device location, if available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lift finger, then touch sensor again"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Can\'t use fingerprint sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visit a repair provider."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Screen-off Fingerprint Unlock"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use Fingerprint Unlock even when the screen is off"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Screen-off, unlock"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"More security settings"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption and more"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials and more"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Set a pattern for your private space"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lock"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Hide"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirm your private space pattern"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Re-enter your private space PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Re-enter your private space password"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"On"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"External display"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Use external display"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Display resolution"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"External display is disconnected"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Changing rotation or resolution may stop any apps that are currently running"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Your device must be connected to an external display to mirror your screen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"More options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold and drag to rearrange displays."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Check the password and try again"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contact the device manufacturer"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Check connection and try again"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"This Wi‑Fi network isn\'t available at the moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"There\'s a problem with this QR code. Try connecting another way."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choose network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"To connect your device, choose a network"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to \'<xliff:g id="SSID">%1$s</xliff:g>\'?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Learn more about auto-rotate"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Screen resolution"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"High resolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full resolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selected"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colours"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Brightness level"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptive brightness"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"About adaptive brightness"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"On"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Off"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Bedtime mode settings"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modes can also activate Dark theme}=1{{mode_1} also activates Dark theme}=2{{mode_1} and {mode_2} also activate Dark theme}=3{{mode_1}, {mode_2} and {mode_3} also activate Dark theme}other{{mode_1}, {mode_2} and # more also activate Dark theme}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modes settings"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Even dimmer"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dim"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Allow device to go dimmer than usual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Location Services"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Use location"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Use location for time zone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Cannot set the time zone automatically"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Location or Location Services are off"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Location settings"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Fix this"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancel"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Not available when automatic time zone is off"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Location may be used to set time zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"If your device location is available, it may be used to set your time zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="7509900979811934843">"Legal information"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"The keyboard ignores quickly repeated presses of the same key within <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Custom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"custom value"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Adjusts the time that it takes for a key press to activate to <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use the physical keyboard to control the mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Use mouse keys"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mouse keys for <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use the <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> keys to move the mouse pointer"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use the <xliff:g id="CLICK_LABEL">%s</xliff:g> key to click the primary mouse button"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use the <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> key to press and hold the primary mouse button"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use the <xliff:g id="RELEASE_LABEL">%s</xliff:g> key to release the primary mouse button"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use the <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> key to toggle scroll mode. This will make the <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> keys scroll the view top, down, left or right"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use the <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> key to click the secondary mouse button"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad and mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Pointer speed, gestures"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tap to click"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tap dragging"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Bottom-right click"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Click in the bottom right-hand corner of the touchpad for more options"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Pointer speed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Use three-finger tap"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Pointer colour"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Change pointer fill style to black"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Change pointer fill style to green"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Learn touchpad gestures"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, scroll, swipe, right-click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Middle click"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Launch Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Go home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Go back"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"View recent apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Go home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swipe up with three fingers anywhere on your touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Go back"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeat keys"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Delay before repeat"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Repeat rate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold down a key to repeat its character until the key is released"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Text size"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Included packages"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps are running normally"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Battery replacement recommended"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Battery capacity and charging performance are reduced, and battery replacement is recommended."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Battery level low"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Turn on Battery Saver to extend battery life"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Improve battery life"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\'9.00 a.m. – 5.00 p.m. weekdays\'"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Calendar events"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is active}=2{{mode_1} and {mode_2} are active}=3{{mode_1}, {mode_2} and {mode_3} are active}other{{mode_1}, {mode_2} and # more are active}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode can turn on automatically}other{# modes can turn on automatically}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Not set"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Disabled"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Got it"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duration"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, events &amp; reminders"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Finished"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Settings"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"No visuals or sound from notifications"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"No sound from notifications"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Current setting)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Use the same sounds as your personal profile"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"After unlocking, go directly to last used screen. Notifications won’t show on lock screen. Swipe down from top to see them."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"When work profile is locked"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lock screen notification minimalism"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Show fewer notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Show only new notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatically remove previously viewed notifications from the lock screen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications on lock screen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default and silent"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default and silent"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Show all work notification content"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hide sensitive work content"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to be displayed?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profile notifications"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App notifications"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"When you receive many notifications within a short time, your device will lower its volume and minimise alerts for up to 2 minutes. Calls, alarms and priority conversations are not affected. \n\nNotifications received during the cooldown can be found by pulling down from the top of the screen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Apply to work profiles"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Apply to work profile apps"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Bundled notifications"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"On"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Use notification bundling"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Conversations settings"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people that you choose here can still reach you through those apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Contacts settings"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Starred contacts settings"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"None"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"None"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (work)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculating…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Apps settings"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps that can interrupt"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Create a mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Custom mode"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mode name"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Mode name cannot be empty"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Choose an icon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Calendar events"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Bedtime routine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"While driving"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Full-screen notifications"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Allow full-screen notifications from this app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls or other urgent notifications."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Write system preferences"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Allow this app to modify system preferences on your behalf"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"This permission allows an app to modify core system preferences."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media management apps"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Allow app to manage media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestures"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Quickly open camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Flip camera for selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigation mode"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellite messaging"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send and receive text messages by satellite. Included with your account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send and receive text messages by satellite. Not included with your account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellite messaging"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"About satellite messaging"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"You can send and receive text messages by satellite as part of an eligible <xliff:g id="CARRIER_NAME">%1$s</xliff:g> account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Your <xliff:g id="CARRIER_NAME">%1$s</xliff:g> plan"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellite messaging is included with your account"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellite messaging isn’t included with your account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Learn more"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"How it works"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"After your phone connects to a satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellite messaging may take longer and is only available in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn’t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your operator for details."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"More about satellite messaging"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Can\'t turn on <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"To turn on <xliff:g id="FUNCTION">%1$s</xliff:g>, first end the satellite connection"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellite connectivity"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access point names"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"You are in the 16 KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work. In order to re-enter the production mode, you must switch back to 4 KB mode and then lock the bootloader of the device. This would factory reset the device again and restore it to production settings. Once the device successfully boots into Android, disable OEM unlocking in Developer options. If the device fails to boot into Android or is unstable, re-flash the device with the latest factory images from &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB page-agnostic mode"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Read more"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Run app with page size compat mode"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the bug report shortcut on your device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Listen to stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan an audio stream QR code to listen with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Can\'t edit password while sharing. To change the password, first turn off audio sharing."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Your password must contain 4–16 characters and use only letters, numbers and symbols"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR code scanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Need help?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Touch and hold the home button or the navigation handle to search using the content on your screen."</string>
 </resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 46824328a70..19cf1b9cddb 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Book"</item>
     <item msgid="8585828346253128384">"Lotus flower"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index edb33d5c27d..91a186298fb 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"If you turn off Bluetooth, it turns on again the next day"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Pair right ear"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Pair left ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pair your other ear"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Disable Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Disables Bluetooth LE audio feature if the device supports LE audio hardware capabilities."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio mode"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Enable Bluetooth LE Audio Broadcast UI preview"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Enables the LE Audio Sharing UI preview including personal audio sharing and private broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Show LE audio toggle in Device Details"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bypass Bluetooth LE Audio Allowlist"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Use LE Audio by default even if LE Audio peripheral hasn\'t been verified to meet Allowlist criteria."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App language"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Suggested languages"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"All languages"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggested"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"All languages"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"All regions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"All numbering systems"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"System language"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"System default"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Language selection for this app isn’t available from Settings."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Change"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s not available"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"This language can’t be used as a system language, but you’ve let apps and websites know you prefer this language."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Search"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Add a language"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region preference"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Type language name"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"More language settings"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regional preferences"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Set units and number preferences"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Let apps know your regional preferences so they can personalize your experience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps will use your regional preferences where possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regional preferences"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperature"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"First day of week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbers preferences"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connect to data services when roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roaming charges may apply."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Set automatically"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Location will be used for setting the time zone when this toggle is on"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatic date and time"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Set automatically using your device location, if available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lift finger, then touch sensor again"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Can’t use fingerprint sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visit a repair provider."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Screen-off Fingerprint Unlock"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use Fingerprint Unlock even when the screen is off"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Screen-off, Unlock"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"More security settings"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption, and more"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials, and more"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Set a pattern for your private space"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lock"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Hide"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirm your private space pattern"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Re-enter your private space PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Re-enter your private space password"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"On"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"External Display"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Built-in display"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Use external display"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Display resolution"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"External display is disconnected"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Changing rotation or resolution may stop any apps that are currently running"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Your device must be connected to an external display to mirror your screen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"More options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold and drag to rearrange displays."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Check the password and try again"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contact the device manufacturer"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Check connection and try again"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"This Wi‑Fi network isn’t available right now"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"There’s a problem with this QR code. Try connecting another way."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choose network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"To connect your device, choose a network"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Learn more about auto-rotate"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Screen resolution"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"High resolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full resolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Max resolution"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Max resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selected"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colors"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Brightness level"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptive brightness"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"About adaptive brightness"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"On"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Off"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Bedtime mode settings"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modes can also activate dark theme}=1{{mode_1} also activates dark theme}=2{{mode_1} and {mode_2} also activate dark theme}=3{{mode_1}, {mode_2}, and {mode_3} also activate dark theme}other{{mode_1}, {mode_2}, and # more also activate dark theme}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modes settings"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Even dimmer"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dim"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Allow device to go dimmer than usual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Location services"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Location services"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Use location"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Use location for time zone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Cannot set the time zone automatically"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Location or Location Services are off"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Location settings"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Fix this"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancel"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Not available when automatic time zone is off"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Location may be used to set time zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"If your device location is available, it may be used to set your time zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="7509900979811934843">"Legal information"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Physical keyboard layout picker"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"The keyboard ignores quickly repeated presses of the same key within <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time your keyboard ignores repeated key presses"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Custom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"custom value"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Adjusts the time it takes for a key press to activate to <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use the physical keyboard to control the mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Use mouse keys"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mouse keys for <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use the <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> keys to move the mouse pointer"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use the <xliff:g id="CLICK_LABEL">%s</xliff:g> key to click the primary mouse button"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use the <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> key to press &amp; hold the primary mouse button"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use the <xliff:g id="RELEASE_LABEL">%s</xliff:g> key to release the primary mouse button"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use the <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> key to toggle scroll mode. This will make the <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> keys scroll the view top, down, left or right"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use the <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> key to click the secondary mouse button"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad &amp; mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Pointer speed, gestures"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tap to click"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tap dragging"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Bottom-right click"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Click in the bottom right corner of the touchpad for more options"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Pointer speed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Use three finger tap"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Pointer color"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Change pointer fill style to black"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Change pointer fill style to green"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Learn touchpad gestures"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Middle click"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Launch Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Go home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Go back"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"View recent apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Go home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swipe up with three fingers anywhere on your touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Go back"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, Bounce keys, Mouse keys"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeat Keys"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Delay before repeat"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Repeat Rate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold down a key to repeat its character until the key is released"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Text size"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Custom options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background color"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Included packages"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps are running normally"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Battery replacement recommended"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Battery capacity and charging performance are reduced, and battery replacement is recommended."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Battery level low"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Turn on Battery Saver to extend battery life"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Improve battery life"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 AM - 5 PM weekdays\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Calendar events"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is active}=2{{mode_1} and {mode_2} are active}=3{{mode_1}, {mode_2}, and {mode_3} are active}other{{mode_1}, {mode_2}, and # more are active}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode can turn on automatically}other{# modes can turn on automatically}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Not set"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Disabled"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Got it"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duration"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, events &amp; reminders"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Done"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Settings"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"No visuals or sound from notifications"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"No sound from notifications"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Current setting)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Use the same sounds as your personal profile"</string>
@@ -3586,8 +3635,14 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"After unlocking, go directly to last used screen. Notifications won’t show on lock screen. Swipe down from top to see them."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"When work profile is locked"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lock screen notification minimalism"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Show fewer notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Show only new notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatically remove previously viewed notifications from the lock screen"</string>
+    <string name="lock_screen_notifs_show_full_list" msgid="6767009263807771108">"Full list"</string>
+    <string name="lock_screen_notifs_full_list_desc" msgid="4868489278443057427">"The current default placement is a full shelf and notification stack."</string>
+    <string name="lock_screen_notifs_show_compact" msgid="1133598661314460528">"Compact"</string>
+    <string name="lock_screen_notifs_compact_desc" msgid="2442594880539709057">"New notifications are collapsed into a shelf on your lockscreen."</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications on lock screen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default, and silent"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default, and silent"</string>
@@ -3605,6 +3660,10 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Show all work notification content"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hide sensitive work content"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to show?"</string>
+    <string name="lock_screen_notification_hide_seen_title" msgid="6356324850662946426">"Hide seen notifications"</string>
+    <string name="lock_screen_notification_hide_seen_summary" msgid="8345971177658888274">"Seen notifications are removed from the lock screen."</string>
+    <string name="lock_screen_notification_hide_silent_title" msgid="3284314455767315329">"Hide silent notifications"</string>
+    <string name="lock_screen_notification_hide_silent_summary" msgid="1934066619526795468">"Silent notifications and conversations are removed from the lock screen."</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profile notifications"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App notifications"</string>
@@ -3695,6 +3754,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"When you receive many notifications within a short time, your device will lower its volume and minimize alerts for up to 2 minutes. Calls, alarms, and priority conversations are not affected. \n\nNotifications received during the cooldown can be found by pulling down from the top of the screen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Apply to work profiles"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Apply to work profile apps"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Bundled notifications"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"On"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Use notification bundling"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3867,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Conversations settings"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people you choose here can still reach you through those apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
@@ -3826,6 +3891,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Contacts settings"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Starred contacts settings"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"None"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"None"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
@@ -3855,6 +3922,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Work)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculating…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Apps settings"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps that can interrupt"</string>
@@ -3897,6 +3965,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Create a mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Custom mode"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mode name"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Mode name cannot be empty"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Choose an icon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Calendar events"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Bedtime routine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"While driving"</string>
@@ -4151,6 +4221,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Full-screen notifications"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Allow full-screen notifications from this app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls, or other urgent notifications."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Write system preferences"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Allow this app to modify system preferences on your behalf"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"This permission allows an app to modify core system preferences."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media management apps"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Allow app to manage media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media."</string>
@@ -4396,6 +4469,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestures"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Quickly open camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Double tap power button"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Use double tap"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Double Tap Power Button"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Open Camera"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Access Camera"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Open Wallet"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Access Wallet"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Flip camera for selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigation mode"</string>
@@ -4793,11 +4873,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellite messaging"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send and receive text messages by satellite. Included with your account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send and receive text messages by satellite. Not included with your account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellite messaging"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"About satellite messaging"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satellite messaging, satellite connectivity"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"About <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"You can send and receive text messages by satellite as part of an eligible <xliff:g id="CARRIER_NAME">%1$s</xliff:g> account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Your <xliff:g id="CARRIER_NAME">%1$s</xliff:g> plan"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellite messaging is included with your account"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Messaging is included with your account"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellite messaging isn’t included with your account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Learn More"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"How it works"</string>
@@ -4805,10 +4885,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"After your phone connects to a satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellite messaging may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn’t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your carrier for details."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"More about satellite messaging"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn’t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact <xliff:g id="CARRIER_NAME">%1$s</xliff:g> for details."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"More about <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Can’t turn on <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"To turn on <xliff:g id="FUNCTION">%1$s</xliff:g>, first end the satellite connection"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellite connectivity"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satellite connectivity"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satellite connectivity"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satellite messaging"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Use of data is included with your account"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satellite SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Message with emergency services when you can’t connect to a mobile or Wi‑Fi network"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satellite sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"About Satellite SOS"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"You can message with emergency services and share your location when you can’t connect to a mobile or Wi-Fi network. This service may not be available at all times in all locations or circumstances."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Call or text emergency services"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Answer questions about the emergency"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Follow steps to connect to the satellite"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"If you don’t have a mobile network, you’ll see an option to use Satellite SOS"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Send answers to emergency services to get you the right kind of help"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Once you’re connected, you can message with emergency services"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Try a demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"When you connect with emergency services by satellite, your name, email, phone number, location, device information (IMEI, language, model, battery level), and emergency contact information are shared with emergency services and satellite service providers. \n\nTo use Satellite SOS, Google Messages must be your default SMS app. \n\nIf automatic network selection is off, it will be turned on, and your device will automatically connect to any network."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Sharing preferences"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Emergency contacts"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Your Google Account"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Review or update info that will be shared with emergency services"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access Point Names"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5098,8 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"You are in the 16KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work. In order to re-enter the production mode, you must, switch back to 4KB mode and then lock the bootloader of the device. This would factory reset the device again and restore it to production settings. After the device successfully boots into Android, disable OEM unlocking in Developer options. If the device fails to boot into Android or is unstable, re-flash the device with the latest factory images from &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; and select \'Wipe Device\', \'Lock Bootloader\' and \'Force Flash all partitions\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB Page-agnostic Mode"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Read more"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Run app with page size compat mode"</string>
+    <string name="enable_16k_app_compat_details" msgid="3389401258168314266">"App will be run in page size compatibility mode on 16 KB device when toggled."</string>
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the Bug Report shortcut on your device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5538,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Listen to stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan an audio stream QR code to listen with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Can\'t edit password while sharing. To change the password, first turn off audio sharing."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Your password must contain 4-16 characters and use only letters, numbers and symbols"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR code scanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Need help?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Search Settings"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Touch and hold the Home button or the navigation handle to search using the content on your screen."</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 53465e70a2f..9cb3e2798a6 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Book"</item>
     <item msgid="8585828346253128384">"Lotus flower"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 79ee114e56a..0754610a8c5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"If you turn off Bluetooth, it turns on again the next day"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Pair right ear"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Pair left ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pair your other ear"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Disable Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Disables the Bluetooth LE audio feature if the device supports LE audio hardware capabilities."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio mode"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Enable Bluetooth LE Audio Broadcast UI preview"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Enables the LE Audio Sharing UI preview including personal audio sharing and private broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Show LE Audio toggle in Device details"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bypass Bluetooth LE Audio allowlist"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Use LE Audio by default even if LE Audio peripheral hasn\'t been verified to meet allowlist criteria."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App language"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Suggested languages"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"All languages"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggested"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"All languages"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"All regions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"All numbering systems"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"System language"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"System default"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Language selection for this app isn’t available from Settings."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Change"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s not available"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"This language can’t be used as a system language, but you’ve let apps and websites know that you prefer this language."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Search"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Add a language"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region preference"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Type language name"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"More language settings"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regional preferences"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Set units and number preferences"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Let apps know your regional preferences so that they can personalise your experience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps will use your regional preferences where possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regional preferences"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperature"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"First day of week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbers preferences"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connect to data services when roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roaming charges may apply."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Set automatically"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Location will be used for setting the time zone when this toggle is on"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatic date and time"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Set automatically using your device location, if available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lift finger, then touch sensor again"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Can\'t use fingerprint sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visit a repair provider."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Screen-off Fingerprint Unlock"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use Fingerprint Unlock even when the screen is off"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Screen-off, unlock"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"More security settings"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption and more"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials and more"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Set a pattern for your private space"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lock"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Hide"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirm your private space pattern"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Re-enter your private space PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Re-enter your private space password"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"On"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"External display"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Use external display"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Display resolution"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"External display is disconnected"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Changing rotation or resolution may stop any apps that are currently running"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Your device must be connected to an external display to mirror your screen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"More options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold and drag to rearrange displays."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Check the password and try again"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contact the device manufacturer"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Check connection and try again"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"This Wi‑Fi network isn\'t available at the moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"There\'s a problem with this QR code. Try connecting another way."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choose network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"To connect your device, choose a network"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to \'<xliff:g id="SSID">%1$s</xliff:g>\'?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Learn more about auto-rotate"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Screen resolution"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"High resolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full resolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selected"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colours"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Brightness level"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptive brightness"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"About adaptive brightness"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"On"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Off"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Bedtime mode settings"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modes can also activate Dark theme}=1{{mode_1} also activates Dark theme}=2{{mode_1} and {mode_2} also activate Dark theme}=3{{mode_1}, {mode_2} and {mode_3} also activate Dark theme}other{{mode_1}, {mode_2} and # more also activate Dark theme}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modes settings"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Even dimmer"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dim"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Allow device to go dimmer than usual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Location Services"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Use location"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Use location for time zone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Cannot set the time zone automatically"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Location or Location Services are off"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Location settings"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Fix this"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancel"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Not available when automatic time zone is off"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Location may be used to set time zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"If your device location is available, it may be used to set your time zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="7509900979811934843">"Legal information"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"The keyboard ignores quickly repeated presses of the same key within <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Custom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"custom value"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Adjusts the time that it takes for a key press to activate to <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use the physical keyboard to control the mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Use mouse keys"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mouse keys for <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use the <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> keys to move the mouse pointer"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use the <xliff:g id="CLICK_LABEL">%s</xliff:g> key to click the primary mouse button"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use the <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> key to press and hold the primary mouse button"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use the <xliff:g id="RELEASE_LABEL">%s</xliff:g> key to release the primary mouse button"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use the <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> key to toggle scroll mode. This will make the <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> keys scroll the view top, down, left or right"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use the <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> key to click the secondary mouse button"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad and mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Pointer speed, gestures"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tap to click"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tap dragging"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Bottom-right click"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Click in the bottom right-hand corner of the touchpad for more options"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Pointer speed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Use three-finger tap"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Pointer colour"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Change pointer fill style to black"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Change pointer fill style to green"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Learn touchpad gestures"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, scroll, swipe, right-click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Middle click"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Launch Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Go home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Go back"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"View recent apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Go home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swipe up with three fingers anywhere on your touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Go back"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeat keys"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Delay before repeat"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Repeat rate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold down a key to repeat its character until the key is released"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Text size"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Included packages"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps are running normally"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Battery replacement recommended"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Battery capacity and charging performance are reduced, and battery replacement is recommended."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Battery level low"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Turn on Battery Saver to extend battery life"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Improve battery life"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\'9.00 a.m. – 5.00 p.m. weekdays\'"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Calendar events"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is active}=2{{mode_1} and {mode_2} are active}=3{{mode_1}, {mode_2} and {mode_3} are active}other{{mode_1}, {mode_2} and # more are active}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode can turn on automatically}other{# modes can turn on automatically}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Not set"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Disabled"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Got it"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duration"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, events &amp; reminders"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Finished"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Settings"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"No visuals or sound from notifications"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"No sound from notifications"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Current setting)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Use the same sounds as your personal profile"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"After unlocking, go directly to last used screen. Notifications won’t show on lock screen. Swipe down from top to see them."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"When work profile is locked"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lock screen notification minimalism"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Show fewer notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Show only new notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatically remove previously viewed notifications from the lock screen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications on lock screen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default and silent"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default and silent"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Show all work notification content"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hide sensitive work content"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to be displayed?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profile notifications"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App notifications"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"When you receive many notifications within a short time, your device will lower its volume and minimise alerts for up to 2 minutes. Calls, alarms and priority conversations are not affected. \n\nNotifications received during the cooldown can be found by pulling down from the top of the screen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Apply to work profiles"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Apply to work profile apps"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Bundled notifications"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"On"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Use notification bundling"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Conversations settings"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people that you choose here can still reach you through those apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Contacts settings"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Starred contacts settings"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"None"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"None"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (work)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculating…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Apps settings"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps that can interrupt"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Create a mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Custom mode"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mode name"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Mode name cannot be empty"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Choose an icon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Calendar events"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Bedtime routine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"While driving"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Full-screen notifications"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Allow full-screen notifications from this app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls or other urgent notifications."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Write system preferences"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Allow this app to modify system preferences on your behalf"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"This permission allows an app to modify core system preferences."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media management apps"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Allow app to manage media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestures"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Quickly open camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Flip camera for selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigation mode"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellite messaging"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send and receive text messages by satellite. Included with your account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send and receive text messages by satellite. Not included with your account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellite messaging"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"About satellite messaging"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"You can send and receive text messages by satellite as part of an eligible <xliff:g id="CARRIER_NAME">%1$s</xliff:g> account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Your <xliff:g id="CARRIER_NAME">%1$s</xliff:g> plan"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellite messaging is included with your account"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellite messaging isn’t included with your account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Learn more"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"How it works"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"After your phone connects to a satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellite messaging may take longer and is only available in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn’t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your operator for details."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"More about satellite messaging"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Can\'t turn on <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"To turn on <xliff:g id="FUNCTION">%1$s</xliff:g>, first end the satellite connection"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellite connectivity"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access point names"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"You are in the 16 KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work. In order to re-enter the production mode, you must switch back to 4 KB mode and then lock the bootloader of the device. This would factory reset the device again and restore it to production settings. Once the device successfully boots into Android, disable OEM unlocking in Developer options. If the device fails to boot into Android or is unstable, re-flash the device with the latest factory images from &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB page-agnostic mode"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Read more"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Run app with page size compat mode"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the bug report shortcut on your device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Listen to stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan an audio stream QR code to listen with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Can\'t edit password while sharing. To change the password, first turn off audio sharing."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Your password must contain 4–16 characters and use only letters, numbers and symbols"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR code scanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Need help?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Touch and hold the home button or the navigation handle to search using the content on your screen."</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 53465e70a2f..9cb3e2798a6 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Book"</item>
     <item msgid="8585828346253128384">"Lotus flower"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ca0f8e17473..835744575d7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"If you turn off Bluetooth, it turns on again the next day"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Pair right ear"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Pair left ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pair your other ear"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Disable Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Disables the Bluetooth LE audio feature if the device supports LE audio hardware capabilities."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio mode"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Enable Bluetooth LE Audio Broadcast UI preview"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Enables the LE Audio Sharing UI preview including personal audio sharing and private broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Show LE Audio toggle in Device details"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bypass Bluetooth LE Audio allowlist"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Use LE Audio by default even if LE Audio peripheral hasn\'t been verified to meet allowlist criteria."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App language"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Suggested languages"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"All languages"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggested"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"All languages"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"All regions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"All numbering systems"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"System language"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"System default"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Language selection for this app isn’t available from Settings."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Change"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s not available"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"This language can’t be used as a system language, but you’ve let apps and websites know that you prefer this language."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Search"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Add a language"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Region preference"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Type language name"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"More language settings"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regional preferences"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Set units and number preferences"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Let apps know your regional preferences so that they can personalise your experience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps will use your regional preferences where possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regional preferences"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperature"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"First day of week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbers preferences"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connect to data services when roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roaming charges may apply."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Set automatically"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Location will be used for setting the time zone when this toggle is on"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatic date and time"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Set automatically using your device location, if available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lift finger, then touch sensor again"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Can\'t use fingerprint sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visit a repair provider."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Screen-off Fingerprint Unlock"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use Fingerprint Unlock even when the screen is off"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Screen-off, unlock"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"More security settings"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption and more"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials and more"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Set a pattern for your private space"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lock"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Hide"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirm your private space pattern"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Re-enter your private space PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Re-enter your private space password"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"On"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"External display"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Use external display"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Display resolution"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"External display is disconnected"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Changing rotation or resolution may stop any apps that are currently running"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Your device must be connected to an external display to mirror your screen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"More options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold and drag to rearrange displays."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Check the password and try again"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contact the device manufacturer"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Check connection and try again"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"This Wi‑Fi network isn\'t available at the moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"There\'s a problem with this QR code. Try connecting another way."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choose network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"To connect your device, choose a network"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to \'<xliff:g id="SSID">%1$s</xliff:g>\'?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Learn more about auto-rotate"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Screen resolution"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"High resolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full resolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selected"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colours"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Brightness level"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptive brightness"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"About adaptive brightness"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"On"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Off"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Bedtime mode settings"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modes can also activate Dark theme}=1{{mode_1} also activates Dark theme}=2{{mode_1} and {mode_2} also activate Dark theme}=3{{mode_1}, {mode_2} and {mode_3} also activate Dark theme}other{{mode_1}, {mode_2} and # more also activate Dark theme}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modes settings"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Even dimmer"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dim"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Allow device to go dimmer than usual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Location Services"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Use location"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Use location for time zone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Cannot set the time zone automatically"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Location or Location Services are off"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Location settings"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Fix this"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancel"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Not available when automatic time zone is off"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Location may be used to set time zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"If your device location is available, it may be used to set your time zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="7509900979811934843">"Legal information"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"The keyboard ignores quickly repeated presses of the same key within <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Custom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"custom value"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Adjusts the time that it takes for a key press to activate to <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use the physical keyboard to control the mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Use mouse keys"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mouse keys for <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use the <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> keys to move the mouse pointer"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use the <xliff:g id="CLICK_LABEL">%s</xliff:g> key to click the primary mouse button"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use the <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> key to press and hold the primary mouse button"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use the <xliff:g id="RELEASE_LABEL">%s</xliff:g> key to release the primary mouse button"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use the <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> key to toggle scroll mode. This will make the <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> keys scroll the view top, down, left or right"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use the <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> key to click the secondary mouse button"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad and mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Pointer speed, gestures"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tap to click"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tap dragging"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Bottom-right click"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Click in the bottom right-hand corner of the touchpad for more options"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Pointer speed"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Use three-finger tap"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Pointer colour"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Change pointer fill style to black"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Change pointer fill style to green"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Learn touchpad gestures"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, scroll, swipe, right-click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Middle click"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Launch Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Go home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Go back"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"View recent apps"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Go home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swipe up with three fingers anywhere on your touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Go back"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeat keys"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Delay before repeat"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Repeat rate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold down a key to repeat its character until the key is released"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Text size"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Included packages"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps are running normally"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Battery replacement recommended"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Battery capacity and charging performance are reduced, and battery replacement is recommended."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Battery level low"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Turn on Battery Saver to extend battery life"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Improve battery life"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\'9.00 a.m. – 5.00 p.m. weekdays\'"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Calendar events"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is active}=2{{mode_1} and {mode_2} are active}=3{{mode_1}, {mode_2} and {mode_3} are active}other{{mode_1}, {mode_2} and # more are active}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode can turn on automatically}other{# modes can turn on automatically}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Not set"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Disabled"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Got it"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duration"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, events &amp; reminders"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Finished"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Settings"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"No visuals or sound from notifications"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"No sound from notifications"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Current setting)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Use the same sounds as your personal profile"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"After unlocking, go directly to last used screen. Notifications won’t show on lock screen. Swipe down from top to see them."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"When work profile is locked"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lock screen notification minimalism"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Show fewer notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Show only new notifications on lock screen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatically remove previously viewed notifications from the lock screen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications on lock screen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default and silent"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default and silent"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Show all work notification content"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hide sensitive work content"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to be displayed?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profile notifications"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App notifications"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"When you receive many notifications within a short time, your device will lower its volume and minimise alerts for up to 2 minutes. Calls, alarms and priority conversations are not affected. \n\nNotifications received during the cooldown can be found by pulling down from the top of the screen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Apply to work profiles"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Apply to work profile apps"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Bundled notifications"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"On"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Use notification bundling"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Conversations settings"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people that you choose here can still reach you through those apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Contacts settings"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Starred contacts settings"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"None"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"None"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (work)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculating…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Apps settings"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps that can interrupt"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Create a mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Custom mode"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mode name"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Mode name cannot be empty"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Choose an icon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Calendar events"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Bedtime routine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"While driving"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Full-screen notifications"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Allow full-screen notifications from this app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls or other urgent notifications."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Write system preferences"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Allow this app to modify system preferences on your behalf"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"This permission allows an app to modify core system preferences."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media management apps"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Allow app to manage media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestures"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Quickly open camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Flip camera for selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigation mode"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellite messaging"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send and receive text messages by satellite. Included with your account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send and receive text messages by satellite. Not included with your account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellite messaging"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"About satellite messaging"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"You can send and receive text messages by satellite as part of an eligible <xliff:g id="CARRIER_NAME">%1$s</xliff:g> account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Your <xliff:g id="CARRIER_NAME">%1$s</xliff:g> plan"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellite messaging is included with your account"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellite messaging isn’t included with your account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Learn more"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"How it works"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Your phone will auto-connect to a satellite. For the best connection, keep a clear view of the sky."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"After your phone connects to a satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellite messaging may take longer and is only available in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn’t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your operator for details."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"More about satellite messaging"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Can\'t turn on <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"To turn on <xliff:g id="FUNCTION">%1$s</xliff:g>, first end the satellite connection"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellite connectivity"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access point names"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"You are in the 16 KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work. In order to re-enter the production mode, you must switch back to 4 KB mode and then lock the bootloader of the device. This would factory reset the device again and restore it to production settings. Once the device successfully boots into Android, disable OEM unlocking in Developer options. If the device fails to boot into Android or is unstable, re-flash the device with the latest factory images from &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB page-agnostic mode"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Read more"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Run app with page size compat mode"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the bug report shortcut on your device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Listen to stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan an audio stream QR code to listen with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Can\'t edit password while sharing. To change the password, first turn off audio sharing."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Your password must contain 4–16 characters and use only letters, numbers and symbols"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR code scanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Need help?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Touch and hold the home button or the navigation handle to search using the content on your screen."</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 87affa0575f..0ed369a4de1 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -246,9 +246,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎Connect to data services when roaming‎‏‎‎‏‎"</string>
     <string name="roaming_disable" msgid="729512894708689604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎Connect to data services when roaming‎‏‎‎‏‎"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎Roaming charges may apply.‎‏‎‎‏‎"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎Set time automatically‎‏‎‎‏‎"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎Set automatically‎‏‎‎‏‎"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎Location will be used for setting the time zone when this toggle is on‎‏‎‎‏‎"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎Automatic date and time‎‏‎‎‏‎"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎Set automatically using your network and wireless signals‎‏‎‎‏‎"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎Automatic time zone‎‏‎‎‏‎"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎Set automatically based on mobile networks near you‎‏‎‎‏‎"</string>
+    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎Set automatically using your device location, if available. An active Wifi connection may also be required.‎‏‎‎‏‎"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎Use locale default‎‏‎‎‏‎"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎Use 24-hour format‎‏‎‎‏‎"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎Time‎‏‎‎‏‎"</string>
@@ -657,6 +659,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎Set a pattern for your private space‎‏‎‎‏‎"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎Lock‎‏‎‎‏‎"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎Hide‎‏‎‎‏‎"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎Confirm your private space pattern‎‏‎‎‏‎"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎Re-enter your private space PIN‎‏‎‎‏‎"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎Re-enter your private space password‎‏‎‎‏‎"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ fingerprints‎‏‎‎‏‎"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎You’ve added the maximum number of fingerprints‎‏‎‎‏‎"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎Can’t add more fingerprints‎‏‎‎‏‎"</string>
@@ -1024,6 +1029,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎Check the password and try again‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎Contact the device manufacturer‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎Check connection and try again‎‏‎‎‏‎"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎This Wi‑Fi network isn’t available right now‎‏‎‎‏‎"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎There’s a problem with this QR code. Try connecting another way.‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎Choose network‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎To connect your device, choose a network‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎Add this device to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”?‎‏‎‎‏‎"</string>
@@ -1623,7 +1630,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎Location services‎‏‎‎‏‎"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎Location services‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎Use location‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎Use location for time zone‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎Cannot set the time zone automatically‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎Location or Location Services are off‎‏‎‎‏‎"</string>
@@ -1634,11 +1641,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎Location settings‎‏‎‎‏‎"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎Fix this‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎Cancel‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎Automatic time zone is off‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎Not available when automatic time zone is off‎‏‎‎‏‎"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎Location may be used to set time zone‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎If your device location is available, it may be used to set your time zone‎‏‎‎‏‎"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎View legal info, status, software version‎‏‎‎‏‎"</string>
     <string name="legal_information" msgid="7509900979811934843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎Legal information‎‏‎‎‏‎"</string>
     <string name="manual" msgid="3651593989906084868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎Manual‎‏‎‎‏‎"</string>
@@ -1939,13 +1946,18 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎Accessibility‎‏‎‎‏‎"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎Physical keyboard‎‏‎‎‏‎"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎Bounce keys‎‏‎‎‏‎"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎The keyboard ignores quickly repeated presses of the same key within ‎‏‎‎‏‏‎<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎The keyboard ignores quickly repeated presses of the same key‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎Bounce key threshold‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎Choose the duration of time your keyboard ignores repeated key presses‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎0.2s‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎0.4s‎‏‎‎‏‎"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎0.6s‎‏‎‎‏‎"</string>
     <string name="slow_keys" msgid="2891452895499690837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎Slow keys‎‏‎‎‏‎"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎Adjusts the time it takes for a key press to activate to ‎‏‎‎‏‏‎<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms‎‏‎‎‏‎"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎Adjusts the time it takes for a key press to activate‎‏‎‎‏‎"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎Sticky keys‎‏‎‎‏‎"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎Press one key at a time for shortcuts instead of holding keys down together‎‏‎‎‏‎"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎Mouse keys‎‏‎‎‏‎"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎Use the physical keyboard to control the mouse.‎‏‎‎‏‎"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎Use your keyboard to control the pointer‎‏‎‎‏‎"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎Keyboard shortcuts‎‏‎‎‏‎"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎Show list of shortcuts‎‏‎‎‏‎"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎Work profile keyboards &amp; tools‎‏‎‎‏‎"</string>
@@ -2014,6 +2026,8 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎Choose a new key for ‎‏‎‎‏‏‎<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎:‎‏‎‎‏‎"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎Physical keyboard accessibility‎‏‎‎‏‎"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎Sticky keys, Bounce keys, Mouse keys‎‏‎‎‏‎"</string>
+    <string name="keyboard_repeat_key_title" msgid="3641350808120194549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎Repeat Keys‎‏‎‎‏‎"</string>
+    <string name="keyboard_repeat_key_summary" msgid="3970350989341158854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎Hold down a key to repeat its character until the key is released‎‏‎‎‏‎"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="IME_LABEL">%s</xliff:g>‎‏‎‎‏‏‏‎ layout‎‏‎‎‏‎"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎Default‎‏‎‎‏‎"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎Automatic: ‎‏‎‎‏‏‎<xliff:g id="LAYOUT_LABEL">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -2418,7 +2432,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎Preview‎‏‎‎‏‎"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎Standard options‎‏‎‎‏‎"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎Language‎‏‎‎‏‎"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎Text size‎‏‎‎‏‎"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎Caption size‎‏‎‎‏‎"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎Caption style‎‏‎‎‏‎"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎Custom options‎‏‎‎‏‎"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎Background color‎‏‎‎‏‎"</string>
@@ -3509,15 +3523,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎Got it‎‏‎‎‏‎"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎Notifications‎‏‎‎‏‎"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎Duration‎‏‎‎‏‎"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎Messages, events &amp; reminders‎‏‎‎‏‎"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎Done‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎Settings‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎No visuals or sound from notifications‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎No sound from notifications‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed.‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎(Current setting)‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎Change Do Not Disturb notification settings?‎‏‎‎‏‎"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎Work profile sounds‎‏‎‎‏‎"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎Use personal profile sounds‎‏‎‎‏‎"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎Use the same sounds as your personal profile‎‏‎‎‏‎"</string>
@@ -3586,6 +3591,8 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎After unlocking, go directly to last used screen. Notifications won’t show on lock screen. Swipe down from top to see them.‎‏‎‎‏‎"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎Lock screen, Lockscreen, Skip, Bypass‎‏‎‎‏‎"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎When work profile is locked‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎Lock screen notification minimalism‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎Show fewer notifications on lock screen‎‏‎‎‏‎"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎Show only new notifications on lock screen‎‏‎‎‏‎"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎Automatically remove previously viewed notifications from the lock screen‎‏‎‎‏‎"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎Notifications on lock screen‎‏‎‎‏‎"</string>
@@ -3803,6 +3810,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎priority conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎1 conversation‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎# conversations‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎Conversations settings‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎Who can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎Even if messaging or calling apps can\'t notify you, people you choose here can still reach you through those apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎Calls‎‏‎‎‏‎"</string>
@@ -3826,6 +3834,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎Contacts settings‎‏‎‎‏‎"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎Starred contacts settings‎‏‎‎‏‎"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎None‎‏‎‎‏‎"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎None‎‏‎‎‏‎"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎Alarms‎‏‎‎‏‎"</string>
@@ -3855,6 +3865,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_LABEL">%s</xliff:g>‎‏‎‎‏‏‏‎ (Work)‎‏‎‎‏‎"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎Calculating…‎‏‎‎‏‎"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎Apps settings‎‏‎‎‏‎"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎+‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎Allow apps to override‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎Apps that can interrupt‎‏‎‎‏‎"</string>
@@ -3897,6 +3908,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎Create a mode‎‏‎‎‏‎"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎Custom mode‎‏‎‎‏‎"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎Mode name‎‏‎‎‏‎"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎Mode name cannot be empty‎‏‎‎‏‎"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎Choose an icon‎‏‎‎‏‎"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎Calendar events‎‏‎‎‏‎"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎Bedtime routine‎‏‎‎‏‎"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎While driving‎‏‎‎‏‎"</string>
@@ -5436,4 +5449,11 @@
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎QR code scanner‎‏‎‎‏‎"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎"<annotation id="link">"‎‏‎‎‏‏‏‎Need help?‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="homepage_search" msgid="6759334912284663559">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎Search Settings‎‏‎‎‏‎"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎contacts, storage, account‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎Contacts storage‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎Device only‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎New contacts won\'t be synced with an account‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎Contacts will be saved to your device and synced to your account by default‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎No default set‎‏‎‎‏‎"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎Add an account to get started‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-feminine/strings.xml b/res/values-es-feminine/strings.xml
new file mode 100644
index 00000000000..be7b1febced
--- /dev/null
+++ b/res/values-es-feminine/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya estás conectada a una red VPN. Si te conectas a otra, esta sustituirá a la VPN actual."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona un perfil de VPN para permanecer conectada de forma continua. Solo se permitirá el tráfico de red cuando estés conectada a esta red VPN."</string>
+    <string name="vpn_disconnected" msgid="7694522069957717501">"Desconectada de la VPN"</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietaria"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Administradora"</string>
+</resources>
diff --git a/res/values-es-masculine/strings.xml b/res/values-es-masculine/strings.xml
new file mode 100644
index 00000000000..3f83551d5f5
--- /dev/null
+++ b/res/values-es-masculine/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya estás conectado a una red VPN. Si te conectas a otra, esta sustituirá a la VPN actual."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona un perfil de VPN para permanecer conectado de forma continua. Solo se permitirá el tráfico de red cuando estés conectado a esta red VPN."</string>
+    <string name="vpn_disconnected" msgid="7694522069957717501">"Desconectado de la VPN"</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietario"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
+</resources>
diff --git a/res/values-es-neuter/strings.xml b/res/values-es-neuter/strings.xml
new file mode 100644
index 00000000000..80cfb485113
--- /dev/null
+++ b/res/values-es-neuter/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya te has conectado a una red VPN. Si te conectas a otra, esta sustituirá a la VPN actual."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona un perfil de VPN para mantener la conexión de forma continua. Solo se permitirá el tráfico de red cuando tengas conexión a esta red VPN."</string>
+    <string name="vpn_disconnected" msgid="7694522069957717501">"Te has desconectado de la VPN"</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietario"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
+</resources>
diff --git a/res/values-es-rUS-feminine/strings.xml b/res/values-es-rUS-feminine/strings.xml
new file mode 100644
index 00000000000..50813fc0b49
--- /dev/null
+++ b/res/values-es-rUS-feminine/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ahora estás a # paso de convertirte en desarrolladora.}other{Ahora estás a # pasos de convertirte en desarrolladora.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"¡Ya eres desarrolladora!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"No es necesario. Ya eres desarrolladora."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya estás conectada a una VPN. Si te conectas a otra, se reemplazará la VPN actual."</string>
+    <string name="vpn_always_on_summary" msgid="2171252372476858166">"Mantente siempre conectada a la VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando estés conectada a esta VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietaria"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Administradora"</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invitada (tú)"</string>
+    <string name="zen_mode_inspiration_bedtime" msgid="6294822414181670666">"Despiértate con totalmente descansada"</string>
+</resources>
diff --git a/res/values-es-rUS-masculine/strings.xml b/res/values-es-rUS-masculine/strings.xml
new file mode 100644
index 00000000000..ddbc9ae2f12
--- /dev/null
+++ b/res/values-es-rUS-masculine/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ahora estás a # paso de convertirte en desarrollador.}other{Ahora estás a # pasos de convertirte en desarrollador.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"¡Ya eres desarrollador!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"No es necesario. Ya eres desarrollador."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya estás conectado a una VPN. Si te conectas a otra, se reemplazará la VPN actual."</string>
+    <string name="vpn_always_on_summary" msgid="2171252372476858166">"Mantente siempre conectado a la VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando estés conectado a esta VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietario"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invitado (tú)"</string>
+    <string name="zen_mode_inspiration_bedtime" msgid="6294822414181670666">"Despiértate con totalmente descansado"</string>
+</resources>
diff --git a/res/values-es-rUS-neuter/strings.xml b/res/values-es-rUS-neuter/strings.xml
new file mode 100644
index 00000000000..f85ba6216e5
--- /dev/null
+++ b/res/values-es-rUS-neuter/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ahora estás a # paso de activar las opciones para desarrolladores.}other{Ahora estás a # pasos de activar las opciones para desarrolladores.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"¡Se activaron las opciones para desarrolladores!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"No es necesario, ya se activaron las opciones para desarrolladores."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Ya te conectaste a una VPN. Si te conectas a otra, se reemplazará la VPN actual."</string>
+    <string name="vpn_always_on_summary" msgid="2171252372476858166">"Mantén siempre conexión a la VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando tengas conexión a esta VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Propietario"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invitado (tú)"</string>
+    <string name="zen_mode_inspiration_bedtime" msgid="6294822414181670666">"Despiértate con un 100% de energía"</string>
+</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 607d9d73eb6..a19ff4b325b 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Copo de nieve"</item>
     <item msgid="7952183800501346803">"Sombrilla"</item>
     <item msgid="799139025758265891">"Herramientas de taller"</item>
-    <item msgid="1330084588359129896">"Tienda"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rollo de película"</item>
     <item msgid="5827426100157335512">"Libro"</item>
     <item msgid="8585828346253128384">"Flor de loto"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 076a83f5f16..cde8ced448d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincular dispositivo nuevo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar automáticamente mañana"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Si desactivas el Bluetooth, se vuelve a activar al día siguiente"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Vincular aud. der."</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Vincular aud. izq."</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Vincula el otro audífono"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Inhabilitar Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Inhabilita la función Bluetooth LE Audio si el dispositivo admite funciones de hardware de ese tipo."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Habilitar la versión preliminar de la IU de transmisión de Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Habilita la versión preliminar de la IU de uso compartido de LE Audio, que incluye el uso compartido de audio personal y la transmisión privada"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Botón LE Audio en Detalles del dispositivo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omitir lista de dispositivos permitidos de Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usar LE Audio de forma predeterminada incluso si no se verificó si el periférico de LE Audio cumple con los criterios de la lista de dispositivos permitidos"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma de la app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas sugeridos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos los idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugerencias"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos los idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas las regiones"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos los sistemas de numeración"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma del sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Predeterminado del sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La selección de idioma para esta app no está disponible en Configuración."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Cambiar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s no está disponible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Este idioma no se puede usar como idioma del sistema, pero permitiste que las apps y los sitios web sepan que lo prefieres."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Búsqueda"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Agregar un idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferencia de región"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Nombre del idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Más parámetros de configuración de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferencias regionales"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Establece tus preferencias de unidades y números"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permite que las apps sepan tus preferencias regionales para que puedan personalizar la experiencia."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Las apps usarán tus preferencias regionales cuando sea posible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferencias regionales"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primer día de la semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferencias de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Es posible que se apliquen cargos de roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Establecer la hora automáticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Establecer automáticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Se usará la ubicación para establecer la zona horaria cuando el botón de activación esté habilitado"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Se establecen automáticamente con la red y las señales inalámbricas"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zona horaria automática"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Configurar automáticamente según las redes móviles cercanas"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Se establecen automáticamente con la ubicación del dispositivo (si está disponible)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levanta el dedo y vuelve a tocar el sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"No se puede usar el sensor de huellas dactilares"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Consulta a un proveedor de reparaciones."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueo con huellas dactilares con la pantalla apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Usa el Desbloqueo con huellas dactilares incluso cuando la pantalla está apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Pantalla apagada, desbloquear"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Más parámetros de seguridad"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueo del perfil de trabajo, encriptación y más"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encriptación, credenciales y más"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Patrón para tu espacio privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloqueo"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma el patrón de tu espacio privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Vuelve a ingresar el PIN de tu espacio privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Vuelve a ingresar la contraseña de tu espacio privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas dactilares"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Agregaste la cantidad máxima permitida de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden agregar más huellas digitales"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activado"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desactivado"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Pantalla externa"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar pantalla externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolución de pantalla"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Pantalla externa desconectada"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Cambiar la rotación o la resolución puede detener cualquier app que se esté ejecutando en ese momento"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"El dispositivo debe estar conectado a una pantalla externa para duplicar tu pantalla"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Más opciones"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Mantén presionado y arrastra para reorganizar las pantallas."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplicar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Revisa la contraseña y vuelve a intentarlo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Comunícate con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comprueba la conexión y vuelve a intentarlo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta red Wi-Fi no está disponible en este momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Hay un problema con este código QR. Intenta conectarte de otra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Elegir una red"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Selecciona una red para conectar tu dispositivo"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"¿Agregar este dispositivo a \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Más información sobre girar automáticamente"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolución de pantalla"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolución"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Máxima resolución"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"La máxima resolución consume más batería. Es posible que, si cambias la resolución, algunas apps se reinicien."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seleccionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Automáticos"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivel de brillo"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brillo automático"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Acerca del brillo automático"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"El brillo de la pantalla se ajustará automáticamente según el entorno y las actividades que hagas. Puedes mover el control deslizante para que la función de brillo automático reconozca tus preferencias."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Inhabilitado"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Configuración del Modo hora de dormir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Los modos también pueden activar el tema oscuro}=1{{mode_1} también activa el tema oscuro}=2{{mode_1} y {mode_2} también activan el tema oscuro}=3{{mode_1}, {mode_2} y {mode_3} también activan el tema oscuro}other{{mode_1}, {mode_2} y otros # modos también activan el tema oscuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Configuración de los modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Aún más tenue"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Atenuación extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permite que el dispositivo se atenúe más que de costumbre"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tiempo de espera de la pantalla"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Servicios de ubicación"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Servicios de ubicación"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usar ubicación"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar la ubicación para la zona horaria"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"No se puede establecer la zona horaria automát."</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"La ubicación o los Servicios de ubicación están desactivados"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Configuración de la ubicación"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corregir"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horaria automática está desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"No disponible cuando la zona horaria automática está desactivada"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Se puede usar la ubicación para configurar la zona horaria"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Si la ubicación del dispositivo está disponible, se puede usar para establecer la zona horaria"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="7509900979811934843">"Información legal"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opciones"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilidad"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Rechazo de teclas"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"El teclado ignora las presiones de la misma tecla repetidas con rapidez dentro de los <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"El teclado ignora las presiones repetidas con rapidez de la misma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Umbral de rechazo de teclas"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Elige el intervalo de tiempo en el que el teclado ignora las presiones repetidas"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta el tiempo que lleva activar la presión de una tecla a <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta el tiempo que lleva activar la presión de una tecla"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas especiales"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Presiona una tecla a la vez para hacer la combinación de teclas en lugar de presionarlas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas del mouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa el teclado físico para controlar el mouse"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas del mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa el teclado para controlar el puntero"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplazamiento invertido del mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplázate hacia arriba para bajar la página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Intercambiar los botones izquierdo y derecho"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa el botón izquierdo del mouse como el derecho"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas del mouse para <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Usa las teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover el puntero del mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Usa la tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para hacer clic con el botón principal del mouse"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Usa la tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para presionar y mantener presionado el botón principal del mouse"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Usa la tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar el botón principal del mouse"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Usa la tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para activar o desactivar el modo de desplazamiento. Eso hará que las teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> desplacen la vista hacia arriba, abajo, la izquierda o la derecha"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Usa la tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para hacer clic en el botón secundario del mouse"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Combinaciones de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de combinaciones de teclas"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados y herramientas del perfil de trabajo"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predeterminado"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Panel táctil"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Panel táctil y mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidad del puntero, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Presionar para hacer clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tocar y arrastrar"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic de la parte inferior derecha"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Más opciones en la esquina inferior derecha del panel táctil"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidad del puntero"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Presionar con tres dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Color del puntero"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Cambia el estilo de relleno a negro"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Cambia el estilo de relleno a verde"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Aprende los gestos del panel táctil"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"panel táctil, panel, táctil,mouse, cursor, desplazar, deslizar, hacer clic con el botón derecho, clic, puntero"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"hacer clic con el botón derecho, presionar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic central"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar Asistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ir a la pantalla principal"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Atrás"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver apps recientes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ir a la pantalla principal"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Desliza hacia arriba con tres dedos en el panel táctil"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Atrás"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidad del teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas especiales, rechazo de teclas, teclas del mouse"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetición de teclas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Tiempo para repetición"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Frecuencia de repetición"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mantener presionada una tecla para repetir su carácter hasta que se suelte la tecla"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Diseño <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminadas"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automático: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamaño del texto"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamaño de los subtítulos"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo de los subtítulos"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opciones personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fondo"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar el uso de energía"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquetes incluidos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Las apps se ejecutan con normalidad"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Se recomienda reemplazar la batería"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Se redujo la capacidad de la batería y el rendimiento de carga, y se recomienda reemplazarla."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nivel de batería bajo"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activa el Ahorro de batería para extender la duración de la batería"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Mejora la duración de la batería"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"¿Deseas desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Borrar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"¿Reemplazar VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar la VPN siempre activa?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"De 9 a.m. a 5 p.m. los días de semana\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos de calendario"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} está activo}=2{{mode_1} y {mode_2} están activos}=3{{mode_1}, {mode_2} y {mode_3} están activos}other{{mode_1}, {mode_2} y # modos más están activos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modo se puede activar automáticamente}other{# modos se pueden activar automáticamente}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{No interrumpir}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2} y {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Sin establecer"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Inhabilitado"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Entendido"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificaciones"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duración"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensajes, eventos y recordatorios"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. También puedes ajustar la configuración de los mensajes para permitir que amigos, familiares y otros contactos se comuniquen contigo."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Listo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Configuración"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Notificaciones sin sonido ni elementos visuales"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Notificaciones sin sonido"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"No verás ni oirás notificaciones. Sí se permiten las llamadas de contactos destacados y emisores repetidos."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Configuración actual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"¿Quieres cambiar la configuración de notificaciones de No interrumpir?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sonidos del perfil de trabajo"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usa los sonidos del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usa los mismos sonidos que el perfil personal"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Después del desbloqueo, ir a la última pantalla usada. No se mostrarán notificaciones en la pantalla de bloqueo. Desliza desde arriba para verlas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla bloqueada, bloqueo de pantalla, omitir, omisión"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Con el perfil de trabajo bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Reduce las notificaciones en la pantalla de bloqueo"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostrar menos notificaciones en la pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar solo notificaciones nuevas en la pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Quitar automáticamente las notificaciones ya vistas de la pantalla de bloqueo"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificaciones en pantalla de bloqueo"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostrar conversaciones predeterminadas y silenciosas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversaciones predeterminadas y silenciosas"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar el contenido de notificaciones de trabajo"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ocultar contenido de trabajo confidencial"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"¿Cómo deseas ver las notificaciones de perfil cuando esté bloqueado el dispositivo?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificaciones de perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificaciones de apps"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Cuando recibas muchas notificaciones en un intervalo de tiempo corto, el dispositivo bajará el volumen y minimizará las alertas por un máximo de 2 minutos. Las llamadas, alarmas y conversaciones prioritarias no se verán afectadas. \n\nPuedes ver las notificaciones que recibas durante la reducción de sonido deslizando hacia abajo desde la parte superior de la pantalla."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar a perfiles de trabajo"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplicar a apps del perfil de trabajo"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificaciones agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activado"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desactivado"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usa el agrupamiento de notificaciones"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Las notificaciones con temas similares se silenciarán y agruparán para brindarte una experiencia más silenciosa. La agrupación anulará la configuración de notificaciones de una app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicio de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna app instalada solicitó que se la ejecutara como servicio de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Quieres permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Configuración de conversaciones"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quiénes pueden interrumpir"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Incluso si las apps de mensajería o llamadas no pueden enviarte notificaciones, las personas que selecciones aquí podrán comunicarse contigo mediante esas apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Configuración de contactos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Configuración de contactos destacados"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ninguna"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nadie"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 otras # apps pueden interrumpir}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (trabajo)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculando…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Configuración de las apps"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que las apps anulen No interrumpir"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps que pueden interrumpir"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea un modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nombre del modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"El nombre del modo no puede estar vacío"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Selecciona un ícono"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos de calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Hora de dormir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Mientras conduces"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificaciones de pantalla completa"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir notificaciones de pantalla completa de esta app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permite que esta app muestre notificaciones que ocupan toda la pantalla cuando el dispositivo está bloqueado. Las apps pueden usarlas para destacar alarmas, llamadas entrantes y otras notificaciones urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Escribe preferencias del sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permite que esta app modifique las preferencias del sistema en tu nombre"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Permite que una app modifique las preferencias principales del sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps de administración de multimedia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir que la app administre contenido multimedia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Si lo permites, esta app puede modificar o borrar archivos multimedia creados con otras apps sin preguntarte. La app debe tener permiso para acceder a los archivos y al contenido multimedia."</string>
@@ -4396,6 +4481,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir cámara rápidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir la cámara rápidamente, presiona dos veces el botón de encendido. Funciona desde cualquier pantalla."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Presiona dos veces el botón de encendido"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Usar la opción de presionar dos veces"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Presiona dos veces el botón de encendido"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Abrir Cámara"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Acceder a Cámara"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Abrir la Billetera"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Acceder a la Billetera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Girar cámara para selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegación"</string>
@@ -4793,11 +4885,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensajería satelital"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envía y recibe mensajes de texto a través de satélites (incluido con tu cuenta)."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envía y recibe mensajes de texto a través de satélites No se incluye con tu cuenta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensajería satelital"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Información sobre la mensajería satelital"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Puedes enviar y recibir mensajes de texto por satélite como parte de una cuenta de <xliff:g id="CARRIER_NAME">%1$s</xliff:g> apta"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Tu plan de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"La mensajería satelital está incluida con tu cuenta"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"La mensajería satelital no está incluida con tu cuenta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Más información"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cómo funciona"</string>
@@ -4805,10 +4900,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Tu teléfono se conectará automáticamente a un satélite. Para tener una mejor conexión, mantén una vista clara del cielo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Luego de que tu teléfono se conecta a un satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Puedes enviar mensajes de texto a quien quieras, incluidos los servicios de emergencia. Tu teléfono se volverá a conectar a la red móvil cuando esté disponible."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"La mensajería satelital podría demorar más y solo está disponible en ciertas áreas. El clima y ciertas estructuras podrían afectar su conexión. Las llamadas satelitales no están disponibles. Es posible que puedas realizar las llamadas de emergencia.\n\nLos cambios en la cuenta podrían demorar en mostrarse en Configuración. Para obtener más detalles, comunícate con tu operador."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Más información sobre la mensajería satelital"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"No se puede activar <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para activar <xliff:g id="FUNCTION">%1$s</xliff:g>, primero termina la conexión satelital"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectividad satelital"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nombres de puntos de acceso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando el dispositivo está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4913,7 +5055,7 @@
     <string name="network_connection_connecting_message" msgid="433189540877274889">"Conectándose al dispositivo…"</string>
     <string name="bluetooth_left_name" msgid="7440064067910080502">"Izquierdo"</string>
     <string name="bluetooth_right_name" msgid="7588088072444124949">"Derecho"</string>
-    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Funda"</string>
+    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Estuche"</string>
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batería"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Panel de Configuración"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Habilitar ventanas de formato libre"</string>
@@ -4995,6 +5137,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Estás en el modo de 16 KB del modo independiente de la página. No se puede garantizar la integridad del software en este modo, y los datos almacenados en el teléfono podrían estar en riesgo durante el desbloqueo del bootloader. Algunas funciones quedan inhabilitadas en estos modos, así que algunas aplicaciones podrían no ejecutarse. Para volver a entrar al modo de producción, debes volver al modo de 4 KB y bloquear el bootloader del dispositivo. Esta acción restablecerá el dispositivo a la configuración de fábrica y hará que sus parámetros de configuración vuelvan a los de producción. Una vez que el dispositivo se inicie correctamente ejecutando Android, inhabilita el desbloqueo para OEM en Opciones para desarrolladores. Si el dispositivo no se puede iniciar ejecutando Android o si es inestable, actualízalo con las imágenes de fábrica más recientes de &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;, o bien usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; y selecciona \"Limpiar el dispositivo\", \"Bloquear el bootloader\" y \"Forzar la escritura de todas las particiones en la memoria flash\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo independiente de la página de 16 KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Leer más"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Ejecuta la app con el modo de compatibilidad de tamaño de página"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Controlador de informes de errores"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina qué app controla el acceso directo a los informes de errores en el dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5578,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Escuchar reproducción"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Escanea el código QR de una reproducción de audio para escuchar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"No se puede editar la contraseña mientras se está compartiendo. Para cambiar la contraseña, primero desactiva el uso compartido de audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Tu contraseña debe contener entre 4 y 16 caracteres, y solo puede incluir letras, números y símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Escáner de código QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"¿Necesitas ayuda?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Buscar en Configuración"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, almacenamiento, cuenta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Espacio de almacenamiento para Contactos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Solo en dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Los contactos nuevos no se sincronizarán con una cuenta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"De forma predeterminada, los contactos se guardarán en el dispositivo y se sincronizarán con tu cuenta"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Se produjo un error al establecer la cuenta predeterminada"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No hay cuenta predeterminada"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo en dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo y %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Agrega una cuenta para comenzar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dónde guardar los contactos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Busca con un círculo"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Mantén presionado el botón de inicio o la barra de navegación para hacer búsquedas con el contenido de la pantalla."</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 2a48e62e6ee..83143e5178e 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Copo de nieve"</item>
     <item msgid="7952183800501346803">"Sombrilla"</item>
     <item msgid="799139025758265891">"Herramientas del taller"</item>
-    <item msgid="1330084588359129896">"Tienda de campaña"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Carrete vintage"</item>
     <item msgid="5827426100157335512">"Libro"</item>
     <item msgid="8585828346253128384">"Flor de loto"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 53f7eb0a88a..c95f9b89b25 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Emparejar nuevo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar automáticamente mañana"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Si desactivas el Bluetooth, se volverá a activar al día siguiente"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Emparejar derecho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Emparejar izquierdo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Empareja el otro audífono"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Inhabilitar Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Inhabilita la función Bluetooth LE Audio si el dispositivo es compatible con las capacidades de hardware de LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Habilitar vista previa de la interfaz de emisión de Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Habilita la vista previa de la interfaz de usuario de LE Audio para compartir, que incluye las funciones de compartir audio personal y emisión privada"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Mostrar botón LE Audio en Detalles del dispositivo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ignorar lista de permitidos de Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usa LE Audio de forma predeterminada aunque no se haya verificado que el periférico LE Audio cumpla los criterios de la lista de permitidos"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma de la aplicación"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas recomendados"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos los idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugerencias"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos los idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas las regiones"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos los sistemas de numeración"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma del sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Predeterminado del sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La selección de idioma para esta aplicación no está disponible en Ajustes."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Cambiar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s no está disponible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Este idioma no se puede usar como idioma del sistema, pero ahora las aplicaciones y sitios web saben qué idioma prefieres."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Buscar"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Añadir un idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferencia de región"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Escribe el idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Más ajustes de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferencias regionales"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Define preferencias de unidades y números"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permite que las aplicaciones sepan tus preferencias regionales para que puedan personalizar tu experiencia."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Las aplicaciones usarán tus preferencias regionales siempre que sea posible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferencias regionales"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primer día de la semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferencias de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conectarse a servicios de datos en roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conectarse a servicios de datos en roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Es posible que se apliquen cargos por roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Establecer hora automáticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Establecer automáticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Se usará la ubicación para definir la zona horaria cuando este interruptor esté activado"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Se establece automáticamente mediante tu red y señales inalámbricas"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zona horaria automática"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Se establece automáticamente según las redes móviles cercanas"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Se establece automáticamente usando la ubicación de tu dispositivo, si está disponible"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levanta el dedo y vuelve a tocar el sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"No se puede usar el sensor de huellas digitales"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visita un proveedor de reparaciones."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueo con huella digital con la pantalla apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Usa Desbloqueo con huella digital incluso con la pantalla apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Pantalla apagada, desbloqueo"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Más ajustes de seguridad"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueo del perfil de trabajo, cifrado y más"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Cifrado, credenciales y más"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Configura un patrón para espacio privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma el patrón del espacio privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Vuelve a introducir el PIN del espacio privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Vuelve a introducir la contraseña del espacio privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Has añadido el número máximo de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden añadir más huellas digitales"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activada"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desactivada"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Pantalla externa"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Pantalla integrada"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar pantalla externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolución de pantalla"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"La pantalla externa está desconectada"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Si cambias la rotación o la resolución, puede que se detengan las aplicaciones que están en funcionamiento"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Tu dispositivo debe estar conectado a una pantalla externa para proyectar tu pantalla"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Más opciones"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Mantén pulsado y arrastra las pantallas para reorganizarlas."</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>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Comprueba que la contraseña sea correcta y vuelve a intentarlo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Ponte en contacto con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comprueba la conexión y vuelve a intentarlo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta red Wi-Fi no está disponible en este momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Hay un problema con este código QR. Prueba a conectarte de otra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Elegir red"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Elige una red para conectar tu dispositivo"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"¿Añadir este dispositivo a \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Más información sobre el giro automático"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolución de pantalla"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolución"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolución completa"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"La resolución completa consume más batería. Cambiar la resolución puede provocar que algunas aplicaciones se reinicien."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Resolución máxima"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"La resolución máxima consume más batería. Cambiar la resolución puede provocar que algunas aplicaciones se reinicien."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seleccionado"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptativos"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivel de brillo"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brillo adaptativo"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Acerca del brillo adaptativo"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"El brillo de la pantalla se ajustará automáticamente según el entorno y lo que hagas. Puedes mover el control deslizante para que la función Brillo adaptativo reconozca tus preferencias."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desactivado"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Ajustes del modo Descanso"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Los modos también pueden activar el tema oscuro}=1{{mode_1} también activa el tema oscuro}=2{{mode_1} y {mode_2} también activan el tema oscuro}=3{{mode_1}, {mode_2} y {mode_3} también activan el tema oscuro}other{{mode_1}, {mode_2} y # más también activan el tema oscuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Ajustes de modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Más tenue"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Atenuación extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permite que el dispositivo se atenúe más de lo normal"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tiempo de espera de la pantalla"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1623,7 +1647,7 @@
     <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. Esto se puede usar para, por ejemplo, mejorar las funciones y servicios basados en la ubicación."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servicios de ubicación"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Servicios de ubicación"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usar ubicación"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar ubicación para la zona horaria"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"No se puede fijar la zona horaria automáticamente"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"La ubicación o los servicios de ubicación están desactivados"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Ajustes de ubicación"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Solucionar"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horaria automática está desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"No disponible si la zona horaria automática está desactivada"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"La ubicación puede usarse para definir la zona horaria"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Si la ubicación de tu dispositivo está disponible, puede usarse para definir tu zona horaria"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver información legal, estado, versión del software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Información legal"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opciones"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilidad"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de rebote"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"El teclado ignora las pulsaciones rápidas repetidas de la misma tecla hechas en menos de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"El teclado ignora las pulsaciones rápidas repetidas de la misma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Umbral de tecla de rebote"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Elige el tiempo que tu teclado ignora las pulsaciones repetidas de teclas"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta el tiempo que se tarda en activar una pulsación de tecla a <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta el tiempo que se tarda en activar una pulsación de tecla"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas persistentes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Para las combinaciones de teclas, pulsa las teclas de una en una en lugar de mantenerlas pulsadas todas a la vez"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas para el ratón"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa el teclado físico para controlar el ratón"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas de ratón"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa el teclado para controlar el puntero"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplazamiento inverso del ratón"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplázate hacia arriba para mover la página hacia abajo"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Cambiar los botones izquierdo y derecho"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa el botón izquierdo del ratón como el derecho"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas de ratón para <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Usa las teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover el puntero del ratón"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Usa la tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para hacer clic en el botón principal del ratón"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Usa la tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para mantener pulsado el botón principal del ratón"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Usa la tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar el botón principal del ratón"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Usa la tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para activar o desactivar el modo de desplazamiento. Con esta opción, las teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> permiten desplazar la vista hacia arriba, abajo, izquierda o derecha."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Usa la tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para pulsar el botón secundario del ratón"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Combinaciones de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Muestra la lista de combinaciones de teclas"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Perfiles de trabajo y herramientas"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predeterminado"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Panel táctil"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Panel táctil y ratón"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Ratón"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidad del puntero, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tocar para hacer clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tocar y arrastrar"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic en la esquina inferior derecha"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Haz clic en la esquina inferior derecha del panel táctil para ver más opciones"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidad del puntero"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usar toque con tres dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Color del puntero"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Cambiar relleno del puntero a negro"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Cambiar relleno del puntero a verde"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Consultar gestos del panel táctil"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"panel táctil, ratón, cursor, desplazar, deslizar, hacer clic con el botón derecho, clic, puntero"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"hacer clic con el botón derecho, tocar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic central"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar el Asistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ir a Inicio"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Volver"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver aplicaciones recientes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ir a inicio"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Desliza tres dedos hacia arriba en el panel táctil"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Ir atrás"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidad del teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas persistentes, teclas de rebote y teclas para el ratón"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Teclas de repetición"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Tiempo hasta la repetición"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Porcentaje de repetición"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mantén pulsada una tecla para repetir su carácter hasta que la sueltes"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Diseño <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automático: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamaño de la letra"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamaño de los subtítulos"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo de los subtítulos"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opciones personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fondo"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquetes incluidos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Las aplicaciones funcionan con normalidad"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Sustitución de la batería recomendada"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"La capacidad de la batería y el rendimiento de la carga se han reducido, por lo que se recomienda sustituir la batería."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Queda poca batería"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activa Ahorro de batería para que la batería dure más"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Aumenta la duración de la batería"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"¿Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Olvidar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"¿Reemplazar VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar el modo de VPN siempre activada?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"De 9:00 a 17:00 los días laborables\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos del calendario"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} está activo}=2{{mode_1} y {mode_2} están activos}=3{{mode_1}, {mode_2} y {mode_3} están activos}other{{mode_1}, {mode_2} y # más están activos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modo se puede activar automáticamente}other{# modos se pueden activar automáticamente}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{No molestar}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Sin definir"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Inhabilitado"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Entendido"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificaciones"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duración"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensajes, eventos y recordatorios"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otras personas puedan ponerse en contacto contigo."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Hecho"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ajustes"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Notificaciones sin elementos visuales ni sonido"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Notificaciones sin sonido"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"No verás ni escucharás notificaciones. Las llamadas de contactos destacados y de personas que insisten están permitidas."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Configuración actual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"¿Quieres cambiar los ajustes de las notificaciones del modo No molestar?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sonidos del perfil de trabajo"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usar sonidos del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usa los mismos sonidos que tu perfil personal"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Al desbloquear, vuelve a la última pantalla que usaste. No verás notificaciones en la pantalla de bloqueo. Desliza desde arriba para verlas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, pantalla bloqueo, saltar, evitar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Con el perfil de trabajo bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalismo en las notificaciones de la pantalla de bloqueo"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Se muestran menos notificaciones en la pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar solo notificaciones nuevas en la pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Quita automáticamente las notificaciones ya vistas de la pantalla de bloqueo"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificaciones en pantalla de bloqueo"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostrar conversaciones predeterminadas y silenciosas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversaciones predeterminadas y silenciosas"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar todo (notificaciones de trabajo)"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ocultar contenido de trabajo sensible"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"¿Cómo quieres que se muestren las notificaciones del perfil cuando el dispositivo esté bloqueado?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificaciones del perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificaciones de aplicaciones"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Cuando recibas muchas notificaciones en poco tiempo, tu dispositivo bajará el volumen y minimizará las alertas durante un máximo de 2 minutos. Las llamadas, alarmas y conversaciones prioritarias no se verán afectadas. \n\nLas notificaciones recibidas durante ese periodo se pueden encontrar arrastrando hacia abajo la parte superior de la pantalla."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar a perfiles de trabajo"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Se aplica a las aplicaciones del perfil de trabajo"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificaciones agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activado"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desactivado"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usar agrupación de notificaciones"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Las notificaciones con temas similares se silenciarán y se agruparán para que no te molesten. La agrupación anulará los ajustes de notificaciones de las aplicaciones."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicios de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna aplicación instalada ha solicitado ejecutarse como servicio de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Ajustes de conversaciones"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quién puede interrumpirte"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Aunque las aplicaciones de mensajes y llamadas no puedan enviarte notificaciones, las personas que selecciones aquí seguirán pudiendo contactar contigo a través de esas aplicaciones"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Ajustes de contactos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Ajustes de contactos destacados"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ninguna"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nadie"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (trabajo)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculando…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Ajustes de aplicaciones"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que las aplicaciones anulen el modo No molestar"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplicaciones que pueden interrumpirte"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea un modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nombre del modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"El nombre del modo no puede estar vacío"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Selecciona un icono"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos del calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Buenas noches"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Durante la conducción"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificaciones a pantalla completa"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir notificaciones a pantalla completa de esta aplicación"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permite que esta aplicación muestre notificaciones que ocupan toda la pantalla cuando el dispositivo está bloqueado. La aplicación puede usar esta opción para resaltar alarmas, llamadas entrantes u otras notificaciones urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Escribir preferencias del sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permitir que esta aplicación modifique las preferencias del sistema en tu nombre"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Esta opción permite que las aplicaciones modifiquen las preferencias principales del sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplicaciones de gestión de multimedia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir que la aplicación gestione contenido multimedia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Si se lo permites, esta aplicación podrá modificar o eliminar archivos multimedia creados con otras aplicaciones sin pedírtelo explícitamente. La aplicación debe tener permiso para acceder a archivos y contenido multimedia."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir cámara rápidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Cambiar de cámara para hacer selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegación"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensajes por satélite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envía y recibe mensajes de texto por satélite. Incluido con tu cuenta."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envía y recibe mensajes de texto por satélite. No incluido con tu cuenta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensajes por satélite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Acerca de los mensajes por satélite"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Mensajes por satélite, conectividad por satélite"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Acerca de <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Puedes enviar y recibir mensajes de texto por satélite como parte de una cuenta de <xliff:g id="CARRIER_NAME">%1$s</xliff:g> apta"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Tu plan de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Los mensajes por satélite están incluidos en tu cuenta"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Los mensajes están incluidos en tu cuenta"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Los mensajes por satélite no están incluidos en tu cuenta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Más información"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cómo funciona"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Tu teléfono se conectará automáticamente a un satélite. Para obtener la mejor conexión, debes estar en una zona en la que se vea bien el cielo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Cuando tu teléfono se conecte a un satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Puedes intercambiar mensajes de texto con cualquiera, incluidos los servicios de emergencias. Tu teléfono se volverá a conectar a una red móvil cuando esté disponible."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Los mensajes por satélite pueden tardar más y solo están disponibles en ciertas zonas. Las condiciones meteorológicas y algunas estructuras pueden afectar a tu conexión por satélite. Las llamadas por satélite no están disponibles. Puede que las llamadas de emergencia sí funcionen.\n\nLos cambios en tu cuenta pueden tardar un poco en aparecer en Ajustes. Ponte en contacto con tu operador para obtener más información al respecto."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Más información sobre los mensajes por satélite"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Los <xliff:g id="SUBJECT">%1$s</xliff:g> pueden tardar más y solo están disponibles en ciertas zonas. Las condiciones meteorológicas y algunas estructuras pueden afectar a tu conexión por satélite. Las llamadas por satélite no están disponibles. Puede que las llamadas de emergencia sí funcionen.\n\nLos cambios en tu cuenta pueden tardar un poco en aparecer en Ajustes. Ponte en contacto con <xliff:g id="CARRIER_NAME">%1$s</xliff:g> para saber más."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Más información sobre <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"No se puede activar <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para activar <xliff:g id="FUNCTION">%1$s</xliff:g>, primero finaliza la conexión por satélite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectividad por satélite"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Conectividad por satélite"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"conectividad por satélite"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"mensajes por satélite"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"El uso de datos está incluido en tu cuenta"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS por satélite"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Envía mensajes a los servicios de emergencias cuando no puedas conectarte a una red móvil o Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS por satélite, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Acerca de SOS por satélite"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Puedes enviar mensajes a los servicios de emergencias y compartir tu ubicación cuando no puedas conectarte a una red móvil o Wi-Fi. Puede que este servicio no esté disponible en todo momento ni en ciertas ubicaciones o circunstancias."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Llama o envía un mensaje a los servicios de emergencias"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Responde preguntas sobre la emergencia"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Sigue los pasos para conectarte al satélite"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Si no tienes conexión a una red móvil, verás una opción para usar SOS por satélite."</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Envía respuestas a los servicios de emergencias para recibir la ayuda que necesitas"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Una vez que te conectes, puedes enviar mensajes a los servicios de emergencias"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Probar demostración"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Cuando contactas con los servicios de emergencias vía satélite, tu nombre, correo, número de teléfono, ubicación, información del dispositivo (IMEI, idioma, modelo, nivel de la batería) e información de los contactos de emergencia se comparte con los servicios de emergencias y con los proveedores de servicios por satélite. \n\nPara usar SOS por satélite, Mensajes de Google debe ser tu aplicación de SMS predeterminada. \n\nSi la selección automática de red está desactivada, se activará y tu dispositivo se conectará automáticamente a cualquier red."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Preferencias para compartir"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Contactos de emergencia"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Tu cuenta de Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Revisa o actualiza la información que se compartirá con los servicios de emergencias"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nombres de puntos de acceso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Estás en el modo de 16 KB del modo independiente de la página. En este modo no se puede garantizar la integridad del software, y los datos que haya almacenados en el teléfono mientras el bootloader está desbloqueado pueden correr peligro. Algunas funciones se inhabilitarán en estos modos, por lo que es posible que algunas aplicaciones no funcionen. Para volver al modo de producción, debes volver al modo de 4 KB y luego bloquear el bootloader del dispositivo. Esta acción restablecerá de nuevo el estado de fábrica del dispositivo y restaurará los ajustes de producción. Una vez que el dispositivo se inicie correctamente en Android, inhabilita el desbloqueo de OEM en Opciones para desarrolladores. Si el dispositivo no se puede iniciar en Android o es inestable, vuelve a instalar las últimas imágenes de fábrica de &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; o usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; y selecciona Wipe Device (Borrar los datos del dispositivo), Lock Bootloader (Bloquear bootloader) y Force Flash all partitions (Forzar la instalación de todas las particiones)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo independiente de la página de 16 KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Más información"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Ejecutar aplicación con el modo de compatibilidad de tamaño de página"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Controlador de informes de errores"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina qué aplicación controla el acceso directo a los informes de errores del dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5161,7 +5284,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB no está disponible en esta ubicación"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Usar Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread permite conectar tus dispositivos domésticos inteligentes, lo que mejora la eficacia y el rendimiento.\n\n Cuando este ajuste está activado, el dispositivo puede unirse a una red Thread, lo que permite controlar los dispositivos compatibles con Matter a través de este teléfono."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread permite conectar tus dispositivos domésticos inteligentes, lo que mejora la eficiencia y el rendimiento.\n\nCuando este ajuste está activado, este dispositivo puede unirse a una red Thread, lo que permite controlar los dispositivos compatibles con Matter a través de este teléfono."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Más información sobre Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Acceso a la cámara"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Acceso al micrófono"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Escuchar emisión"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Escanea el código QR de una emisión de audio para escucharlo con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"No se puede modificar la contraseña durante el uso compartido. Para cambiarla, primero desactiva la función compartir audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Tu contraseña debe tener entre 4 y 16 caracteres, y solo puedes usar letras, números y símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Escáner de códigos QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"¿Necesitas ayuda?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Buscar ajustes"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, almacenamiento, cuenta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Almacenamiento de los contactos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Solo en el dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Los contactos nuevos no se sincronizarán con ninguna cuenta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Los contactos se guardarán en tu dispositivo y se sincronizarán con tu cuenta de forma predeterminada"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"No se ha podido definir la cuenta predeterminada"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ninguna cuenta predeterminada definida"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo en el dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo y %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Añade una cuenta para empezar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dónde guardar los contactos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Rodea para buscar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Mantén pulsado el botón de inicio o la barra de navegación para buscar usando el contenido de tu pantalla."</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 63bcbc67725..f33792e7164 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Lumehelves"</item>
     <item msgid="7952183800501346803">"Päikesevari"</item>
     <item msgid="799139025758265891">"Õpitoa tööriistad"</item>
-    <item msgid="1330084588359129896">"Telk"</item>
+    <item msgid="8112685757657659269">"Klaver"</item>
     <item msgid="3861584909935022342">"Filmilint"</item>
     <item msgid="5827426100157335512">"Raamat"</item>
     <item msgid="8585828346253128384">"Lootoseõis"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 214cc2b8ff0..d3c5dee3457 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uue seadme sidumine"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Lülita homme automaatselt sisse"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Lülitades Bluetoothi välja, lülitub see järgmine päev sisse"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Seo parempoolne"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Seo vasakpoolne"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Teise kõrva sidumine"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Keela Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Keelab funktsiooni Bluetooth LE Audio, kui seade toetab LE Audio riistvara võimalusi."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio režiim"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio Broadcast UI eelvaate lubamine"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Lubab LE Audio Sharing UI eelvaate, sh isikliku heli jagamise ja privaatse leviedastuse"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Kuva seadme üksikasjades LE Audio lüliti"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio lubamisloendist möödaminek"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audiot kasutatakse vaikimisi isegi siis, kui LE Audio välisseadme vastavust lubamisloendi kriteeriumitele pole kinnitatud."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Rakenduse keel"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Soovitatud keeled"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Kõik keeled"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Soovitatud"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Kõik keeled"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Kõik piirkonnad"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Kõik nummerdamissüsteemid"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Süsteemi keel"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Süsteemi vaikeseade"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Selle rakenduse jaoks pole seadetes keele valimine saadaval."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Muuda"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s pole saadaval"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Seda keelt ei saa süsteemi keelena kasutada, kuid olete teavitanud rakendusi ja veebisaite, et eelistate seda keelt."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Otsing"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Keele lisamine"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Piirkonnaeelistus"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Sisestage keele nimi"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Rohkem keeleseadeid"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Piirkondlikud eelistused"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Ühikute ja numbrite eelistuste määramine"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Esitage rakendustele oma piirkondlikud eelistused, et need saaks teie kasutuskogemust isikupärastada."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Rakendused kasutavad võimaluse korral teie piirkondlikke eelistusi."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Piirkondlikud eelistused"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatuur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Nädala esimene päev"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbrite eelistused"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Rakenduda võivad rändlustasud."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Määra kellaaeg automaatselt"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Määra automaatselt"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Kui lüliti on sisse lülitatud, siis kasutatakse ajavööndi määramiseks seadme asukohta."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automaatne kuupäev ja kellaaeg"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Seadistage automaatselt oma võrgu ja juhtmeta ühenduse signaalide abil"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automaatne ajavöönd"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Seadistage automaatselt enda lähedal olevate mobiilivõrkude põhjal"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Seadistage automaatselt oma seadme asukoha põhjal (kui on saadaval)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Kasuta lokaadi vaikeseadet"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-tunnise vormingu kasutamine"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Kellaaeg"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Tõstke sõrme, seejärel puudutage sõrmejäljeandurit uuesti"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Sõrmejäljeandurit ei saa kasutada"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Külastage remonditeenuse pakkujat."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Väljalülitatud ekraani sõrmejäljega avamine"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Sõrmejäljega avamist kasutatakse ka siis, kui ekraanikuva on välja lülitatud"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Väljalülitatud ekraan, avamine"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Rohkem turvaseadeid"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Tööprofiili lukustus, krüpteerimine ja muu"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Krüpteerimine, mandaadid ja muu"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Määrake oma privaatse ruumi jaoks muster"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lukusta"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Peida"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Kinnitage oma privaatse ruumi muster"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Sisestage oma privaatse ruumi PIN-kood uuesti"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Sisestage oma privaatse ruumi parool uuesti"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Saate lisada kuni <xliff:g id="COUNT">%d</xliff:g> sõrmejälge"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Olete lisanud maksimaalse arvu sõrmejälgi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Rohkem sõrmejälgi ei saa lisada"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Sees"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Väljas"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Väline ekraan"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Sisseehitatud ekraan"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Välise ekraani kasutamine"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ekraani eraldusvõime"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ühendatud on väline ekraan"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Pööramise või eraldusvõime muutmine võib peatada mis tahes rakendused, mis praegu töötavad"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Teie ekraanikuva peegeldamiseks peab teie seade olema ühendatud välise ekraaniga"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Rohkem valikuid"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Kuvade ümberkorraldamiseks hoidke all ja lohistage."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Ülekandmine"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peegeldamine"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Luba juhtmeta ekraaniühendus"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Kontrollige parooli ja proovige uuesti"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Võtke ühendust seadme tootjaga"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Kontrollige ühendust ja proovige uuesti"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"See WiFi-võrk pole praegu saadaval"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Selle QR-koodiga on probleem. Proovige muul viisil ühendada."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Võrgu valimine"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Oma seadme ühendamiseks valige võrk"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Kas lisada see seade võrku „<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Lisateave automaatse pööramise kohta"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekraani eraldusvõime"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Kõrge eraldusvõime"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Täiseraldusvõime"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Täiseraldusvõime kasutab rohkem akut. Eraldusvõime vahetamine võib mõne rakenduse taaskäivitada."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Täiseraldusvõime"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Täiseraldusvõime tarbib rohkem akut. Eraldusvõime muutmine võib mõne rakenduse taaskäivitada."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Valitud"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värvid"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Loomulikud"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Kohanduvad"</string>
     <string name="brightness" msgid="6216871641021779698">"Ereduse tase"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Kohanduv eredus"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Kohanduva ereduse teave"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Teie ekraanikuva eredust kohandatakse automaatselt teie keskkonna ja tegevuste järgi. Võite liugurit käsitsi liigutada, et aidata kohanduval eredusel teie eelistusi õppida."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Sees"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Väljas"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Magamamineku režiimi seaded"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Režiimid võivad samuti tumeda teema aktiveerida}=1{{mode_1} aktiveerib samuti tumeda teema}=2{{mode_1} ja {mode_2} aktiveerivad samuti tumeda teema}=3{{mode_1}, {mode_2} ja {mode_3} aktiveerivad samuti tumeda teema}other{{mode_1}, {mode_2} ja # veel aktiveerivad samuti tumeda teema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Režiimide seaded"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Veelgi hämaram"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Eriti tume"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Luba seadmel hämardada rohkem kui tavaliselt"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekraani ajalõpp"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Asukohateenused"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Asukohateenused"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Kasuta asukohta"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Kasuta ajavööndi seadistamiseks asukohta"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Ei saa ajavööndit automaatselt määrata"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Asukoht või asukohateenused on välja lülitatud"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Asukohaseaded"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Paranda see"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Tühista"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automaatne ajavöönd on välja lülitatud"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Pole saadaval, kui automaatne ajavöönd on välja lülitatud"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Ajavööndi määramiseks võidakse kasutada asukohta"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Kui teie seadme asukoht on saadaval, võidakse seda kasutada teie ajavööndi seadistamiseks"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Vaadake juriidilist teavet, olekut, tarkvara versiooni"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juriidiline teave"</string>
     <string name="manual" msgid="3651593989906084868">"Käsitsi"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Valikud"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Juurdepääsetavus"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Füüsiline klaviatuur"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Põrkeklahvid"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klaviatuur eirab <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms jooksul tehtud sama klahvi korduvaid vajutusi"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviatuur eirab kiiresti tehtud sama klahvi korduvaid vajutusi"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Põrkeklahvi lävi"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Valige kestus, kui kaua teie klaviatuur korduvaid klahvivajutusi eirab"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Kohandatud"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"kohandatud väärtus"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Aeglased klahvid"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Määrab klahvivajutuse aktiveerumiseks kuluva aja väärtusele <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Määrab klahvivajutuse aktiveerumiseks kuluva aja"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Nakkeklahvid"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Otseteede puhul klahvide korraga allhoidmise asemel vajutage klahve ükshaaval"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Hiireklahvid"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Kasutage hiire juhtimiseks füüsilist klaviatuuri."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Hiire klahvide kasutamine"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Kasutage kursori juhtimiseks klaviatuuri"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Hiirega tagurpidi kerimine"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Lehe allapoole liigutamiseks kerige üles"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vasaku ja parema nupu vahetamine"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Kasutage hiire vasakut nuppu parema nupuna"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Hiire klahvid klaviatuuri <xliff:g id="KEYBOARD_NAME">%s</xliff:g> jaoks"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Kasutage klahvi <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> hiire kursori liigutamiseks"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Kasutage klahvi <xliff:g id="CLICK_LABEL">%s</xliff:g> hiire põhinupul klõpsamiseks"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Kasutage klahvi <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> hiire põhinupu pikalt vajutamiseks"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Kasutage klahvi <xliff:g id="RELEASE_LABEL">%s</xliff:g> hiire põhinupu vabastamiseks"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Kasutage klahvi <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> kerimisrežiimi lülitamiseks Selles režiimis saate vaadet klahviga <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> üles, alla, vasakule või paremale kerida"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Kasutage klahvi <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> hiire teisesel nupul klõpsamiseks"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klaviatuuri otseteed"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Kuva otseteede loend"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tööprofiili klaviatuurid ja tööriistad"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Vaikeseade"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Puuteplaat"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Puuteplaat ja hiir"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Hiir"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Kursori kiirus, liigutused"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Klõpsamiseks puudutamine"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Puudutusega lohistamine"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Paremas allnurgas klõpsamine"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Lisavalikute jaoks klõpsake puuteplaadi paremas allnurgas"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kursori kiirus"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Kolme sõrmega topeltpuudutamine"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Hiirekursori värv"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Kursori sisu muutmine mustaks"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Kursori sisu muutmine roheliseks"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Õppige puuteplaadi liigutusi"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"puuteplaat, hiir, kursor, kerimine, pühkimine, sõrmega tõmbamine, paremklõps, klõpsamine"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"paremklõps, puudutamine"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Keskmine klikk"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Käivita assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Avalehele"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Tagasi"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Hiljutiste rakenduste vaatamine"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Avalehele liikumine"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Pühkige puuteplaadil kolme sõrmega üles"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Tagasiliikumine"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valige muuteklahvi <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> jaoks uus klahv:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Füüsilise klaviatuuri juurdepääsetavus"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Nakkeklahvid, põrkeklahvid, hiireklahvid"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Korduvad klahvid"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Viivitus enne kordamist"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Kordusmäär"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hoidke klahvi all, et selle tähemärki kuni klahvi vabastamiseni korrata"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Paigutus: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Vaikeseade"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automaatne: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Eelvaade"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardvalikud"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Keel"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Teksti suurus"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtiitrite suurus"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtiitri stiil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Kohandatud valikud"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Tausta värv"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Reguleerige energiakasutust"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Kaasnevad paketid"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Rakendused töötavad tavapäraselt"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Soovitatav on akuvahetus"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Aku mahutavus ja laadimisvõimsus on vähenenud ning soovitatav on aku välja vahetada."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Akutase on madal"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Lülitage aku tööea pikendamiseks sisse akusäästja"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Pikendage aku tööiga"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Kas soovite katkestada ühenduse selle VPN-iga?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Katkesta ühendus"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versioon"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versioon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Unusta VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Kas asendada olemasolev VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Kas määrata alati sisselülitatud VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„9.00–17.00 tööpäevadel”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalendrisündmused"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} on aktiivne}=2{{mode_1} ja {mode_2} on aktiivsed}=3{{mode_1}, {mode_2} ja {mode_3} on aktiivsed}other{{mode_1}, {mode_2} ja veel # režiimi on aktiivsed}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 režiim võib automaatselt sisse lülituda}other{# režiimi võivad automaatselt sisse lülituda}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Mitte segada}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"SEES"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Määramata"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Keelatud"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Selge"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Märguanded"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Kestus"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Sõnumid, sündmused ja meeldetuletused"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused, välja arvatud teie ülal lubatud üksuste puhul. Võite sõnumite seadeid kohandada, et lubada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Valmis"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Seaded"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Hääletud ja ekraanilt peidetud märguanded"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Hääletud märguanded"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Te ei kuule ega näe märguandeid. Tärniga tähistatud kontaktidelt ja korduvatelt helistajatelt pärit kõned on lubatud."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(praegune seade)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Kas soovite režiimi Mitte segada märguandeseadeid muuta?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Tööprofiili helid"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Kasuta isikliku profiili helisid"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Kasutage samu helisid, mida kasutate oma isikliku profiiliga"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Pärast avamist avaneb viimati kasutatud ekraanikuva. Märguandeid lukustuskuval ei kuvata. Nende nägemiseks pühkige ülaosast alla."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukustuskuva, lukustuskuva, vahelejätmine, mittekasutamine"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kui tööprofiil on lukustatud"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lukustuskuva märguannete minimeerimine"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Lukustuskuval väiksema arvu märguannete kuvamine"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Kuva lukustuskuval ainult uued märguanded"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Eemalda varem vaadatud märguanded lukustuskuvalt automaatselt"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Märguanded lukustuskuval"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Kuva vestluse, vaike- ja hääletud märguanded"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Kuva vestluse, vaike- ja hääletud märguanded"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Kuva tööprofiili märguannete kogu sisu"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Peida tundlik töösisu"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kuidas tuleks profiili märguanded kuvada siis, kui seade on lukus?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profiili märguanded"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Märguanded"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Rakenduste märguanded"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kui saate lühikese aja jooksul palju märguandeid, vähendab teie seade helitugevust ja minimeerib hoiatused kuni kaheks minutiks. See ei mõjuta kõnesid, äratusi ega prioriteetseid vestlusi. \n\nSummutamise ajal saadud märguanded leiate, kui ekraani ülaosast alla tõmbate."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Rakenda tööprofiilidele"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Rakendage tööprofiili rakendustele"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Kogumis märguanded"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Sees"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Väljas"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Kasutage märguannete kogumeid"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Sarnaste teemadega märguanded vaigistatakse ja rühmitatakse vaiksema kogemuse tagamiseks. Kogum alistab rakenduse enda märguandeseaded."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-abilise teenused"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ükski installitud rakendus pole taotlenud VR-abilise teenusena käitamist."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Kas lubada VR-teenuse juurdepääs teenusele <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriteetsed vestlused"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Vestluste seaded"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kes saavad katkestada?"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Isegi kui sõnumside- või helistamisrakendused teid teavitada ei saa, saavad teie siin valitud inimesed teiega nende rakenduste kaudu siiski ühendust võtta."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Kõned"</string>
@@ -3826,6 +3900,8 @@
     <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 kontaktid"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktide seaded"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"tärniga tähistatud kontaktide seaded"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Mitte ükski"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Mitte ükski"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Äratused"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (töö)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Arvutamine …"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Rakenduste seaded"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Luba rakendustel alistada"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Rakendused, mis saavad katkestada"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Režiimi loomine"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Kohandatud režiim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Režiimi nimi"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Režiimi nime väli ei tohi olla tühi"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Valige ikoon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendrisündmused"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Uneaja rutiin"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Sõitmise ajal"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Kogu ekraani katvad märguanded"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Selle rakenduse kogu ekraani katvate märguannete lubamine"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Lubage sellel rakendusel kuvada kogu ekraani katvaid märguandeid, kui seade on lukustatud. Rakendused võivad selle abil tõsta esile alarme, sissetulevaid kõnesid või muid pakilisi märguandeid."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Kirjutage süsteemi eelistused"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Lubage sellel rakendusel teie nimel süsteemieelistusi muuta"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"See luba võimaldab rakendusel muuta põhisüsteemi eelistusi."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Meediahalduse rakendused"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Rakendusel meedia haldamise lubamine"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Kui lubate, saab see rakendus ilma teilt luba küsimata muuta või kustutada muude rakendustega loodud meediafaile. Rakendusel peab olema failidele ja meediale juurdepääsu luba."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Liigutused"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kaamera kiire avamine"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igast kuvast."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Selfi tegemiseks kaamera pööramine"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigeerimisrežiim"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellidipõhine sõnumside"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Tekstisõnumite saatmine ja vastuvõtmine satelliidi kaudu. On teie kontoga lubatud."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Tekstsõnumite saatmine ja vastuvõtmine satelliidi kaudu. Ei sisaldu teie kontos."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellidipõhine sõnumside"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Teave satelliidipõhise sõnumside kohta"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satelliidipõhine sõnumside, satelliidi ühenduvus"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Teave <xliff:g id="SUBJECT">%1$s</xliff:g> kohta"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Saate saata ja vastu võtta tekstisõnumeid satelliidi kaudu, kui teil on sobilik operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g> konto"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Teie operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g> pakett"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellidipõhine sõnumside on teie konto osa"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Sõnumside on teie kontol saadaval"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelliidipõhine sõnumside ei ole teie konto osa"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Lisateave"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Tööpõhimõtted"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Teie telefon ühendatakse satelliidiga automaatselt. Parima ühenduse tagamiseks asuge taeva all."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kui telefon on satelliidiga ühenduse loonud"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Saate sõnumeid saata kellele tahes, sealhulgas hädaabiteenustele. Teie telefon loob uuesti ühenduse mobiilsidevõrguga, kui see on saadaval."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellidipõhine sõnumside võib võtta kauem aega ja on saadaval ainult teatud piirkondades. Ilm ja teatud struktuurid võivad mõjutada teie satelliidiühendust. Satelliidi kaudu helistamine pole saadaval. Hädaabikõned võivad siiski toimida.\n\nKontol tehtud muudatuste jõustumiseks seadetes võib kuluda veidi aega. Lisateavet küsige operaatorilt."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Lisateave satellidipõhise sõnumside kohta"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> võib olla aeglasem ja see on saadaval ainult mõnes piirkonnas. Ilm ja teatud struktuurid võivad mõjutada teie satelliidiühendust. Satelliidi kaudu helistamine pole saadaval. Hädaabikõned võivad siiski toimida.\n\nKontol tehtud muudatuste jõustumiseks seadetes võib kuluda veidi aega. Üksikasju küsige operaatorilt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Lisateave <xliff:g id="SUBJECT">%1$s</xliff:g> kohta"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Funktsiooni <xliff:g id="FUNCTION">%1$s</xliff:g> ei saa sisse lülitada"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Funktsiooni <xliff:g id="FUNCTION">%1$s</xliff:g> sisselülitamiseks katkestage esmalt satelliitühendus"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelliidi ühenduvus"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelliidi ühenduvus"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelliidi ühenduvus"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satelliidipõhine sõnumside"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Andmete kasutamine on teie kontol saadaval"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satelliit-SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Kui teil puudub ühendus mobiilside- või WiFi-võrguga, saatke hädaabiteenustele sõnum"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satelliit-sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Teave satelliit-SOS-i kohta"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Kui te ei saa mobiilside- või WiFi-võrguga ühendust luua, saate hädaabiteenustele sõnumi saata ja oma asukoha öelda. See teenus ei pruugi kõigis asukohtades ega tingimustes alati saadaval olla."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Helistage hädaabiteenustele või saatke sõnum"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Vastake küsimustele hädaolukorra kohta"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Järgige satelliidiga ühenduse loomise juhiseid"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Kui teil puudub ühendus mobiilsidevõrguga, kuvatakse teile satelliit-SOS-i kasutamise valik"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Saatke hädaabiteenustele vastused, et saada õiget liiki abi"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kui teil on ühendus, saate hädaabiteenustele sõnumi saata"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Proovi demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kui võtate hädaabiteenustega ühendust satelliitside abil, jagatakse teie nime, e-posti aadressi, telefoninumbrit, asukohta, seadme teavet (IMEI, keel, mudel, akulaetuse tase) ja hädaolukorra kontakti teavet hädaabiteenuste ja satelliitsideteenuste pakkujatega. \n\nSatelliit-SOS-i kasutamiseks peab teie SMS-vaikerakendus olema Google Messages. \n\nKui automaatne võrgu valimine on välja lülitatud, lülitatakse see sisse ja teie seade loob automaatselt ühenduse mis tahes võrguga."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Jagamiseelistused"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Hädaolukorra kontaktid"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Teie Google’i konto"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Vaadake hädaabiteenustega jagatav teave üle või värskendage seda"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Pääsupunktide nimed"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Olete lehest sõltumatus 16 kB režiimis. Selles režiimis ei saa garanteerida tarkvara terviklust ja andmed, mis salvestatakse telefoni, kui käivituslaadur on avatud, võivad olla ohus. Mõned funktsioonid on nendes režiimides keelatud, mistõttu ei pruugi kõik rakendused töötada. Selleks et viia seade uuesti tavarežiimile, peate lülituma tagasi 4 kB režiimile ja seejärel lukustama seadme käivituslaaduri. Selle toiminguga lähtestatakse seade jälle tehaseseadetele ja taastatakse tavarežiimi seaded. Pärast seda, kui seade on Androidi käivitanud, keelake arendaja valikutes OEM-tootjaluku avamine. Kui seadmel ei õnnestu Androidi käivitada või see on ebastabiilne, uuendage kogu püsivara uuesti, kasutades tehaseoleku süsteemikujutisi aadressilt &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;, ning tehke valikud „Tühjenda seade“, „Lukusta käivituslaadur“ ja „Sunduuenda kõiki sektsioone“."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Lehest sõltumatu 16 kB režiim"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lisateave"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Käitage rakendust lehe suuruse ühilduvusrežiimis"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Veaaruannete töötleja"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Määrab, milline rakendus kasutab teie seadmes veaaruannete otseteed."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Isiklik"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Kuula voogu"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kuulamiseks skannige helivoo QR-kood"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Parooli ei saa jagamise ajal muuta. Parooli muutmiseks lülitage esmalt heli jagamine välja."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Teie parool peab sisaldama 4–16 tähemärki ning selles tohib kasutada ainult tähti, numbreid ja sümboleid"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-koodi skanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Kas vajate abi?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Otsige seadetest"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktid, salvestusruum, kontod"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktide salvestusruum"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Ainult seade"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Uusi kontakte ei sünkroonita kontoga"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktid salvestatakse teie seadmesse ja sünkroonitakse vaikimisi teie kontoga"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Viga vaikekonto seadistamisel"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ühtegi vaikekontot pole määratud"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Ainult seade"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Seade ja %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lisage alustamiseks konto"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kus kontakte salvestada?"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Ring otsimiseks"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Puudutage pikalt avakuva nuppu või navigeerimispidet, et otsida ekraanil oleva sisu järgi."</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 4ff40acce58..6ff3f1be827 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Elur-maluta"</item>
     <item msgid="7952183800501346803">"Eguzkitakoa"</item>
     <item msgid="799139025758265891">"Lantegiko tresnak"</item>
-    <item msgid="1330084588359129896">"Kanpin-denda"</item>
+    <item msgid="8112685757657659269">"Pianoa"</item>
     <item msgid="3861584909935022342">"Film-bobina"</item>
     <item msgid="5827426100157335512">"Liburua"</item>
     <item msgid="8585828346253128384">"Loto-lorea"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 7d6e54917b3..ea4a029f956 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parekatu beste gailu batekin"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetootha"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktibatu automatikoki bihar"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetootha desaktibatuz gero, biharamunean berraktibatuko da"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Parekatu eskuineko audifonoa"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Parekatu ezkerreko audifonoa"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Parekatu beste audifonoa"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Desgaitu kontsumo txikiko Bluetooth bidezko audioa"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Kontsumo txikiko Bluetooth bidezko audioa darabilten hardware-gaitasunak gailuarekin bateragarriak badira, Kontsumo txikiko Bluetooth bidezko audioa eginbidea desgaitzen du."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Kontsumo txikiko Bluetooth bidezko audioaren modua"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Gaitu kontsumo txikiko Bluetooth bidezko audioa igortzeko erabiltzaile-interfazearen aurrebista"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Kontsumo txikiko Bluetooth bidezko audioa partekatzeko erabiltzaile-interfazearen aurrebista gaitzen du, audio pertsonala partekatzeko eginbidea eta aldi bereko igorpen pribatuak barne"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Erakutsi kontsumo txikiko audioaren etengailua gailuaren xehetasunetan"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ez aplikatu kontsumo txikiko Bluetooth bidezko audioaren baimendutakoen zerrenda"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Erabili kontsumo txikiko audioa modu lehenetsian, hura darabilen gailu periferikoak baimendutakoen zerrendako irizpideak betetzen dituen egiaztatu ez bada ere."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Aplikazioaren hizkuntza"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Iradokitako hizkuntzak"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Hizkuntza guztiak"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Iradokitakoak"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Hizkuntza guztiak"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Lurralde guztiak"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Zenbaki-sistema guztiak"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistemaren hizkuntza"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistemaren balio lehenetsia"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Aplikazioaren hizkuntza hautatzeko aukera ez dago erabilgarri ezarpenetan."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Aldatu"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ez dago erabilgarri"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Hizkuntza hau ezin da erabili sistemaren hizkuntza gisa, baina hura hobesten duzula jakinarazi diezu aplikazio eta webguneei."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Bilaketa"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Gehitu hizkuntza bat"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Lurralde-hobespena"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Adierazi hizkuntza"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Hizkuntza-ezarpen gehiago"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Lurraldeko hobespenak"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Ezarri unitate- eta zenbaki-hobespenak"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Eman lurraldeko hobespenen berri aplikazioei zerbitzuak pertsonaliza ditzaten."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Posible denean, aplikazioek lurraldeko hobespenak erabiliko dituzte."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Lurraldeko hobespenak"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Tenperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Asteko lehen eguna"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Zenbaki-hobespenak"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Baliteke ibiltaritza-kostuak ordaindu behar izatea."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Ezarri ordua automatikoki"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Ezarri automatikoki"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Etengailua aktibatuta dagoenean ordu-zona ezartzeko erabiliko da kokapena"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data eta ordu automatikoak"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Ezarri automatikoki sarea eta hari gabeko seinaleak erabilita"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Ordu-zona automatikoa"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ezarri automatikoki inguruko sare mugikorretan oinarrituta"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Ezarri automatikoki gailuaren kokapena erabilita, halakorik badago"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Erabili lurraldeko ezarpen lehenetsiak"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Erabili 24 orduko formatua"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ordua"</string>
@@ -361,7 +376,7 @@
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Erabili aurpegi bidez desblokeatzeko eginbidea telefonoa desblokeatzeko"</string>
     <string name="security_settings_fingerprint" msgid="6387775386189204201">"Hatz-marka"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Hatz-marka digitala"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Hatz-marka bidez desblokeatzeko eginbidea erabiltzean"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Hatz-marka bidez desblokeatzea erabiltzean"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Lanerako hatz-marka"</string>
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Gehitu hatz-marka bat"</string>
     <string name="security_settings_fingerprint_preference_summary" msgid="8486134175759676037">"{count,plural, =1{1 hatz-marka gehitu da}other{# hatz-marka gehitu dira}}"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Jaso hatza eta sakatu berriro sentsorea"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Ezin da erabili hatz-marken sentsorea"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Joan konponketak egiten dituen hornitzaile baten webgunera edo dendara."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Hatz-marka bidez desblokeatzea pantaila itzalita dagoela"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Erabili Hatz-marka bidez desblokeatzea pantaila itzalita badago ere"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Pantaila itzalita dagoela desblokeatzeko eginbidea"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Segurtasun-ezarpen gehiago"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Laneko profilaren blokeoa, enkriptatzea eta abar"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Enkriptatzea, kredentzialak eta abar"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Ezarri eredu bat eremu pribaturako"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Blokeatu"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ezkutatu"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Berretsi eremu pribatuaren eredua"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Idatzi berriro eremu pribatuaren PINa"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Idatzi berriro eremu pribatuaren pasahitza"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Iritsi zara onartzen den gehieneko hatz-marka kopurura"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ezin duzu gehitu beste hatz-markarik"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aktibatuta"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desaktibatuta"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Kanpoko pantaila"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Erabili kanpoko pantaila"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Pantailaren bereizmena"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Kanpoko pantaila deskonektatuta dago"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Biratzea edo bereizmena aldatuz gero, baliteke abian den aplikazioren bat gelditzea"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Gailuak kanpoko pantaila batera konektatuta egon behar du zure pantaila islatu ahal izateko"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Aukera gehiago"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Pantailak berrantolatzeko, eduki itzazu sakatuta eta arrasta itzazu."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Igorpena"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"islatzea"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Gaitu hari gabeko bistaratzea"</string>
@@ -927,7 +951,7 @@
     <string name="android_beam_explained" msgid="5684416131846701256">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube-ko bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifia"</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_category" msgid="3523464780563778321">"Wifiaren ezarpenak"</string>
     <string name="wifi_select_network" msgid="6692897876718813259">"Hautatu wifi-sarea"</string>
     <string name="wifi_starting" msgid="6147022683967506341">"Wifi-konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="4471699665741299711">"Wi-Fia desaktibatzen…"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Egiaztatu pasahitza eta saiatu berriro"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Jarri harremanetan gailuaren fabrikatzailearekin"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Egiaztatu konexioa eta saiatu berriro"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Wifi-sarea ez dago erabilgarri une honetan"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Arazo bat dago QR kode honekin. Saiatu beste modu batera konektatzen."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Aukeratu sarea"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Gailua konektatzeko, aukeratu sare bat"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Gailu hau gehitu nahi duzu “<xliff:g id="SSID">%1$s</xliff:g>\" sarean?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Lortu automatikoki biratzeko aukerari buruzko informazio gehiago"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Pantailaren bereizmena"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Bereizmen handia"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Bereizmen osoa"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Bereizmen osoarekin bateria gehiago kontsumitzen da. Bereizmena aldatuz gero, baliteke aplikazio batzuk berrabiaraztea."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Hautatuta"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Koloreak"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalak"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Egokituak"</string>
     <string name="brightness" msgid="6216871641021779698">"Distira"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Distira egokitua"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Distira egokituari buruz"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Pantailaren distira automatikoki egokituko da inguruneko argiaren eta egiten ari zarenaren arabera. Eskuz aldatu nahi baduzu distira, mugitu graduatzailea distira egokituak zure hobespenak ikas ditzan."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aktibatuta"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desaktibatuta"</string>
@@ -1283,24 +1310,24 @@
     <string name="dark_ui_auto_mode_never" msgid="3980412582267787662">"Bat ere ez"</string>
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ilunabarretik egunsentira"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ordu jakinetan"</string>
-    <string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"Lo egiteko garaia hastean"</string>
+    <string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"Lotara joateko garaia hastean"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Egoera"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ez da aktibatuko inoiz automatikoki"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ilunabarrean aktibatuko da automatikoki"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"Automatikoki aktibatuko da lo egiteko garaia hastean"</string>
+    <string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"Automatikoki aktibatuko da lotara joateko garaia hastean"</string>
     <string name="dark_ui_summary_off_auto_mode_modes" msgid="2672694802103388896">"<xliff:g id="ID_1">%1$s</xliff:g> hastean aktibatuko da"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ez da inoiz desaktibatuko automatikoki"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Egunsentian desaktibatuko da automatikoki"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on_auto_mode_custom_bedtime" msgid="1976993025762551246">"Automatikoki desaktibatuko da lo egiteko garaia amaitzean"</string>
+    <string name="dark_ui_summary_on_auto_mode_custom_bedtime" msgid="1976993025762551246">"Automatikoki desaktibatuko da lotara joateko garaia amaitzean"</string>
     <string name="dark_ui_summary_on_auto_mode_modes" msgid="7769594183411785087">"<xliff:g id="ID_1">%1$s</xliff:g> amaitzean desaktibatuko da"</string>
     <string name="dark_ui_text" msgid="4392646155331126666">"Gai ilunak atzeko plano beltza erabiltzen du bateriak gehiago iraun dezan pantaila batzuetan. Gai ilunaren programazioak ez dira aktibatzen pantaila itzaltzen den arte."</string>
-    <string name="dark_ui_bedtime_footer_summary" msgid="5576501833145170581">"Une honetan, gai iluna lo egiteko garaiaren moduaren programazioarekin bat dator"</string>
-    <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Lo egiteko garaiaren moduaren ezarpenak"</string>
+    <string name="dark_ui_bedtime_footer_summary" msgid="5576501833145170581">"Une honetan, gai iluna lotara joateko moduaren programazioarekin bat dator"</string>
+    <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Lotara joateko moduaren ezarpenak"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Moduek ere gai iluna aktiba dezakete}=1{{mode_1} moduak ere gai iluna aktibatzen du}=2{{mode_1} eta {mode_2} moduek ere gai iluna aktibatzen dute}=3{{mode_1}, {mode_2} eta {mode_3} moduek ere gai iluna aktibatzen dute}other{{mode_1}, {mode_2} eta beste # moduk ere gai iluna aktibatzen dute}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Moduen ezarpenak"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Are ilunago"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Are ilunago"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Eman ohi baino gehiago iluntzeko baimena gailuari"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Pantailaren denbora-muga"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1315,7 +1342,7 @@
     <string name="style_suggestion_summary" msgid="4271131877800968159">"Probatu askotariko estiloak, horma-paperak, etab."</string>
     <string name="screensaver_settings_title" msgid="3588535639672365395">"Pantaila-babeslea"</string>
     <string name="keywords_screensaver" msgid="7249337959432229172">"pantailarako babeslea"</string>
-    <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Ez dago erabilgarri, lo egiteko garaiaren modua aktibatuta dagoelako"</string>
+    <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Ez dago erabilgarri, lotara joateko modua aktibatuta dagoelako"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Erabili pantaila-babeslea"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Kargatzen ari denean edo oinarrian dagoenean"</string>
     <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Oinarrian kargatzen ari denean"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetootha desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Kokapen-zerbitzuak"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Kokapen-zerbitzuak"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Erabili kokapena"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Erabili kokapena ordu-zona ezartzeko"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Ezin da automatikoki ezarri ordu-zona"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Kokapena edo Kokapen-zerbitzuak desaktibatuta daude"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Kokapen-ezarpenak"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Konpondu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Utzi"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Ordu-zona automatikoa desaktibatuta dago"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ez dago erabilgarri ordu-zona automatikoa desaktibatuta dagoenean"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Baliteke kokapena erabiltzea ordu-zona ezartzeko"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Gailuaren kokapena erabilgarri badago, baliteke ordu-zona ezartzeko erabiltzea"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ikusi legezko informazioa, egoera, software-bertsioa"</string>
     <string name="legal_information" msgid="7509900979811934843">"Lege-informazioa"</string>
     <string name="manual" msgid="3651593989906084868">"Eskuliburua"</string>
@@ -1764,7 +1791,7 @@
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8509287115116369677">"Erabili blokeo bakarra"</string>
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Gailuaren pantailaren blokeo bera"</string>
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"Kudeatu aplikazioak"</string>
-    <string name="applications_settings" msgid="1941993743933425622">"Aplikazioaren informazioa"</string>
+    <string name="applications_settings" msgid="1941993743933425622">"Aplikazioari buruzko informazioa"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"Aplikazioaren ezarpenak"</string>
     <string name="install_applications" msgid="3921609656584369901">"Iturburu ezezagunak"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"Onartu iturburu guztiak"</string>
@@ -1774,7 +1801,7 @@
     <string name="forgot_password_text" msgid="2583194470767613163">"PINa, eredua edo pasahitza berrezartzen lagunduko dizu"</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Gaitu ezarpenen aukera gehiago"</string>
-    <string name="application_info_label" msgid="1015706497694165866">"Aplikazioaren informazioa"</string>
+    <string name="application_info_label" msgid="1015706497694165866">"Aplikazioari buruzko informazioa"</string>
     <string name="storage_label" msgid="2522307545547515733">"Memoria"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"Ireki modu lehenetsian"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"Balio lehenetsiak"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Aukerak"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Erabilerraztasuna"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teklatu fisikoa"</string>
-    <string name="bounce_keys" msgid="7419450970351743904">"Errebote-teklak"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Teklatuak ez ikusi egiten dio tekla bera <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms igaro baino lehen behin eta berriro sakatzen bada"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
+    <string name="bounce_keys" msgid="7419450970351743904">"Tekla-sakatze errepikatuak"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Teklatuak ez ikusi egiten du tekla bera behin eta berriro bizkor sakatzen bada"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Tekla-sakatze errepikatuen atalasea"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Aukeratu zer iraupenarekin egiten duen teklatuak ez ikusi tekla bera behin eta berriro sakatzen bada"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Pertsonalizatua"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"balio pertsonalizatua"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tekla motelak"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Tekla-sakatze bat aktibatzeko denbora doitzen du, <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms-tara"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tekla bat sakatzean aktibatzeko behar den denbora doitzen du"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tekla itsaskorrak"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Lasterbideetan, sakatu teklak banan-banan, guztiak aldi berean sakatu ordez"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Saguaren teklak"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Erabili teklatu fisikoa sagua kontrolatzeko"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Erabili saguaren teklak"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Erabili teklatua erakuslea kontrolatzeko"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Saguarekin gora eta behera alderantziz egiteko aukera"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Egin gora orria beherantz mugitzeko"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Aldatu ezkerreko eta eskuineko botoiak"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Erabili saguaren ezkerreko botoia eskuinekoa balitz bezala"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> teklatuko saguaren teklak"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Erabili <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> teklak saguaren erakuslea mugitzeko"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Erabili <xliff:g id="CLICK_LABEL">%s</xliff:g> tekla saguaren botoi nagusia sakatzeko"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Erabili <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> tekla saguaren botoi nagusia sakatuta edukitzeko"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Erabili <xliff:g id="RELEASE_LABEL">%s</xliff:g> tekla saguaren botoi nagusia askatzeko"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Erabili <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> tekla gora/behera egiteko modua aldatzeko. Horrela, <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> teklekin gora, behera, ezkerrera edo eskuinera mugituko da ikuspegia."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Erabili <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> tekla saguaren bigarren mailako botoia sakatzeko"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Lasterbideak"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Erakutsi lasterbideen zerrenda"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Laneko profilaren teklatuak eta tresnak"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Lehenetsia"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Ukipen-panela"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Ukipen-panela eta sagua"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Sagua"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Erakuslearen abiadura, keinuak"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Egin klik sakatuta"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Sakatu eta arrastatu"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Beheko eskuineko izkina sakatzea"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Aukera gehiago ikusteko, sakatu ukipen-panelaren beheko eskuineko izkina"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Erakuslearen abiadura"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Sakatu 3 hatzekin"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Erakuslearen kolorea"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Aldatu erakusle-betetzearen estiloa beltzera"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Aldatu erakusle-betetzearen estiloa berdera"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Lortu ukipen-panelean erabiltzeko keinuei buruzko informazioa"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ukipen-panela, ukipena, panela, sagua, kurtsorea, gora egin, behera egin, hatza pasatu, eskuineko botoiarekin klik egin, klik, klikatu, erakuslea"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"eskuineko botoiarekin klik egin, sakatu"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Egin klik erdiko botoiarekin"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Exekutatu Laguntzailea"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Joan orri nagusira"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Egin atzera"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ikusi azkenaldiko aplikazioak"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Orri nagusira joan"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Ukipen-panelean, pasatu hiru hatz gora"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Atzera egin"</string>
@@ -2013,7 +2068,11 @@
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Aukeratu tekla aldatzailea"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Aukeratu <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> teklarako beste tekla bat:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Teklatu fisikoaren erabilerraztasuna"</string>
-    <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tekla itsaskorrak, errebote-teklak, saguaren teklak"</string>
+    <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tekla itsaskorrak, tekla-sakatze errepikatuak, saguaren teklak"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Errepikatutako teklak"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Errepikatu aurreko tartea"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Errepikapen-abiadura"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Eduki sakatuta tekla bat, eta askatu arte errepikatuko da haren karakterea"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> teklatuaren diseinua"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lehenetsia"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatikoa: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aurreikusi"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Aukera estandarrak"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Hizkuntza"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Testuaren tamaina"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Azpitituluen tamaina"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Azpitituluen estiloa"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Aukera pertsonalizatuak"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Atzeko planoaren kolorea"</string>
@@ -2528,7 +2587,7 @@
     <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Mugatua"</string>
     <string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"Eman bateria atzeko planoan mugarik gabe erabiltzeko baimena. Baliteke bateria gehiago erabiltzea."</string>
     <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimizatu erabileran oinarrituta. Aplikazio gehienetarako gomendatua."</string>
-    <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Murriztu bateria-erabilera atzeko planoan. Baliteke aplikazioak behar bezala ez funtzionatzea. Agian jakinarazpenak atzeratu egingo dira."</string>
+    <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Murriztu bateria-erabilera atzeko planoan. Baliteke aplikazioak behar bezala ez funtzionatzea. Agian jakinarazpenak atzeratuko dira."</string>
     <string name="manager_battery_usage_footer" msgid="2635906573922553766">"Aplikazio baten bateria erabiltzeko modua aldatzeak haren errendimenduan eragina izan dezake."</string>
     <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"Aplikazio honek bateria-erabilera <xliff:g id="STATE">%1$s</xliff:g> behar du."</string>
     <string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"mugagabea"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Doitu energia-erabilera"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Sartutako paketeak"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikazioak ohiko moduan dabiltza"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Bateria aldatzea gomendatzen da"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Bateriaren ahalmena eta kargatzeko abiadura murriztuta daude, eta bateria ordeztea gomendatzen da."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Bateria-maila baxua"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Aktibatu Bateria-aurreztailea bateriaren iraupena luzatzeko"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Hobetu bateriaren iraupena"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"VPN saretik deskonektatu nahi duzu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Deskonektatu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Bertsioa"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> bertsioa"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Ahaztu VPN konexioa"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Dagoen VPN konexioa ordeztu nahi duzu?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09:00-17:00, astegunetan\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Egutegiko gertaerak"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{\"{mode_1}\" aktibo dago}=2{\"{mode_1}\" eta \"{mode_2}\" aktibo daude}=3{\"{mode_1}\", \"{mode_2}\" eta \"{mode_3}\" aktibo daude}other{\"{mode_1}\", \"{mode_2}\" eta beste # aktibo daude}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modu aktiba daiteke automatikoki}other{# modu aktiba daitezke automatikoki}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ez molestatzeko modua}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AKTIBATUTA"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ezarri gabe"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desgaituta"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ados"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Jakinarazpenak"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Iraupena"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mezuak, gertaerak eta abisuak"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Ez molestatzeko modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Eginda"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ezarpenak"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ez egin soinurik jakinarazpenak jasotzean"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Ez duzu ikusi edo entzungo jakinarazpenik. Kontaktu izardunek eta berriro deitu dutenen deiak onartu egingo dira."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Oraingo ezarpena)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Ez molestatzeko moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Laneko profileko soinuak"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Erabili profil pertsonaleko soinuak"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Erabili profil pertsonaleko soinu berberak"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Desblokeatu ondoren, joan zuzenean erabilitako azken pantailara. Jakinarazpenak ez dira agertuko pantaila blokeatuan. Haiek ikusteko, pasatu hatza pantailaren goialdetik behera."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantaila blokeatua, blokeo pantaila, saltatu, zeharbidea"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Laneko profila blokeatu bada"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Pantaila blokeatuko jakinarazpenen minimalismoa"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Erakutsi jakinarazpen gutxiago pantaila blokeatuan"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Erakutsi jakinarazpen berriak soilik pantaila blokeatuan"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Kendu automatikoki lehendik ikusitako jakinarazpenak pantaila blokeatutik"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Pantaila blokeatuko jakinarazpenak"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Erakutsi elkarrizketak, bai lehenetsiak, bai isilak"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Erakutsi elkarrizketak, bai lehenetsiak, bai isilak"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Erakutsi eduki guztia laneko jakinarazpenetan"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ezkutatu laneko kontuzko informazioa"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Gailua blokeatuta dagoenean, nola ikusi nahi dituzu profileko jakinarazpenak?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profileko jakinarazpenak"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Jakinarazpenak"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Aplikazioen jakinarazpenak"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Epe labur batean jakinarazpen ugari jasotzen badituzu, gailuak bolumena jaitsiko du eta alertak murriztuko ditu 2 minutuz (gehienez). Ezarpen horrek ez die eragiten deiei, alarmei eta lehentasunezko elkarrizketei. \n\nArintze-aldi horretan jasotako jakinarazpenak ikusteko, pasatu hatza pantailaren goialdetik behera."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplikatu laneko profiletan"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplikatu laneko profileko aplikazioetan"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Jakinarazpen multzokatuak"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aktibatuta"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desaktibatuta"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Multzokatu jakinarazpenak"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Antzeko gaiak dituzten jakinarazpenen audioa desaktibatuko da, eta multzokatu egingo dira, zerbitzua isilagoa izan dadin. Multzokatuz gero, ez dira erabiliko aplikazioen jakinarazpen-ezarpenak."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"EBko laguntza-zerbitzuak"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ez dago EBko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"EBko zerbitzuak erabiltzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"lehentasunezko elkarrizketak"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Elkarrizketen ezarpenak"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Eten dezaketenak"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mezularitza- eta dei-aplikazioek jakinarazpenik bidali ezin izan arren, hemen aukeratzen dituzun pertsonak zurekin harremanetan jar daitezke aipatutako aplikazioen bidez"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Deiak"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Guztienak"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktuenak"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontaktu izardunenak"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktuen ezarpenak"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Kontaktu izardunen ezarpenak"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Inorenak ez"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Bat ere ez"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmak"</string>
@@ -3840,10 +3919,10 @@
     <string name="zen_mode_system_summary" msgid="7225581762792177522">"Teklatu eta bestelako botoietako soinuak"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sakatze-soinuak"</string>
     <string name="zen_mode_system_list_first" msgid="8590078626001067855">"Ukipen-soinuak"</string>
-    <string name="zen_mode_reminders" msgid="1970224691551417906">"Abisuak"</string>
-    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Zeregin eta abisuetakoak"</string>
-    <string name="zen_mode_reminders_list" msgid="3133513621980999858">"abisuak"</string>
-    <string name="zen_mode_reminders_list_first" msgid="1130470396012190814">"Abisuak"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Gogorarazpenak"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Zeregin eta gogorarazpenetakoak"</string>
+    <string name="zen_mode_reminders_list" msgid="3133513621980999858">"gogorarazpenak"</string>
+    <string name="zen_mode_reminders_list_first" msgid="1130470396012190814">"Gogorarazpenak"</string>
     <string name="zen_mode_events" msgid="7425795679353531794">"Egutegiko gertaerak"</string>
     <string name="zen_mode_events_summary" msgid="3241903481309766428">"Datozen egunetarako egutegiko gertaeretakoak"</string>
     <string name="zen_mode_events_list" msgid="7191316245742097229">"gertaerak"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 # aplikaziok eten dezakete}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (lana)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Kalkulatzen…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Aplikazioen ezarpenak"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Eman \"Ez molestatu\" ez aplikatzeko baimena aplikazioei"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Eten zaitzaketen aplikazioak"</string>
@@ -3897,8 +3977,10 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Sortu modu bat"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modu pertsonalizatua"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Moduaren izena"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Moduaren izena ezin da hutsik egon"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Aukeratu ikono bat"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Egutegiko gertaerak"</string>
-    <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Lo egiteko garaiko ohitura"</string>
+    <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Lotara joateko garaiko ohitura"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Gidatu bitartean"</string>
     <string name="zen_mode_trigger_title_generic" msgid="1347753445938095789">"Aplikazioen ezarpenak"</string>
     <string name="zen_mode_trigger_summary_settings_in_app" msgid="4860667191183702601">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioan dituzu informazioa eta ezarpenak"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Pantaila osoko jakinarazpenak"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Eman pantaila osoko jakinarazpenak erakusteko baimena aplikazioari"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Eman gailua blokeatuta dagoenean pantaila osoa hartzen duten jakinarazpenak erakusteko baimena aplikazioari. Alarmen, sarrerako deien edo bestelako premiazko jakinarazpenen berri emateko erabil dezakete aplikazioek."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Sistemaren hobespenak idatzi"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Eman zure izenean sistemaren hobespenak aldatzeko baimena aplikazio honi"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Baimen honekin, aplikazio batek sistemaren hobespen nagusiak alda ditzake."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Multimedia-edukia kudeatzeko aplikazioak"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Eman multimedia-edukia kudeatzeko baimena aplikazioari"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Baimena ematen badiozu, beste aplikazio batzuekin sortutako multimedia-fitxategiak editatu edo ezabatu ahal izango ditu aplikazioak, baimenik eskatu gabe. Aplikazioak fitxategiak eta multimedia-edukia erabiltzeko baimena izan behar du."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Keinuak"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Ireki kamera bizkor"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan erabil daiteke."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Biratu kamera autoargazkiak ateratzeko"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Nabigazio modua"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelite bidezko mezularitza"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Bidali eta jaso testu-mezuak satelite bidez. Kontuarekin dator."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Bidali eta jaso testu-mezuak satelite bidez. Ez dator kontuarekin."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelite bidezko mezularitza"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Satelite bidezko mezularitzari buruz"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Baldintzak betetzen dituen <xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadoreko kontu bat duzunez, testu-mezuak satelite bidez bidali eta jaso ditzakezu"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorearekin kontratatuta daukazun tarifa"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelite bidezko mezularitza kontuarekin dator"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelite bidezko mezularitza ez dator kontuarekin"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Lortu informazio gehiago"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Nola funtzionatzen du?"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonoa automatikoki konektatuko da satelite batera. Ahalik eta konexio onena izateko, ziurtatu zerua argi ikus dezakezula."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Telefonoa satelite batera konektatu ondoren"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Edonori bidal diezazkiokezu testu-mezuak, baita larrialdi-zerbitzuei ere. Telefonoa sare mugikor batera konektatuko da berriro, halakorik erabilgarri dagoenean."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Baliteke denbora gehiago behar izatea satelite bidezko mezuak bidaltzeko, eta eremu batzuetan soilik daude erabilgarri. Litekeena da satelite bidezko konexioak eguraldiaren eta egitura jakin batzuen eragina jasatea. Satelite bidez deitzeko aukera ez dago erabilgarri. Baliteke larrialdi-deiak konektatzea, halere.\n\nBaliteke denbora pixka bat behar izatea kontuan egindako aldaketak ezarpenetan agertzeko. Horri buruzko xehetasunak lortzeko, jarri operadorearekin harremanetan."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Satelite bidezko mezularitzari buruzko informazio gehiago"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Ezin da aktibatu <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> aktibatzeko, amaitu satelite bidezko konexioa"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelite bidezko konexioa"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Sarbide-puntuen izenak"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APNa"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Orri guztiekin bateragarria den moduko 16 kB-ko moduan zaude. Modu horretan ezin da bermatu softwarearen osotasuna, eta baliteke telefonoan gordetako datuak arriskuan egotea sistema eragilearen abiarazlea desblokeatuta dagoen bitartean. Modu horietan, eginbide batzuk desgaituko dira; beraz, baliteke aplikazio batzuek ez funtzionatzea. Jatorrizko modura itzultzeko, aldatu berriro 4 kB-ko modura eta blokeatu gailuaren sistema eragilearen abiarazlea. Gailuaren jatorrizko datuak berrezarriko dira, eta jatorrizko ezarpenetara leheneratuko. Gailuak Android behar bezala abiarazten duenean, desgaitu OEMa desblokeatzeko aukera Garatzaileentzako aukerak atalean. Gailuak Android abiarazi ezin badu edo ezegonkorra bada, instala itzazu fabrikako firmwarearen azken irudiak (&lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; helbidetik) gailuan. Bestela, erabili &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; eta hautatu \"Wipe Device\" (xahutu gailua), \"Lock Bootloader\" (blokeatu sistema eragilearen abiarazlea) eta \"Force Flash all partitions\" (behartu partizio guztiak berriro instalatzera)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Orri-tamaina guztiekin bateragarria den 16 kB-ko modua"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Irakurri informazio gehiago"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Exekutatu aplikazioa orriaren tamainarekin bateragarria den modua erabilita"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Akatsen txostenen kudeatzailea"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Gailuko Akatsen txostenaren lasterbidea zein aplikaziok kontrolatzen duen zehazten du."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Pertsonala"</string>
@@ -5101,7 +5253,7 @@
     <string name="mobile_data_disable_message" msgid="7829414836454769970">"Ezingo duzu erabili <xliff:g id="CARRIER">%s</xliff:g> operadorearen datu-konexioa Internet atzitzeko. Wifi-sare baten bidez soilik konektatu ahal izango zara Internetera."</string>
     <string name="mobile_data_disable_message_default_carrier" msgid="4449469407705838612">"zure"</string>
     <string name="not_allowed_by_ent" msgid="1958611623122304411">"Erakundeak ez du baimenik eman"</string>
-    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ez dago erabilgarri, lo egiteko garaiaren modua aktibatuta dagoelako"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ez dago erabilgarri, lotara joateko 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="5111712860712823893">"Gailu batek zure mezuak atzitu nahi ditu. Sakatu xehetasunak ikusteko."</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Entzun zuzeneko igorpena"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin entzuteko, eskaneatu zuzeneko audio-igorpen baten QR kodea"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Ezin da editatu pasahitza audioa partekatu bitartean. Pasahitza aldatzeko, desaktibatu audioa partekatzeko eginbidea."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Pasahitzak 4-16 karaktere eduki behar ditu, eta hizkiak, zenbakiak eta ikurrak soilik erabil daitezke"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR kodeen eskanerra"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Laguntza behar duzu?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Bilatu ezarpenetan"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktuak, biltegia, kontua"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktuen biltegia"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Gailua soilik"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kontaktu berriak ez dira sinkronizatuko kontu batekin"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktuak gailuan gordeko dira, eta modu lehenetsian kontuarekin sinkronizatuko"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Errore bat gertatu da kontu lehenetsia ezartzean"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ez da ezarri kontu lehenetsirik"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Gailua soilik"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Gailua eta %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Hasteko, gehitu kontu bat"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Non gorde kontaktuak?"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Inguratu bilatzeko"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Pantailako edukia erabilita bilaketa egiteko, eduki sakatuta orri nagusira joateko botoia edo nabigazioaren kontrol-puntua."</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index aa67b978aba..ac5cd80fb4c 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"دانه برف"</item>
     <item msgid="7952183800501346803">"چتر ساحلی"</item>
     <item msgid="799139025758265891">"ابزارهای کارگاه"</item>
-    <item msgid="1330084588359129896">"چادر"</item>
+    <item msgid="8112685757657659269">"پیانو"</item>
     <item msgid="3861584909935022342">"حلقه فیلم"</item>
     <item msgid="5827426100157335512">"کتاب"</item>
     <item msgid="8585828346253128384">"گل نیلوفر آبی"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 13ef2a7389f..0c437293428 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"جفت کردن دستگاه جدید"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوتوث"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"فردا به‌طور خودکار روشن شود"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"اگر بلوتوث را خاموش کنید، روز بعد دوباره روشن می‌شود"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"جفت کردن گوش راست"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"جفت کردن گوش چپ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"جفت کردن گوش دیگر"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"غیرفعال کردن «صدای بلوتوث کم‌مصرف»"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"اگر دستگاه از ویژگی‌های سخت‌افزار «صدای کم‌مصرف» پشتیبانی کند، ویژگی «صدای بلوتوث کم‌مصرف» را غیرفعال می‌کند."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"حالت «صدای بلوتوث کم‌مصرف»"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"فعال کردن پیش‌نمایش واسط کاربر «همه‌فرستی صدای بلوتوث کم‌مصرف»"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"پیش‌نمایش واسط کاربر «اشتراک صدای کم‌مصرف» را فعال می‌کند، ازجمله اشتراک صدای شخصی و همه‌فرستی خصوصی"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"نمایش تنظیم «صدای کم‌مصرف» در جزئیات دستگاه"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"کنار گذاشتن فهرست «صدای بلوتوث کم‌مصرف» مجاز"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"استفاده از «صدای کم‌مصرف» به‌طور پیش‌فرض حتی درصورتی‌که دستگاه جانبی مجهز به «صدای کم‌مصرف» ازلحاظ مطابقت با معیارهای «فهرست مجازها» تأیید نشده باشد"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"زبان برنامه"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"زبان‌های پیشنهادی"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"همه زبان‌ها"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"پیشنهادی"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"همه زبان‌ها"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"همه مناطق"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"همه سیستم‌های شماره‌گذاری"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"زبان سیستم"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"پیش‌فرض سیستم"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"انتخاب زبان از «تنظیمات» برای این برنامه دردسترس نیست."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"تغییر دادن"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"‏%s دردسترس نیست"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"نمی‌توان از این زبان به‌عنوان زبان سیستم استفاده کرد، اما به برنامه‌ها و وب‌سایت‌ها اجازه داده‌اید بدانند شما این زبان را ترجیح می‌دهید."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"جستجو"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"افزودن زبان"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"اولویت‌های منطقه"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"نام زبان را تایپ کنید"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"تنظیمات زبان بیشتر"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"اولویت‌های منطقه‌ای"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"تنظیم اولویت‌های واحد و عدد"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"به برنامه‌ها اجازه می‌دهد اولویت‌های منطقه‌ای شما را بدانند تا بتوانند تجربه‌تان را شخصی‌سازی کنند."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"برنامه‌ها هر زمان ممکن باشد از اولویت‌های منطقه‌ای شما استفاده خواهند کرد."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"اولویت‌های منطقه‌ای"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"دما"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"اولین روز هفته"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"اولویت‌های اعداد"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"اتصال به سرویس‌های داده هنگام فراگردی"</string>
     <string name="roaming_disable" msgid="729512894708689604">"اتصال به سرویس‌های داده هنگام فراگردی"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ممکن است هزینه‌های فراگردی اعمال شود."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"تنظیم خودکار زمان"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"تنظیم خودکار"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"وقتی این گزینه روشن باشد، از مکان برای تنظیم منطقه زمانی استفاده خواهد شد"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"تاریخ و ساعت خودکار"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"به‌طور خودکار بااستفاده از سیگنال‌های شبکه و بی‌سیم تنظیم می‌شود"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"منطقه زمانی خودکار"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"به‌طور خودکار براساس شبکه‌های تلفن همراه اطرافتان تنظیم می‌شود"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"به‌طور خودکار با مکان دستگاه (اگر دردسترس باشد) تنظیم می‌شود"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استفاده از پیش‌فرض منطقه زبانی"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استفاده از قالب ۲۴ ساعته"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"زمان"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"انگشت را بلند کنید، سپس دوباره حسگر را لمس کنید"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"امکان استفاده از حسگر اثر انگشت وجود ندارد"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"به ارائه‌دهنده خدمات تعمیر مراجعه کنید."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"«قفل‌گشایی با اثر انگشت» در صفحه‌نمایش خاموش"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"از «قفل‌گشایی با اثر انگشت» حتی وقتی صفحه‌نمایش خاموش است استفاده کنید"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"صفحه‌نمایش خاموش، باز کردن قفل"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"تنظیمات ایمنی بیشتر"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"قفل نمایه کاری، رمزگذاری، و غیره"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"رمزگذاری، اطلاعات اعتباری، و غیره"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"تنظیم الگو برای فضای خصوصی"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"قفل کردن"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"پنهان کردن"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"الگوی فضای خصوصی خود را تأیید کنید"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"پین فضای خصوصی خود را دوباره وارد کنید"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"گذرواژه فضای خصوصی خود را دوباره وارد کنید"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"می‌توانید حداکثر <xliff:g id="COUNT">%d</xliff:g> اثرانگشت اضافه کنید"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"حداکثر تعداد اثرانگشت را اضافه کرده‌اید"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"نمی‌توانید اثرانگشت‌های بیشتری اضافه کنید"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"روشن"</string>
     <string name="external_display_off" msgid="5634413756025351374">"خاموش"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"نمایشگر خارجی"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"استفاده از نمایشگر خارجی"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"وضوح صفحه‌نمایش"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"نمایشگر خارجی قطع شده است"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"تغییر چرخش یا وضوح ممکن است باعث شود برنامه‌هایی که اکنون درحال اجرا هستند متوقف شوند"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"برای قرینه‌سازی صفحه‌نمایش، دستگاهتان باید به یک نمایشگر خارجی متصل باشد"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"گزینه‌های بیشتر"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"برای تغییر دادن ترتیب نمایشگرها، نگه دارید و بکشید"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"پخش محتوا"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"قرینه‌سازی"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"فعال کردن نمایش بی‌سیم"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"گذرواژه را بررسی و دوباره امتحان کنید"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"با سازنده دستگاه تماس بگیرید"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"اتصال را بررسی کنید و دوباره امتحان کنید"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"‏این شبکه Wi-Fi درحال‌حاضر دردسترس نیست"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"این رمزینه پاسخ‌سریع مشکلی دارد. ازطریق روش دیگری متصل شوید."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"انتخاب شبکه"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"برای متصل کردن دستگاهتان،‌ شبکه‌ای انتخاب کنید"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"این دستگاه به «<xliff:g id="SSID">%1$s</xliff:g>» اضافه شود؟"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"درباره چرخش خودکار بیشتر بدانید"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"وضوح صفحه"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"وضوح بالا"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"وضوح کامل"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"«وضوح کامل» از شارژ باتری بیشتری استفاده می‌کند. تغییر دادن وضوح ممکن است باعث شود برخی‌از برنامه‌ها بازراه‌اندازی شوند."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"انتخاب‌شده"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ‌"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبیعی"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"تطبیقی"</string>
     <string name="brightness" msgid="6216871641021779698">"سطح روشنایی"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"روشنایی تطبیقی"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"درباره «روشنایی تطبیقی»"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"روشنایی صفحه‌نمایش به‌طور خودکار با محیط و فعالیت‌هایتان تنظیم می‌شود. می‌توانید لغزاننده را به‌طور دستی حرکت دهید تا روشنایی تطبیقی ترجیح شما را دریابد."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"روشن"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"خاموش"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"تنظیمات «حالت وقت خواب»"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{«حالت‌ها» هم می‌توانند «زمینه تیره» را فعال کنند}=1{{mode_1} هم می‌تواند «زمینه تیره» را فعال کند}=2{{mode_1} و {mode_2} هم می‌توانند «زمینه تیره» را فعال کنند}=3{{mode_1}، {mode_2}، و {mode_3} هم می‌توانند «زمینه تیره» را فعال کنند}one{{mode_1}، {mode_2}، و # حالت دیگر هم می‌توانند «زمینه تیره» را فعال کنند}other{{mode_1}، {mode_2}، و # حالت دیگر هم می‌توانند «زمینه تیره» را فعال کنند}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"تنظیمات حالت‌ها"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"کم‌نورتر"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"بسیار کم‌نور"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"به دستگاه اجازه داده می‌شود کم‌نورتر از حالت عادی شود"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"زمان خاموش شدن صفحه"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> پس از غیرفعال بودن"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"خدمات مکان"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"خدمات مکان"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"استفاده از مکان"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"استفاده از مکان برای منطقه زمانی"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"نمی‌توان منطقه زمانی را به‌طور خودکار تنظیم کرد"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"«مکان» یا «خدمات مکان» خاموش است"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"تنظیمات مکان"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"تصحیح شود"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"لغو"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"منطقه زمانی خودکار خاموش است"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"وقتی منطقه زمانی خودکار خاموش باشد، دردسترس نیست"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ممکن است از مکان برای تنظیم منطقه زمانی استفاده شود"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"اگر مکان دستگاهتان دردسترس باشد، می‌توان از آن برای مشخص کردن منطقه زمانی‌تان استفاده کرد"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"مشاهدهٔ اطلاعات حقوقی، وضعیت، نسخه نرم‌افزار"</string>
     <string name="legal_information" msgid="7509900979811934843">"اطلاعات حقوقی"</string>
     <string name="manual" msgid="3651593989906084868">"دفترچه راهنما"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"گزینه‌ها"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"دسترس‌پذیری"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"صفحه‌کلید فیزیکی"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"کلیدهای واگشت"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"صفحه‌کلید فشردن‌های تکراری و سریع یک کلید در <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> میلی‌ثانیه را نادیده می‌گیرد"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"صفحه‌کلید فشردن‌های تکراری و سریع یک کلید را نادیده می‌گیرد"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"آستانه کلیدهای ضدتکرار"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"مدت زمانی را که صفحه‌کلید شما فشردن‌های تکراری کلید را نادیده می‌گیرد انتخاب کنید"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"‫۰٫۲ ثانیه"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"‫۰٫۴ ثانیه"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"‫۰٫۶ ثانیه"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"سفارشی"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"مقدار سفارشی"</string>
     <string name="slow_keys" msgid="2891452895499690837">"کلیدهای آهسته"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"فاصله زمانی بین فشردن کلید و فعال‌سازی آن را روی <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> میلی‌ثانیه تنظیم می‌کند"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"فاصله زمانی بین فشردن کلید و فعال‌سازی آن را تنظیم می‌کند"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"کلیدهای چسبان"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"به‌جای اینکه چند کلید را به‌طور هم‌زمان پایین نگه دارید، هربار یک کلید را برای میان‌برها فشار دهید"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"کلیدهای موشواره"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"برای کنترل موشواره، از صفحه‌کلید فیزیکی استفاده کنید."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"استفاده از کلیدهای موشواره"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"استفاده از صفحه‌کلید برای کنترل کردن اشاره‌گر"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"پیمایش معکوس موشواره"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"برای رفتن به‌پایین صفحه، به‌بالا پیمایش کنید"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"جابه‌جا کردن دکمه‌های چپ و راست"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"استفاده از دکمه چپ موشواره به‌عنوان کلیک راست"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"کلیدهای موشواره برای <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"از کلیدهای <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> برای حرکت دادن اشاره‌گر موشواره استفاده کنید"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"از کلید <xliff:g id="CLICK_LABEL">%s</xliff:g> برای کلیک کردن با دکمه اصلی موشواره استفاده کنید"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"از کلید <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> برای فشار دادن و نگه داشتن دکمه اصلی موشواره استفاده کنید"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"از کلید <xliff:g id="RELEASE_LABEL">%s</xliff:g> برای رها کردن دکمه اصلی موشواره استفاده کنید"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"از کلید <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> برای روشن/خاموش کردن حالت پیمایش استفاده کنید. با این کار، کلیدهای <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> نما را به بالا، پایین، چپ، یا راست پیمایش می‌کنند"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"از کلید <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> برای کلیک کردن با دکمه دوم موشواره استفاده کنید"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"میان‌برهای صفحه‌کلید"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"نمایش فهرست میان‌برها"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"نمایه کاری صفحه‌کلیدها و ابزارها"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"پیش‌فرض"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"صفحه لمسی"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"صفحه لمسی و موشواره"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"موشواره"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"سرعت اشاره‌گر، اشاره‌ها"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"کلیک با تک‌ضرب"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"کشیدن با تک‌ضرب"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"کلیک پایین راست"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"برای گزینه‌های بیشتر، روی پایین گوشه راست صفحه لمسی کلیک کنید"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"سرعت اشاره‌گر"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"استفاده از تک‌ضرب سه‌انگشتی"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"رنگ اشاره‌گر"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"تغییر سبک رنگ نشانگر به سیاه"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"تغییر سبک رنگ نشانگر به سبز"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"آشنایی با اشاره‌های صفحه لمسی"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"پد لمسی، پدلمسی، موشواره، مکان‌نما، پیمایش، تند کشیدن، کلیک راست، کلیک، اشاره‌گر"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"کلیک راست، ضربه زدن"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"کلیک میانی"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"راه‌اندازی «دستیار»"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"رفتن به صفحه اصلی"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"برگشتن"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"مشاهده برنامه‌های اخیر"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"رفتن به صفحه اصلی"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"هر جایی از صفحه لمسی را با سه انگشت تند به‌بالا بکشید"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"برگشتن"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"کلید جدیدی برای <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> انتخاب کنید:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"دسترس‌پذیری صفحه‌کلید فیزیکی"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"کلیدهای چسبان، کلیدهای کمانه‌ای، کلیدهای موشواره"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"تکرار کردن کلیدها"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"تأخیر پیش‌از تکرار"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"سرعت تکرار"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"با نگه داشتن کلید، نویسه آن تا زمانی‌که آن را رها نکنید تکرار می‌شود"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"چیدمان <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"پیش‌فرض"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"خودکار: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"پیش‌نمایش"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"گزینه‌های استاندارد"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"زبان"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"اندازه نوشتار"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"اندازه زیرنویس ناشنوایان"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"سبک زیرنویس ناشنوایان"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"گزینه‌های سفارشی"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"رنگ پس‌زمینه"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"تنظیم استفاده از نیرو"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"شامل بسته ها"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"برنامه‌ها عادی اجرا می‌شوند"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"تعویض باتری توصیه می‌شود"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ظرفیت باتری و عملکرد شارژ کاهش یافته است، توصیه می‌شود باتری را تعویض کنید."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"میزان شارژ باتری کم است"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"برای افزایش عمر باتری، «بهینه‌سازی باتری» را روشن کنید"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"بهبود عمر باتری"</string>
@@ -2631,7 +2692,7 @@
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"براساس درصد"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"اگر احتمال داشته باشد باتری قبل از شارژ عادی بعدی تمام شود، «بهینه‌سازی باتری» روشن می‌شود"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"در <xliff:g id="PERCENT">%1$s</xliff:g> روشن خواهد شد"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"تنظیم زمان‌بندی"</string>
+    <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_title_percentage" msgid="1178162022087559148">"خاموش شدن در <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏اتصال به این VPN.قطع‌ شود؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"قطع ارتباط"</string>
     <string name="vpn_version" msgid="6344167191984400976">"نسخه"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"نسخه <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"‏فراموش کردن VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏VPN موجود جایگزین شود؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏VPN همیشه روشن تنظیم شود؟"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"«۹ صبح تا ۵ عصر روزهای هفته»"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"رویدادهای تقویم"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{‫{mode_1} فعال است}=2{‫{mode_1} و {mode_2} فعال هستند}=3{‫{mode_1}، {mode_2}، و {mode_3} فعال هستند}one{‫{mode_1}، {mode_2}، و # حالت دیگر فعال هستند}other{‫{mode_1}، {mode_2}، و # حالت دیگر فعال هستند}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{‫۱ حالت می‌تواند به‌طور خودکار روشن شود}one{‫# حالت می‌تواند به‌طور خودکار روشن شود}other{‫# حالت می‌تواند به‌طور خودکار روشن شود}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{مزاحم نشوید}=1{{mode_1}}=2{{mode_1}، {mode_2}}one{{mode_1}، {mode_2}، {mode_3}}other{{mode_1}، {mode_2}، {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"روشن"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"تنظیم نشده است"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"غیرفعال شده"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"متوجه شدم"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"اعلان‌ها"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"مدت"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"پیام‌ها، رویدادها و یادآوری‌ها"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"وقتی «مزاحم نشوید» روشن باشد، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت خواهند شد. می‌توانید تنظیمات پیام‌ها را به‌گونه‌ای انجام دهید که دوستان، خانواده یا سایر مخاطبینتان بتوانند به شما دسترسی پیدا کنند."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"تمام"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"تنظیمات"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"بدون تصویر یا صدای اعلان‌ها"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"بدون صدای اعلان‌ها"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"دیگر اعلان‌ها را نخواهید دید یا شنید. تماس‌های مخاطبین ستاره‌دار و تماس‌گیرنده‌های تکراری مجاز هستند."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(تنظیم فعلی)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"تنظیمات اعلان «مزاحم نشوید» تغییر کند؟"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"صداهای نمایه کاری"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"استفاده از صداهای نمایه شخصی"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"از همان صداهای نمایه شخصی‌تان استفاده شود"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"پس‌از قفل‌گشایی، آخرین صفحه استفاده‌شده باز می‌شود. اعلان‌ها در صفحه قفل نشان داده نمی‌شود. برای دیدن آن‌ها، از بالای صفحه تند به‌پایین بکشید."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"صفحه قفل، صفحه‌قفل، رد کردن، نادیده گرفتن"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"وقتی نمایه کاری قفل است"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"به‌حداقل رساندن اعلان‌های صفحه قفل"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"نمایش دادن اعلان‌های کمتر در صفحه قفل"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"نشان دادن تنها اعلان‌های جدید در صفحه قفل"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"اعلان‌هایی که قبلاً مشاهده شده‌اند به‌طور خودکار از صفحه قفل برداشته می‌شوند"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"اعلان‌ها در صفحه قفل"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"نمایش مکالمه‌ها، پیش‌فرض، و بی‌صدا"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"نمایش مکالمه‌ها، پیش‌فرض، و بی‌صدا"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"نمایش همه محتوای اعلان کاری"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"پنهان کردن محتوای کاری حساس"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"وقتی دستگاه قفل است، می‌خواهید اعلان‌های نمایه چگونه نشان داده شوند؟"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"وقتی در مدت کوتاهی اعلان‌های زیادی دریافت کنید، دستگاهتان تا ۲ دقیقه میزان صدایش را کاهش می‌دهد و هشدارها را به‌حداقل می‌رساند. تماس‌ها، زنگ‌های ساعت، و مکالمه‌های اولویت‌دار تحت‌تأثیر قرار نمی‌گیرند. \n\nاعلان‌های دریافت‌شده در زمان استراحت را می‌توان با پایین کشیدن انگشت از بالای صفحه‌نمایش پیدا کرد."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"اعمال کردن بر نمایه‌های کاری"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"برای برنامه‌های نمایه کاری اعمال می‌شود"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"اعلان‌های دسته‌بندی‌شده"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"روشن"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"خاموش"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"استفاده از دسته‌بندی اعلان"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"اعلان‌های دارای زمینه مشابه بی‌صدا و گروه‌بندی می‌شوند تا تجربه بی‌صداتری داشته باشید. دسته‌بندی باعث ملغی شدن تنظیمات اعلان خود برنامه می‌شود."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏خدمات یاور VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏هیچ برنامه نصب‌شده‌ای درخواست نکرده به‌عنوان خدمات یاور VR اجرا شود."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏به <xliff:g id="SERVICE">%1$s</xliff:g> امکان داده شود به خدمات VR دسترسی یابد؟"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"مکالمه‌های اولویت‌دار"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"هیچ‌کدام"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{هیچ‌کدام}=1{۱ مکالمه}one{# مکالمه}other{# مکالمه}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"تنظیمات مکالمه"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"افرادی که می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"حتی اگر برنامه‌های پیام‌رسانی و تماس گرفتن نتوانند شما را خبر کنند، افرادی که در اینجا انتخاب می‌کنید همچنان می‌توانند ازطریق این برنامه‌ها با شما ارتباط برقرار کنند"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"تماس‌ها"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"همه"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"مخاطبین"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"مخاطبین ستاره‌دار"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"تنظیمات مخاطبین"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"تنظیمات مخاطبین ستاره‌دار"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"مجاز نبودن"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"هیچ‌کس"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"هشدارها"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"‫<xliff:g id="APP_LABEL">%s</xliff:g> (کاری)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"درحال محاسبه…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"تنظیمات برنامه‌ها"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"‪+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"مجاز کردن برنامه‌ها برای لغو"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"برنامه‌هایی که می‌توانند وقفه ایجاد کنند"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ایجاد حالت"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"حالت سفارشی"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"نام حالت"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"نام حالت نباید خالی باشد"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"نمادی را انتخاب کنید"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"رویدادهای تقویم"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"روال وقت خواب"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"هنگام رانندگی"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"اعلان‌های تمام‌صفحه"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"مجاز کردن اعلان‌های تمام‌صفحه از این برنامه"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"به این برنامه اجازه می‌دهد وقتی دستگاه قفل است، اعلان‌ها را روی کل صفحه نشان دهد. برنامه‌ها ممکن است از این قابلیت برای برجسته کردن هشدارها، تماس ورودی، یا دیگر اعلان‌های فوری استفاده کنند."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"نوشتن اولویت‌های سیستم"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"اجازه دادن به این برنامه برای اصلاح اولویت‌های سیستم ازجانب شما"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"این اجازه به برنامه امکان می‌دهد اولویت‌های اصلی سیستم را اصلاح کند."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"برنامه‌های مدیریت رسانه"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"مجاز کردن برنامه برای مدیریت رسانه"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"اگر مجاز باشد، این برنامه می‌تواند فایل‌های رسانه‌ای ایجادشده با برنامه‌های دیگر را بدون سؤال کردن از شما تغییر دهد یا حذف کند. برنامه برای دسترسی به فایل یا رسانه باید اجازه داشته باشد."</string>
@@ -4227,7 +4312,7 @@
     <string name="condition_device_muted_summary" msgid="3772178424510397327">"برای تماس‌ها و اعلان‌ها"</string>
     <string name="condition_device_vibrate_title" msgid="9058943409545158583">"فقط لرزش"</string>
     <string name="condition_device_vibrate_summary" msgid="7537724181691903202">"برای تماس‌ها و اعلان‌ها"</string>
-    <string name="night_display_suggestion_title" msgid="5418911386429667704">"تنظیم زمان‌بندی نور شب"</string>
+    <string name="night_display_suggestion_title" msgid="5418911386429667704">"تنظیم برنامه زمانی نور شب"</string>
     <string name="night_display_suggestion_summary" msgid="4218017907425509769">"هر شب صفحه‌نمایش به‌طور خودکار ته‌رنگ بگیرد"</string>
     <string name="condition_night_display_title" msgid="1072880897812554421">"«نور شب» روشن است"</string>
     <string name="condition_night_display_summary" msgid="3278349775875166984">"صفحه‌نمایش کهربایی شد"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"اشاره‌ها"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"باز کردن سریع دوربین"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحه‌ها کار می‌کند."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"سلفی با چرخاندن دوربین"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"حالت پیمایش"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"پیام‌رسانی ماهواره‌ای"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"پیامک‌ها را ازطریق ماهواره ارسال و دریافت کنید. با حساب شما ارائه شده است."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"پیامک‌ها را ازطریق ماهواره ارسال و دریافت کنید. در حساب شما گنجانده نشده است."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"پیام‌رسانی ماهواره‌ای"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"درباره پیام‌رسانی ماهواره‌ای"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"به‌عنوان بخشی از حساب واجدشرایط <xliff:g id="CARRIER_NAME">%1$s</xliff:g>، می‌توانید پیامک‌ها را ازطریق ماهواره ارسال و دریافت کنید"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"طرح <xliff:g id="CARRIER_NAME">%1$s</xliff:g> شما"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"پیام‌رسانی ماهواره‌ای با حسابتان ارائه شده است"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"پیام‌رسانی ماهواره‌ای با حسابتان ارائه نشده است"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"بیشتر بدانید"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"روش کار"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"تلفن شما به‌طور خودکار به ماهواره متصل خواهد شد. برای داشتن بهترین اتصال، به فضای بازی بروید که دید واضحی به آسمان داشته باشید."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"بعداز اتصال تلفن به ماهواره"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"می‌توانید برای هرکسی پیام ارسال کنید، ازجمله خدمات اضطراری. هروقت شبکه تلفن همراه دردسترس قرار بگیرد، تلفن دوباره به آن متصل خواهد شد."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"پیام‌رسانی ماهواره‌ای ممکن است مدت زمان بیشتری طول بکشد و فقط در برخی مناطق دردسترس است. ممکن است وضعیت آب‌وهوا و برخی ساختمان‌ها بر اتصال ماهواره اثر بگذارند. تماس ماهواره‌ای دردسترس نیست. ممکن است تماس‌های اضطراری همچنان وصل شود.\n\nشاید کمی طول بکشد تا تغییرات حساب در «تنظیمات» نمایش داده شود. برای اطلاع از جزئیات با شرکت مخابراتی‌تان تماس بگیرید."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"اطلاعات بیشتر درباره پیام‌رسانی ماهواره‌ای"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"‫<xliff:g id="FUNCTION">%1$s</xliff:g> روشن نشد"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"برای روشن کردن <xliff:g id="FUNCTION">%1$s</xliff:g>، ابتدا اتصال ماهواره را قطع کنید"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"اتصال‌پذیری ماهواره"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"نام‌های نقطه دسترسی"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"هنگام اتصال به <xliff:g id="CARRIER">%1$s</xliff:g>، دردسترس نیست"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"‏در حالت ۱۶ کیلوبایتی حالت مستقل از صفحه هستید. نمی‌توان تمامیت نرم‌افزار را در این حالت تضمین کرد و هرگونه داده‌ای که درمدت باز بودن قفل bootloader در تلفن ذخیره می‌شود می‌تواند درمعرض خطر باشد. برخی‌از ویژگی‌ها در این حالت‌ها غیرفعال می‌شوند بنابراین ممکن است بعضی‌از برنامه‌ها کار نکنند. برای ورود دوباره به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader دستگاه را قفل کنید. با این کار، دستگاه دوباره بازنشانی کارخانه‌ای می‌شود و به تنظیمات تولید بازگردانده می‌شود. پس‌از آنکه دستگاه باموفقیت با سیستم‌عامل Android راه‌اندازی شد، «باز کردن قفل سازنده اصلی محصول» را در «گزینه‌های توسعه‌دهندگان» غیرفعال کنید. اگر دستگاه نتوانست باموفقیت با سیستم‌عامل Android راه‌اندازی شود یا ناپایدار بود، دستگاه را با جدیدترین تصویر تنظیمات کارخانه از &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; دوباره فلاش کنید و «محو کردن داده‌های دستگاه»، «قفل کردن Bootloader»، و «فلاش کردن اجباری همه پارتیشن‌ها» را انتخاب کنید."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"حالت مستقل از صفحه ۱۶ کیلوبایتی"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"خواندن شرح بلندتر"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"اجرای برنامه در حالت سازگاری با اندازه صفحه"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"کنترل‌کننده گزارش اشکال"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"تعیین می‌کند کدام برنامه میان‌بر «گزارش اشکال» را در دستگاه کنترل کند."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"شخصی"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"گوش دادن به جاری‌سازی"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"برای گوش دادن با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>، رمزینه پاسخ‌سریع جاری‌سازی صوتی را اسکن کنید"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"نمی‌توان گذرواژه را درحین هم‌رسانی ویرایش کرد. برای تغییر دادن گذرواژه، ابتدا «اشتراک صدا» را خاموش کنید."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"گذرواژه باید ۴ تا ۱۶ نویسه داشته باشد و فقط از حرف، عدد، و نماد استفاده کنید"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"کدخوان پاسخ‌سریع"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"به راهنمایی نیاز دارید؟"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"جستجو در «تنظیمات»"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"مخاطبین، فضای ذخیره‌سازی، حساب"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"فضای ذخیره‌سازی مخاطبین"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"فقط دستگاه"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"مخاطبین جدید با هیچ حسابی همگام‌سازی نمی‌شوند"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"مخاطبین به‌طور پیش‌فرض در دستگاه شما ذخیره می‌شوند و با حسابتان همگام‌سازی می‌شوند"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"خطا هنگام تنظیم حساب پیش‌فرض"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"حساب پیش‌فرضی تنظیم نشده است"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"فقط دستگاه"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏دستگاه و %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"برای شروع، حسابی اضافه کنید"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"محل ذخیره شدن مخاطبین"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"حلقه جستجو"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"برای جستجو بااستفاده از محتوای روی صفحه، دکمه «صفحه اصلی» یا دستگیره پیمایش را لمس کنید و نگه دارید."</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 8cb72b43674..d5f6b290034 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Lumihiutale"</item>
     <item msgid="7952183800501346803">"Rantavarjo"</item>
     <item msgid="799139025758265891">"Työkalut"</item>
-    <item msgid="1330084588359129896">"Teltta"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Vanha kotivideo"</item>
     <item msgid="5827426100157335512">"Kirja"</item>
     <item msgid="8585828346253128384">"Lootuskukka"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cb89cf4a328..f6ed09cc513 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Muodosta uusi laitepari"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Laita automaattisesti päälle huomenna"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Jos laitat Bluetoothin pois päältä, se menee päälle huomenna"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Liitä oikea korva"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Liitä vasen korva"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Liitä toinen korva"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Poista Bluetooth LE audio käytöstä"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Poistaa Bluetooth LE ‑audio-ominaisuuden käytöstä, jos laite tukee LE-audiolaitteistoja"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio ‑tila"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Ota käyttöön Bluetooth LE Audion lähetys-UI:n esikatselu"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ottaa käyttöön LE Audion jakamis-UI:n esikatselun, joka sisältää henkilökohtaisen audion jakamisen ja yksityisen lähetyksen"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Näytä LE Audio ‑valitsin laitetiedoissa"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ohita Bluetooth LE Audio ‑sallitut"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Käytä oletuksena LE Audiota, vaikka LE Audio ‑lisälaitteen ei olisi vahvistettu täyttävän sallitut-listan kriteerejä."</string>
@@ -138,7 +141,7 @@
     <string name="stylus_device_details_title" msgid="7618295136015480864">"Näyttökynä"</string>
     <string name="stylus_default_notes_app" msgid="4165657465911764628">"Näyttökynäpainikkeen painallus"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (työprofiili)"</string>
-    <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Kirjoittaminen tekstikenttiin"</string>
+    <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Kirjoita tekstikenttiin"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"Ohita kaikki näyttökynäpainikkeen painallukset"</string>
     <string name="stylus_connected_devices_title" msgid="2823967577941359812">"Näyttökynä"</string>
     <string name="date_and_time" msgid="1788358029823431692">"Päivämäärä ja aika"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Sovelluksen kieli"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Kieliehdotukset"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Kaikki kielet"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Ehdotettu"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Kaikki kielet"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Kaikki alueet"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Kaikki numerointijärjestelmät"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Järjestelmän kieli"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Järjestelmän oletusarvo"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Sovellukselle ei voi valita kieltä asetuksista."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Muuta"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ei ole saatavilla"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Tätä kieltä ei voi käyttää järjestelmän kielenä, mutta sovellukset ja verkkosivustot saavat tietää, että valitsit sen."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Haku"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Lisää kieli"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Alueasetus"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Anna kielen nimi"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Lisää kieliasetuksia"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Alueelliset valinnat"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Valitse yksikkö- ja numeroasetukset"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Ilmoita alueellisista valinnoista sovelluksille, jotta ne voivat personoida kokemuksesi."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Sovellukset käyttävät alueellisia valintoja, mikäli mahdollista."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Alueelliset valinnat"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Lämpötila"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Viikon ensimmäinen päivä"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numeroasetukset"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Yhdistä verkkoon roaming-tilassa"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Yhdistä verkkoon roaming-tilassa"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Datan käytöstä saatetaan periä roaming-maksuja."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Aseta aika automaattisesti"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Aseta automaattisesti"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Sijaintia käytetään aikavyöhykkeen asettamiseen, kun vaihto on päällä"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automaattinen päivämäärä ja aika"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Määritä automaattisesti verkon ja langattomien signaalien perusteella"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automaattinen aikavyöhyke"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Määritä automaattisesti lähellä olevien mobiiliverkkojen perusteella"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Määritä automaattisesti sijainnin perusteella, jos saatavilla"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Käytä paikallista oletusasetusta"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Käytä 24-tuntista kelloa"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Aika"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Nosta sormesi ja kosketa tunnistinta uudelleen"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Sormenjälkitunnistinta ei voi käyttää"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Ota yhteyttä korjauspalveluun."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Sormenjälkiavaus näytön ollessa sammutettu"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Käytä sormenjälkiavausta, kun näyttö on pois päältä"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Näyttö pois päältä, lukituksen avaaminen"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Lisää tietoturva-asetuksia"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Työprofiilin lukitus, salaus ja muuta"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Salaus, kirjautumistiedot ja muuta"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Määritä kuvio yksityiselle tilallesi"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lukitus"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Piilotus"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Vahvista yksityisen tilan kuvio"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Lisää yksityisen tilan PIN-koodi uudelleen"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Lisää yksityisen tilan salasana uudelleen"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> sormenjälkeä"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Et voi lisätä useampia sormenjälkiä."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Enempää sormenjälkiä ei voi lisätä."</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Päällä"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Pois päältä"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ulkoinen näyttö"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Sisäänrakennettu näyttö"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Käytä ulkoista näyttöä"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Näytön resoluutio"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Yhteys ulkoiseen näyttöön katkaistu"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Näytön kierron tai resoluution muutokset voivat keskeyttää tällä hetkellä käynnissä olevat sovellukset"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Laitteen täytyy olla yhdistettynä ulkoiseen näyttöön, jotta näytön peilaus onnistuu"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Lisäasetukset"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Järjestele näyttöjä painamalla pitkään ja vetämällä."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Striimaus"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peilaus"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ota langaton näyttö käyttöön"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Tarkista salasana ja yritä uudelleen"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Ota yhteyttä laitteen valmistajaan"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Tarkista yhteys ja yritä uudelleen"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Wi-Fi-verkko ei ole tällä hetkellä käytettävissä"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"QR-koodissa on ongelma. Yritä yhdistää toisella tavalla."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Valitse verkko"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Yhdistä laitteesi valitsemalla verkko"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Lisätäänkö laite \"<xliff:g id="SSID">%1$s</xliff:g>\"-verkkoon?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Lue lisää automaattisesta käännöstä"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Näytön resoluutio"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Korkea resoluutio"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Täysi resoluutio"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Täysi resoluutio kuluttaa enemmän akkua. Jotkin sovellukset käynnistyvät uudelleen, kun vaihdat resoluutiota."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimaalinen resoluutio"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimaalinen resoluutio kuluttaa enemmän akkua. Jotkin sovellukset käynnistyvät uudelleen, kun vaihdat resoluutiota."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Valittu"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värit"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Luonnollinen"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Mukautuva"</string>
     <string name="brightness" msgid="6216871641021779698">"Kirkkaustaso"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Kirkkauden säätö"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Kirkkauden säätö"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Näytön kirkkaus mukautuu automaattisesti ympäristöösi ja toimintaasi. Voit auttaa mukautuvaa kirkkautta oppimaan mieltymyksesi siirtämällä liukusäädintä."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Päällä"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Pois päältä"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Nukkuma-aikamoodin asetukset"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Tiloilla voi myös aktivoida tumman teeman}=1{{mode_1} aktivoi myös tumman teeman}=2{{mode_1} ja {mode_2} aktivoivat myös tumman teeman}=3{{mode_1}, {mode_2} ja {mode_3} aktivoivat myös tumman teeman}other{{mode_1}, {mode_2} ja # muuta aktivoivat myös tumman teeman}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Tilojen asetukset"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Vielä himmeämpi"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Erittäin himmeä"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Salli että laite on tavallista himmeämpi"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Näytön aikakatkaisu"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Laitteen oltua käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Sijaintipalvelut"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Sijaintipalvelut"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Käytä sijaintia"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Käytä sijaintia aikavyöhykkeen määrittämiseen"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Aikavyöhykettä ei voi asettaa automaattisesti"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Sijainti tai Sijaintipalvelut ovat pois päältä"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Sijaintiasetukset"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Ratkaise ongelma"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Peru"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automaattinen aikavyöhyke on poissa päältä"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ei käytettävissä, kun automaattinen aikavyöhyke on pois päältä"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Sijaintia voidaan käyttää aikavyöhykkeen asettamiseen"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Jos laitteen sijainti on saatavilla, sitä voidaan käyttää aikavyöhykkeen määrittämiseen"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Näytä lakitiedot, tila, ohjelmiston versio"</string>
     <string name="legal_information" msgid="7509900979811934843">"Oikeudelliset tiedot"</string>
     <string name="manual" msgid="3651593989906084868">"Käyttöopas"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Vaihtoehdot"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Saavutettavuus"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fyysinen näppäimistö"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Toistuvien painallusten ohitus"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Näppäimistö ei huomioi <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> millisekunnin sisällä toistettuja saman näppäimen painalluksia"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Näppäimistö ei huomioi nopeasti toistettuja saman näppäimen painalluksia"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Toistuvan painalluksen ohituskynnys"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Valitse, kuinka kauan näppäimistö ohittaa toistuvat painallukset"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Oma"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"oma arvo"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hitaat näppäimet"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Muuta ajaksi, jona näppäin aktivoituu painalluksesta <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> millisekuntia"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Muuta aikaa, joka näppäimellä kuluu aktivoitumiseen painalluksen jälkeen"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Päälle jäävät näppäimet"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Käytä pikanäppäimiä painamalla yhtä näppäintä kerralla monen näppäimen sijaan"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Hiiren painikkeet"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Ohjaa hiirtä fyysisellä näppäimistöllä."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Käytä hiiren näppäimiä"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ohjaa osoitinta näppäimistöllä"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Hiiren käänteinen vieritys"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Siirry alaspäin sivulla vierittämällä ylöspäin"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vaihda vasemman ja oikean painikkeen paikkaa"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Käytä hiiren vasenta painiketta oikeana"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Hiiren näppäimet: <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Siirrä hiiren osoitinta <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> -näppäimillä"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Klikkaa hiiren ensisijaista painiketta <xliff:g id="CLICK_LABEL">%s</xliff:g>-näppäimellä"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Pidä hiiren ensisijaista painiketta painettuna <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>-näppäimellä"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Vapauta hiiren ensisijainen painike <xliff:g id="RELEASE_LABEL">%s</xliff:g>-näppäimellä"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Vaihda vieritystilaa <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>-näppäimellä. <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ‑näppäimillä voi vierittää näkymää ylös, alas, vasemmalle tai oikealle"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Klikkaa hiiren toissijaista painiketta <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>-näppäimellä"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pikanäppäimet"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Näytä pikanäppäimet"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Työprofiilin näppäimistöt ja työkalut"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Oletus"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Kosketuslevy"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Kosketuslevy ja hiiri"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Hiiri"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Osoittimen nopeus, eleet"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Napauttamalla klikkaus ‑toiminto"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Napauttamalla vetäminen"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klikkaa oikeaa alakulmaa"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Lisäasetukset: klikkaa kosketuslevyn oikeaa alakulmaa"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Osoittimen nopeus"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Napauta kolmella sormella"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Osoittimen väri"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Musta osoittimen täytön tyyli"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Vihreä osoittimen täytön tyyli"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Opettele kosketuslevyn eleitä"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ohjauslevy, ohjaus levy, hiiri, kohdistin, vieritä, pyyhkäise, klikkaa kakkospainikkeella, klikkaa, osoitin"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"klikkaa kakkospainikkeella, napauta"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Klikkaa keskimmäistä"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Julkaisuavustaja"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Siirry etusivulle"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Takaisin"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Katso viimeisimmät sovellukset"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Siirry aloitusnäytölle"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Pyyhkäise ylös 3 sormella mistä tahansa kosketuslevyllä"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Takaisin"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valitse uusi näppäin (<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>):"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fyysisen näppäimistön saavutettavuus"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Päälle jäävät näppäimet, toistuvien painallusten ohitus, hiiren painikkeet"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Toistettavat näppäimet"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Viive ennen toistoa"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Toistonopeus"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pidä näppäintä painettuna, niin sen merkki toistuu, kunnes näppäin vapautetaan"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Asettelu: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Oletus"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automaattinen: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Esikatselu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Vakioasetukset"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Kieli"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tekstin koko"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tekstityksen koko"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Tekstityksen tyyli"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Omat asetukset"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Taustaväri"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Sisältyvät paketit"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Sovellukset toimivat normaalisti"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Akun vaihtamista suositellaan"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Akun kapasiteetti ja latauskyky ovat heikentyneet, ja akun vaihtamista suositellaan."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Akun varaustaso alhainen"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Laita virransäästö päälle akunkeston parantamiseksi"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Paranna akunkestoa"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Katkaistaanko VPN-yhteys?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Katkaise yhteys"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versio"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versio <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Unohda VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Korvataanko nykyinen VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Määritetäänkö aina käytössä oleva VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"klo 9–17 arkipäivisin\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalenteritapahtumat"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} on aktiivinen}=2{{mode_1} ja {mode_2} ovat aktiivisia}=3{{mode_1}, {mode_2} ja {mode_3} ovat aktiivisia}other{{mode_1}, {mode_2} ja # muuta ovat aktiivisia}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 tila voi mennä päälle automaattisesti}other{# tilaa voi mennä päälle automaattisesti}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Älä häiritse}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"PÄÄLLÄ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ei asetettu"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Ei käytössä"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Selvä"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Ilmoitukset"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Kesto"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Viestit, tapahtumat ja muistutukset"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Valmis"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Asetukset"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ei ilmoitusgrafiikoita tai ‑ääntä"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ei ilmoitusääniä"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Et näe tai kuule ilmoituksia. Tähdellä merkityiltä yhteyshenkilöiltä ja usein soittavilta tulevat puhelut sallitaan."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(nykyinen asetus)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Muutetaanko Älä häiritse ‑ilmoitusasetuksia?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Työprofiilin äänet"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Käytä oman profiilin ääniä"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Käytä samoja ääniä kuin henkilökohtaisessa profiilissa"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Siirry lukituksen avauksen jälkeen suoraan viimeisimmälle näytölle. Ilmoitukset eivät näy lukitusnäytöllä. Näet ne pyyhkäisemällä yläkulmasta alas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukitusnäyttö, ohita"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kun työprofiili on lukittu"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Lukitusnäytön ilmoitusten minimointi"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Näytä vähemmän ilmoituksia lukitusnäytöllä"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Näytä lukitusnäytöllä vain uudet ilmoitukset"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Poista automaattisesti kaikki aiemmin nähdyt ilmoitukset lukitusnäytöltä"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Ilmoitukset lukitusnäytöllä"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Näytä keskustelu-, oletus- ja äänettömät ilmoitukset"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Näytä keskustelut, oletukset ja äänettömät"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Näytä kaikki työilmoitussisältö"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Piilota arkaluontoinen työsisältö"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Miten haluat profiilin ilmoitusten näkyvän, kun laite on lukittu?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profiilin ilmoitukset"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Ilmoitukset"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Sovellusilmoitukset"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kun saat monia ilmoituksia lyhyen ajan sisällä, laite vähentää äänenvoimakkuutta ja minimoi ilmoitukset enintään kahdeksi minuutiksi. Tämä ei koske soittoja, hälytyksiä ja tärkeitä keskusteluja. \n\nVaimennuksen aikana saadut ilmoitukset näkyvät, kun vedät alas näytön yläreunasta."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Käytä työprofiileissa"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Käytä työprofiilin sovelluksissa"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Niputetut ilmoitusket"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Päällä"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Pois päältä"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Käytä ilmoitusten niputtamista"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Samantyyppiset ilmoitukset hiljennetään ja ryhmitellään, jotta käyttökokemus olisi rauhallisempi. Niputtaminen ohittaa sovelluksen omat ilmoitusasetukset."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-avustinpalvelut"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asennettuja sovelluksia ei ole pyydetty toimimaan VR-avustinpalveluina."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Sallitaanko VR-palveluiden käyttöoikeus palvelulle <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"tärkeät keskustelut"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"–"</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_from_conversations_settings" msgid="2411930666794576607">"Keskusteluasetukset"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kuka saa keskeyttää"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Vaikka viesti- ja puhelusovellukset eivät voi lähettää sinulle ilmoituksia, täällä valitsemasi henkilöt saavat kuitenkin sinuun yhteyden kyseisten sovellusten kautta"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Puhelut"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Yhteystietojen asetukset"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Tähdellä merkittyjen yhteystietojen asetukset"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"–"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"–"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Hälytykset"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (työ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Lasketaan…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Sovellusasetukset"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Salli ohittaminen sovelluksille"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Sovellukset, jotka saavat keskeyttää"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Luo tila"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Oma tila"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Tilan nimi"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Tilan nimi ei voi olla tyhjä"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Valitse kuvake"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalenteritapahtumat"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Nukkumaanmeno-ohjelma"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Ajon aikana"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Koko näytön ilmoitukset"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Salli sovelluksen lähettää koko näytön ilmoituksia"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Salli sovelluksen näyttää koko näytön ilmoituksia, kun laite on lukittu. Sovellukset voivat käyttää tällaisia ilmoituksia hälytyksistä, saapuvista puheluista tai muista tärkeistä asioista ilmoittamiseen."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Kirjoita järjestelmäasetuksia"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Salli sovelluksen muuttaa järjestelmäasetuksia puolestasi"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Tämä lupa sallii sovelluksen muokata järjestelmän ydisasetuksia."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Median hallinnointisovellukset"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Salli sovelluksen hallinnoida mediaa"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Jos sallit tämän asetuksen, sovellus voi muokata ja poistaa muilla sovelluksilla luotuja mediatiedostoja ilman erillistä lupaasi. Sovelluksella on oltava lupa tiedostojen ja median käyttöön."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Eleet"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Avaa kamera nopeasti"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Avaa kamera nopeasti painamalla virtapainiketta kahdesti. Tämä toimii miltä tahansa näytöltä."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Ota selfie kääntämällä kameraa"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigointitila"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelliittiviestintä"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Lähetä ja vastaanota tekstiviestejä satelliitin kautta. Sisältyy tiliin."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Lähetä ja vastaanota tekstiviestejä satelliitin kautta. Ei sisälly tiliin."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelliittiviestintä"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Tietoa satelliittiviestinnästä"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satelliittiviestintä, satelliittiyhteys"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Tietoa: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Voit lähettää ja vastaanottaa tekstiviestejä satelliitin kautta osana ehdot täyttävää <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ‑tiliä"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ‑pakettisi"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelliittiviestintä on osa tiliäsi"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Viestintä on osa tiliäsi"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelliittiviestintä ei sisälly tiliisi"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Lue lisää"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Näin se toimii"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Puhelimesi yhdistää satelliittiin automaattisesti. Yhteyden laatu on paras, kun pysyt ulkona avoimella paikalla."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kun puhelin on yhdistänyt satelliittiin"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Voit lähettää tekstiviestin kenelle tahansa, mukaan lukien hätäkeskukselle. Puhelimesi yhdistää mobiiliverkkoon, kun se on mahdollista."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satelliittiviestintä voi olla hitaampaa ja on saatavilla vain tietyillä alueilla. Sää ja jotkin rakenteet voivat vaikuttaa satelliittiyhteyteen. Satelliittiyhteydellä ei voi soittaa puheluja. Hätäpuhelut saattavat kuitenkin onnistua.\n\nVoi mennä jonkin aikaa ennen kuin muutokset näkyvät asetuksissa. Lisätietoa saat operaattorilta."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Tietoa satelliittiviestinnästä"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> voi toimia hitaammin ja olla saatavilla vain tietyillä alueilla. Sää ja jotkin rakenteet voivat vaikuttaa satelliittiyhteyteen. Satelliittiyhteydellä ei voi soittaa puheluja. Hätäpuhelut saattavat kuitenkin onnistua.\n\nVoi mennä jonkin aikaa ennen kuin muutokset näkyvät asetuksissa. <xliff:g id="CARRIER_NAME">%1$s</xliff:g> voi kertoa lisätietoja."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Lisätietoa: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ei ole käytettävissä"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Katkaise satelliittiyhteys, jotta <xliff:g id="FUNCTION">%1$s</xliff:g> voidaan laittaa päälle"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelliittiyhteys"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelliittiyhteys"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelliittiyhteys"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satelliittiviestintä"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Datan käyttö sisältyy tiliisi"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satellite SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Viestittele hätäkeskuksen kanssa, kun et voi yhdistää mobiili- tai Wi-Fi-verkkoon"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satellite sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Tietoa Satellite SOS:tä"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Voit viestitellä hätäkeskuksen kanssa ja jakaa sijainnin, kun sinulla ei ole mobiili- tai Wi-Fi-verkkoyhteyttä. Ei ehkä ole saatavilla aina kaikissa sijainneissa tai tilanteissa."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Soita hätäkeskukseen tai lähetä sinne tekstiviesti"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Vastaa kysymyksiin hätätilanteesta"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Muodosta yhteys satelliittiin seuraamalla ohjeita"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Jos sinulla ei ole yhteyttä mobiiliverkkoon, näet vaihtoehdon, jolla voit käyttää Satellite SOS ‑ominaisuutta"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Lähetä vastaukset hätäkeskukseen, jotta saat oikeanlaista apua"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kun yhteys on muodostettu, voit viestitellä hätäkeskuksen kanssa"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Kokeile demoa"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kun otat yhteyttä hätäkeskukseen satelliitin kautta, nimi, sähköpostiosoite, puhelinnumero, sijainti, laitteen tiedot (IMEI-koodi, kieli, malli, akun varaustaso) ja hätäyhteyshenkilöiden tiedot jaetaan hätäkeskukselle ja satelliittipalveluntarjoajille. \n\nSatellite SOS ‑ominaisuuden käyttö edellyttää, että Google Messages on oletustekstiviestisovellus. \n\nJos automaattinen verkon valinta on pois päältä, se laitetaan päälle, ja laite muodostaa automaattisesti yhteyden mihin tahansa verkkoon."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Jakamisasetukset"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Hätäyhteyshenkilöt"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google-tilisi"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Tarkista tai päivitä tiedot, jotka jaetaan hätäkeskukselle"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Yhteysosoitteet"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Olet sivusta riippumattoman tilan 16 kt:n tilassa. Ohjelmiston eheyttä ei voida taata tässä tilassa. Kaikki tälle puhelimelle tallennettu data voi olla vaarassa, kun käynnistysohjelmaa ei ole lukittu. Jotkin ominaisuudet on poistettu käytöstä näissä tiloissa, eivätkä kaikki sovellukset välttämättä toimi. Jos haluat siirtyä tuotantotilaan uudelleen, sinun on vaihdettava takaisin 4 kt:n tilaan ja lukittava käynnistysohjelma. Tämä palauttaa laitteen tehdasasetukset uudelleen ja palauttaa sen tuotantoasetuksiin. Kun laite käynnistyy Androidissa, poista OEM-avaus käytöstä kehittäjäasetuksista. Jos laitteen käynnistäminen Androidiin epäonnistuu tai se on epävakaa, suorita Flash uudelleen viimeisimmillä tehdasasetusten näköistiedostoilla osoitteesta &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; tai käytä &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ja valitse \"Pyyhi laite\", \"Lukitse käynnistysohjelma\" tai \"Pakota Flash kaikille osioille\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 kt:n sivusta riippumaton tila"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lue lisää"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Käynnistä sovellus sivukoon yhteensopivuustilassa"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Virheraportin käsittelijä"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Valitsee, mikä sovellus käsittelee laitteen virheraportti-pikanäppäintä."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Henkilökohtainen"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Kuuntele striimiä"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skannaa QR-koodi, niin <xliff:g id="DEVICE_NAME">%1$s</xliff:g> voi toistaa audiostriimiä"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Salasanaa ei voi muokata jakamisen aikana. Jos haluat vaihtaa salasanaa, laita ensin audionjako pois päältä."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Salasanassa on oltava 4–16 merkkiä, ja siinä voi olla vain kirjaimia, numeroita ja symboleita"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-koodiskanneri"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Tarvitsetko apua?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Hae asetuksista"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"yhteystiedot, tallennustila, tili"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Yhteystietojen säilytys"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Vain laite"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Uusia yhteystietoja ei synkronoida tilille"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Yhteystiedot tallennetaan laitteelle ja synkronoidaan tilillesi oletuksena"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Oletustilin valinta epäonnistui"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ei oletusta"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Vain laite"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Laite ja %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aloita lisäämällä tili"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Minne yhteystiedot tallennetaan"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Kosketa aloitusnäyttöpainiketta tai siirtymiskahvaa pitkään, jotta voit tehdä haun näytöllä olevasta sisällöstä."</string>
 </resources>
diff --git a/res/values-fr-feminine/strings.xml b/res/values-fr-feminine/strings.xml
new file mode 100644
index 00000000000..2d0048bb4f1
--- /dev/null
+++ b/res/values-fr-feminine/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeuse.}one{Plus que # étapes pour être développeuse.}other{Plus que # étapes pour être développeuse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeuse !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeuse."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connectée à un réseau WEP. Si vous n\'autorisez plus ce type de réseaux, vous serez déconnectée."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connectée ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisée à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connectée"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connectée à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connectée à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connectée en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connectée à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invitée (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connectée en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentrée"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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ée à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-masculine/strings.xml b/res/values-fr-masculine/strings.xml
new file mode 100644
index 00000000000..5ab29b7ae15
--- /dev/null
+++ b/res/values-fr-masculine/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur.}one{Plus que # étapes pour être développeur.}other{Plus que # étapes pour être développeur.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeur !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeur."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connecté à un réseau WEP. Si vous n\'autorisez plus ce type de réseaux, vous serez déconnecté."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connecté ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisé à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connecté à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connecté à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invité (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentré"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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-fr-neuter/strings.xml b/res/values-fr-neuter/strings.xml
new file mode 100644
index 00000000000..2d6cbe29772
--- /dev/null
+++ b/res/values-fr-neuter/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur ou développeuse.}one{Plus que # étapes pour être développeur ou développeuse.}other{Plus que # étapes pour être développeur ou développeuse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeur ou développeuse !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeur ou développeuse."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connecté·e à un réseau WEP. Si vous n\'autorisez plus ce type de réseaux, vous serez déconnecté·e."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connecté·e ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisé·e à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté·e"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connecté·e à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connecté·e à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connecté·e en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté·e à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invité·e (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté·e en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour garder votre concentration"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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é·e à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-rCA-feminine/strings.xml b/res/values-fr-rCA-feminine/strings.xml
new file mode 100644
index 00000000000..93786219678
--- /dev/null
+++ b/res/values-fr-rCA-feminine/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeuse.}one{Plus que # étape pour être développeuse.}other{Plus que # étapes pour être développeuse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes maintenant développeuse!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeuse."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connectée à un réseau WEP. Si vous arrêtez d\'autoriser ces réseaux, vous serez déconnectée."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connectée à un RPV. Si vous vous connectez à un RPV différent, votre RPV actuel sera remplacé."</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connectée en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"Un appareil Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connectée à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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 à propos des appels entrants et sortants.\n\nVous ne vous êtes jamais connectée à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-rCA-masculine/strings.xml b/res/values-fr-rCA-masculine/strings.xml
new file mode 100644
index 00000000000..3016eaa84ef
--- /dev/null
+++ b/res/values-fr-rCA-masculine/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur.}one{Plus que # étape pour être développeur.}other{Plus que # étapes pour être développeur.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes maintenant développeur!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeur."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connecté à un réseau WEP. Si vous arrêtez d\'autoriser ces réseaux, vous serez déconnecté."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connecté à un RPV. Si vous vous connectez à un RPV différent, votre RPV actuel sera remplacé."</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"Un appareil Bluetooth, <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_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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 à propos des 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-rCA-neuter/strings.xml b/res/values-fr-rCA-neuter/strings.xml
new file mode 100644
index 00000000000..f8ed711c789
--- /dev/null
+++ b/res/values-fr-rCA-neuter/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur ou développeuse.}one{Plus que # étape pour être développeur ou développeuse.}other{Plus que # étapes pour être développeur ou développeuse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes maintenant développeur·euse!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà un développeur·euse."</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="6894496037087903635">"Vous êtes connecté·e à un réseau WEP. Si vous arrêtez d\'autoriser ces réseaux, vous serez déconnecté·e."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous disposez déjà d\'une connexion à un RPV. Si vous vous connectez à un RPV différent, votre RPV actuel sera remplacé."</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté·e en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"Un appareil Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté·e à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <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 à propos des appels entrants et sortants.\n\nVous ne vous êtes jamais connecté·e à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 12749a567f5..2993aa6f1e6 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Flocon de neige"</item>
     <item msgid="7952183800501346803">"Parasol"</item>
     <item msgid="799139025758265891">"Outils d\'atelier"</item>
-    <item msgid="1330084588359129896">"Tente"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Pellicule de film"</item>
     <item msgid="5827426100157335512">"Livre"</item>
     <item msgid="8585828346253128384">"Fleur de lotus"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c6a494be618..9bf7ed2d5d7 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un autre appareil"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"L\'activer automatiquement demain"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Si vous désactivez le Bluetooth, il se réactivera le lendemain"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Asso. oreille droite"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Asso. oreille gauche"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Associer l\'autre oreille"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Désactiver le Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Désactive la fonctionnalité Bluetooth LE Audio si l\'appareil prend en charge les capacités matérielles LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Mode Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Activer l\'aperçu de l\'IU de diffusion Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Active l\'aperçu de l\'IU de diffusion Bluetooth LE Audio, y compris le partage audio personnel et la diffusion privée"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Afficher comm. LE Audio dans les détails"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Contourner la liste verte du Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Utiliser LE Audio par défaut même si le périphérique LE Audio n\'a pas été vérifié en fonction des critères de la liste verte."</string>
@@ -136,7 +139,7 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"Tout afficher"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Tout afficher"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"Stylet"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"Appui du bouton supérieur"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"Appui sur le bouton supérieur"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (profil professionnel)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Écrire dans les champs de texte"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorer toutes les pressions sur les boutons du stylet"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Langue de l\'appli"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Langues suggérées"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Toutes les langues"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggestions"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Toutes les langues"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Toutes les régions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tous les systèmes de numérotation"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Langue du système"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Paramètre système par défaut"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La sélection de la langue pour cette appli n\'est pas accessible à partir des paramètres."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Modifier"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s non accessible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Cette langue ne peut pas être utilisée comme langue du système, mais vous avez indiqué aux applis et aux sites Web qu\'il s\'agissait de votre préférence."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Rechercher"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Ajouter une langue"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Préférences régionales"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Entrez la langue"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Plus de paramètres de langue"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Préférences régionales"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Définissez les préférences relatives aux unités et aux chiffres"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Indiquez aux applis vos préférences régionales afin qu\'elles puissent personnaliser votre expérience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Les applis utiliseront vos préférences régionales quand c\'est possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Préférences régionales"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Température"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Premier jour de la semaine"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Préférences relatives aux chiffres"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connectez-vous aux services de données lors de l\'itinérance"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Des frais d\'itinérance peuvent s\'appliquer."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Définir l\'heure automatiquement"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Définir automatiquement"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"La position sera utilisée pour définir le fuseau horaire lorsque cette option est activée"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Date et heure automatiques"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Configurez automatiquement ce paramètre à l\'aide de votre réseau et de vos signaux sans fil"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuseau horaire automatique"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Configurez ce paramètre automatiquement en fonction des réseaux cellulaires à proximité"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Configurez automatiquement ce paramètre si la localisation de l\'appareil est disponible"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Heure"</string>
@@ -361,7 +376,7 @@
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Utilisez le déverrouillage par reconnaissance faciale pour déverrouiller votre téléphone"</string>
     <string name="security_settings_fingerprint" msgid="6387775386189204201">"Empreinte digitale"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Empreintes digitales"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Lors de l\'utilisation du Déverrouillage par empreinte digitale"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Quand le Déverrouillage par empreinte digitale est utilisé"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Empreinte digitale pour le travail"</string>
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Ajouter une empreinte digitale"</string>
     <string name="security_settings_fingerprint_preference_summary" msgid="8486134175759676037">"{count,plural, =1{Empreinte digitale ajoutée}one{# empreinte digitale ajoutée}other{# empreintes digitales ajoutées}}"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Relevez le doigt, puis touchez le capteur à nouveau"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Impossible d\'utiliser le capteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Consultez un fournisseur de services de réparation."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Déverrouillage par empreinte digitale lorsque l\'écran est éteint"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Utiliser le Déverrouillage par empreinte digitale même lorsque l\'écran est éteint"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Écran éteint, déverrouiller"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Plus de paramètres de sécurité"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Verrouillage de profil professionnel, chiffrement et plus"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Chiffrement, authentifiants et plus"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Créer un schéma d\'espace privé"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Verrouiller"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Masquer"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirmer le schéma de votre espace privé"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Entrer à nouveau le NIP de votre espace privé"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Entrer à nouveau le mot de passe de l\'espace privé"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter des empreintes digitales"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activé"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Désactivé"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Écran externe"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Utiliser un écran externe"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Résolution de l\'écran"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"L\'écran externe est déconnecté"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Changer la rotation ou la résolution pourrait arrêter toute appli en cours d\'exécution"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Votre appareil doit être connecté à un écran externe pour dupliquer votre écran"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Autres options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Maintenez le doigt sur les écrans et faites-les glisser pour les réorganiser."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Diffusion"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"miroir"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Vérifiez votre mot de passe, puis réessayez"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Communiquez avec le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Vérifiez votre connexion et réessayez"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ce réseau Wi-Fi n\'est pas accessible pour le moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Il y a un problème avec ce code QR. Essayez de vous connecter d\'une autre manière."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choisir un réseau"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Pour connecter votre appareil, choisissez un réseau"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ajouter cet appareil au réseau « <xliff:g id="SSID">%1$s</xliff:g> »?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"En savoir plus sur la rotation automatique"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Résolution de l\'écran"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Haute résolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Résolution intégrale"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"La résolution intégrale sollicite davantage votre pile. Le changement de résolution peut entraîner le redémarrage de certaines applis."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Sélectionnée"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Couleurs"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturelles"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptatives"</string>
     <string name="brightness" msgid="6216871641021779698">"Niveau de luminosité"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Luminosité adaptative"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"À propos de la luminosité adaptative"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"La luminosité de votre écran s\'adapte automatiquement à votre environnement et à vos activités. Vous pouvez déplacer le curseur manuellement pour aider la luminosité adaptative à apprendre vos préférences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activé"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Désactivée"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Paramètres du mode Nuit"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Les modes peuvent également activer le thème sombre}=1{{mode_1} active également le thème sombre}=2{{mode_1} et {mode_2} activent également le thème sombre}=3{{mode_1}, {mode_2} et {mode_3} activent également le thème sombre}one{{mode_1}, {mode_2} et # autre activent également le thème sombre}other{{mode_1}, {mode_2} et # autres activent également le thème sombre}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Paramètres des modes"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Réduire davantage la luminosité"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Réduction supplémentaire de la luminosité"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Autoriser l\'appareil à réduire la luminosité plus que d\'habitude"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Mise en veille de l\'écran"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applis 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="location_services_preference_title" msgid="604317859531782159">"Services de localisation"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Services de localisation"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Utiliser ma position"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Utiliser la localisation pour le fuseau horaire"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Fuseau horaire : définition automatique impossible"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"La position ou les services de localisation sont désactivés"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Paramètres de localisation"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corriger ce problème"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Annuler"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La détection automatique du fuseau horaire est désactivée"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Non disponible lorsque le fuseau horaire automatique est désactivé"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"La position peut être utilisée pour définir le fuseau horaire"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Si la localisation de votre appareil est disponible, elle peut être utilisée pour définir votre fuseau horaire"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="7509900979811934843">"Renseignements juridiques"</string>
     <string name="manual" msgid="3651593989906084868">"Manuel"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilité"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Clavier physique"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Touches non répétées"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Le clavier ignore les appuis répétés rapidement sur les touches de la même clé dans un délai de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Le clavier ignore les appuis répétés rapidement sur la même touche"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Seuil de la touche non répétée"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choisissez la durée pendant laquelle votre clavier ignore les appuis répétés sur une touche"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personnalisée"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valeur personnalisée"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Touches lentes"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Règle le temps nécessaire pour qu\'un appui sur une touche soit activé à <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Règle le temps nécessaire pour qu\'un appui sur une touche soit activé"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Touches rémanentes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Appuyez sur une clé à la fois pour activer les raccourcis plutôt que de maintenir plusieurs touches enfoncées en même temps"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Touches de la souris"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Utiliser le clavier physique pour contrôler la souris"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Utiliser les touches de la souris"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utilisez votre clavier pour contrôler le pointeur"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Défilement inversé de la souris"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Faites défiler l\'écran vers le haut pour déplacer la page vers le bas"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Inverser les boutons gauche et droit"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utilisez le bouton gauche de la souris comme bouton droit"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Touches de la souris pour <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Utilisez les touches <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> pour déplacer le pointeur de la souris"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Utilisez la touche <xliff:g id="CLICK_LABEL">%s</xliff:g> pour cliquer sur le bouton principal de la souris"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Utilisez la touche <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> pour maintenir le bouton principal de la souris enfoncé"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Utilisez la touche <xliff:g id="RELEASE_LABEL">%s</xliff:g> pour relâcher le bouton principal de la souris"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Utilisez la touche <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> pour activer le mode de défilement. Les touches <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> feront alors défiler l\'affichage vers le haut, le bas, la gauche ou la droite"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Utilisez la touche <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> pour cliquer sur le bouton secondaire de la souris"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Affichez la liste de raccourcis"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Claviers et outils pour le profil professionnel"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Par défaut"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Pavé tactile"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Pavé tactile et souris"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Souris"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Vitesse du pointeur, gestes"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Toucher pour cliquer"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Déplacement tactile"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic en bas à droite"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Cliquez dans le coin inférieur droit du pavé tactile pour plus d\'options"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Vitesse du pointeur"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Utiliser le toucher à trois doigts"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Couleur du pointeur"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Changez le style du pointeur à noir"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Changez le style du pointeur à vert"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Apprendre les gestes du pavé tactile"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"pavé tactile, souris, curseur, faire défiler, balayer, faire un clic droit, cliquer, pointeur"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"faire un clic droit, toucher"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic au centre"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Lancer l\'Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Retour à la page d\'accueil"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Retour"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Afficher les applis récentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Retour à la page d\'accueil"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Balayez votre pavé tactile vers le haut avec trois doigts"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Retour"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilité du clavier physique"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Touches rémanentes, touches non répétées, touches de la souris"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Touches de répétition"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Délai avant la répétition"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Fréquence de répétition"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Maintenez une touche enfoncée pour répéter son caractère jusqu\'à ce que la touche soit relâchée"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Mise en page <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatique : <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Taille de la police"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Taille des sous-titres"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Style de sous-titres"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Options de personnalisation"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Couleur de l\'arrière-plan"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Modules inclus"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Les applis fonctionnent normalement"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Le remplacement de la pile est recommandé"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"La capacité de la pile et les performances de recharge sont réduites; le remplacement de la pile est recommandé."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Pile faible"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activez l\'économiseur de pile pour prolonger l\'autonomie de la pile"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Améliorer l\'autonomie de la pile"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Déconnecter ce RPV?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Déconnecter"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Oublier le profil RPV"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Remplacer le RPV existant?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Définir le RPV permanent?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"« 9 h à 17 h les jours de semaine »"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Événements d\'agenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Le mode {mode_1} est actif}=2{Les modes {mode_1} et {mode_2} sont actifs}=3{Les modes {mode_1}, {mode_2} et {mode_3} sont actifs}one{Les modes {mode_1}, {mode_2}, et # autre sont actifs}other{Les modes {mode_1}, {mode_2}, et # autres sont actifs}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode peut s\'activer automatiquement}one{# mode peut s\'activer automatiquement}other{# modes peuvent s\'activer automatiquement}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne pas déranger}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVÉ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Non défini"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Désactivé"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durée"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, événements et rappels"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"OK"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Paramètres"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Aucun élément visuel ni son provenant des notifications"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Aucun son des notifications"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Vous ne verrez et n\'entendrez pas de notifications. Les appels des contacts marqués d\'une étoile et les appels répétés sont autorisés."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Paramètre actuel)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Modifier les paramètres de notification du mode Ne pas déranger?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Utiliser les sons du profil personnel"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Utiliser les mêmes sons que votre profil personnel"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Après le déverrouillage, accédez au dernier écran utilisé. Les notifications ne s\'afficheront pas à l\'écran. Balayez du haut vers le bas pour les voir."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, écran verrouillé, ignorer, contourner"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Lorsque le profil professionnel est verrouillé"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalisme des notifications sur l\'écran de verrouillage"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Afficher moins de notifications sur l\'écran de verrouillage"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Afficher seul. les nouv. notif. sur l\'écran de verrouillage"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Retirez automatiquement les notifications consultées de l\'écran de verrouillage"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Afficher les conversations, par défaut et silencieuses"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Afficher les conversations, par défaut et silencieuses"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Afficher tout le contenu des notif. professionn."</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Masquez le contenu professionnel sensible"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications de profil s\'affichent?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notifications de profil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notifications des applis"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Lorsque vous recevez de nombreuses notifications pendant un court laps de temps, votre appareil baisse le volume et réduit les alertes pour une période maximale de deux minutes. Les appels, les alarmes et les conversations prioritaires ne sont pas concernés par cette mesure. \n\nVous pouvez afficher les notifications reçues pendant cette période en faisant glisser votre doigt du haut de l\'écran vers le bas."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Appliquer aux profils professionnels"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Appliquez ce paramètre aux applis du profil professionnel"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notifications groupées"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activé"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Désactivé"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Utiliser le regroupement des notifications"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Les notifications ayant des thèmes similaires seront désactivées au niveau du son et regroupées pour une expérience plus silencieuse. Le regroupement remplacera les paramètres de notification propres aux applis."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Services d\'assistance pour la réalité virtuelle"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune demande d\'exécution en tant que services d\'assistance pour la réalité virtuelle n\'a été envoyée pour les applis installées."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder au service de réalité virtuelle?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Paramètres des conversations"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui peut provoquer des interruptions"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Même si vous ne pouvez pas recevoir de notifications des applis de messagerie ou de téléphonie, les personnes que vous choisissez ici peuvent toujours vous joindre par le biais de celles-ci"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Paramètres des contacts"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Paramètres des contacts marqués d\'une étoile"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Aucun"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Aucune appli 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 appli peuvent provoquer des interruptions}other{{app_1}, {app_2} et # autres applis peuvent provoquer des interruptions}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (professionnel)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calcul en cours…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Paramètres des applis"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Autoriser les applis à ignorer le mode Ne pas déranger"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Applis qui peuvent provoquer des interruptions"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Créer un mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode personnalisé"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nom du mode"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Le nom du mode est obligatoire"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Sélectionner une icône"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Événements d\'agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Heure du coucher"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"En conduisant"</string>
@@ -3931,7 +4013,7 @@
     <string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"Entrez le NIP d\'administrateur"</string>
     <string name="switch_on_text" msgid="5664542327776075105">"Activé"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Désactivé"</string>
-    <string name="nfc_setting_on" msgid="7701896496026725772">"Activée"</string>
+    <string name="nfc_setting_on" msgid="7701896496026725772">"Activé"</string>
     <string name="nfc_setting_off" msgid="7142103438532732309">"Désactivée"</string>
     <string name="screen_pinning_switch_on_text" msgid="6971386830247542552">"Activé"</string>
     <string name="screen_pinning_switch_off_text" msgid="5032105155623003875">"Désactivé"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notifications en plein écran"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Autoriser les notifications en plein écran de cette appli"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Autoriser cette appli à afficher des notifications en plein écran lorsque l\'appareil est verrouillé. Les applis peuvent s\'en servir pour mettre en évidence des alarmes, des appels entrants ou d\'autres notifications urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Écriture des préférences système"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Autoriser cette appli à modifier les préférences système en votre nom"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Cette autorisation permet à une appli de modifier les préférences système principales."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Applis de gestion des fichiers multimédias"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Autoriser l\'appli à gérer fichiers multimédias"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Si vous l\'autorisez à le faire, cette appli peut modifier ou supprimer des fichiers multimédias créés à l\'aide d\'autres applis sans vous le demander. L\'appli doit avoir l\'autorisation d\'accéder aux fichiers et aux fichiers multimédias."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestes"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Ouvrir rapidement l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Pour ouvrir rapidement l\'appareil photo, appuyez deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Changer d\'appareil photo pour prendre un égoportrait"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mode de navigation"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Messagerie par satellite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envoyez et recevez des messages texte par satellite. Compris dans votre compte."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envoyez et recevez des messages texte par satellite. Non inclus avec votre compte."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Messagerie par satellite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"À propos de la messagerie par satellite"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Vous pouvez envoyer et recevoir des messages texte par satellite à l\'aide d\'un compte <xliff:g id="CARRIER_NAME">%1$s</xliff:g> admissible"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Votre forfait <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"La messagerie par satellite est comprise dans votre compte"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"La messagerie par satellite n\'est pas comprise dans votre compte"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"En savoir plus"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Fonctionnement"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Votre téléphone se connectera automatiquement à un satellite. Pour une connexion optimale, tenez le téléphone sous un ciel dégagé."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Une fois que votre téléphone s\'est connecté à un satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Vous pouvez envoyer des messages texte à n\'importe qui, y compris aux services d\'urgence. Votre téléphone se reconnectera à un réseau cellulaire lorsqu\'il sera accessible."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"La messagerie par satellite peut prendre plus de temps et est accessible seulement dans certaines régions. Les conditions météorologiques et certaines structures peuvent avoir une incidence sur votre connexion par satellite. Les appels par satellite ne sont pas accessibles. Les appels d\'urgence pourraient tout de même se connecter.\n\nIl peut s\'écouler un certain temps avant que les modifications apportées à votre compte s\'affichent dans les paramètres. Communiquez avec votre opérateur pour en savoir plus."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"En savoir plus sur la messagerie par satellite"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Impossible d\'activer la fonctionnalité <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Pour activer la fonctionnalité <xliff:g id="FUNCTION">%1$s</xliff:g>, mettez d\'abord fin à la connexion par satellite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Connectivité par satellite"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Noms des points d\'accès"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"nom du point d\'accès"</string>
     <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>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Vous êtes dans le mode 16 Ko du mode indépendant de la page. L\'intégrité du logiciel ne peut pas être garantie dans ce mode, et toutes les données stockées sur le téléphone pendant que le programme d\'amorçage est déverrouillé pourraient être compromises. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applications peuvent ne pas fonctionner. Pour repasser en mode production, vous devez basculer vers le mode 4 Ko, puis verrouiller le programme d\'amorçage de l\'appareil. Cette opération réinitialisera à nouveau l\'appareil et rétablira ses paramètres par défaut. Une fois que l\'appareil a bien démarré sous Android, désactivez le déverrouillage par le fabricant d\'équipement d\'origine dans les Options pour les développeurs. Si l\'appareil ne démarre pas sous Android ou s\'il est instable, flashez à nouveau l\'appareil avec les dernières images par défaut à partir de la page &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou utilisez la page &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; et sélectionnez « Nettoyer l\'appareil », « Verrouiller le programme d\'amorçage » et « Forcer le flash de toutes les partitions »."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Mode agnostique de page 16 Ko"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lire la suite"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Exécuter l\'appli avec le mode de compatibilité de taille de page"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gestionnaire de rapport de bogue"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Détermine quelle appli gère le raccourci de rapport de bogue sur votre appareil."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personnel"</string>
@@ -5161,7 +5313,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"La BUL n\'est pas accessible à l\'emplacement actuel"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Utiliser Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread permet de connecter vos appareil pour maison intelligente et d\'en améliorer l\'efficacité et les performances.\n\nUne fois activé, cet appareil peut rejoindre un réseau Thread, permettant de contrôler les appareils pris en charge par Matter à partir de ce téléphone."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread permet de connecter vos appareil pour maison intelligente et d\'en améliorer l\'efficacité et les performances.\n\nUne fois activé, cet appareil peut rejoindre un réseau Thread, ce qui vous permet de contrôler les appareils pris en charge par Matter à partir de ce téléphone."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"En savoir plus sur Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Accès à la caméra"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Accès au microphone"</string>
@@ -5248,7 +5400,7 @@
     <string name="aspect_ratio_main_summary_text" msgid="5544816872094235840">"Essayez d\'autres proportions pour afficher une appli si elle n\'a pas été conçue pour s\'adapter à votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Il se peut que certaines applis ne soient pas optimisées pour certaines proportions."</string>
     <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Applis suggérées"</string>
     <string name="user_aspect_ratio_changed_apps_label" msgid="2096614916172567672">"Applis modif."</string>
-    <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Appli par défaut"</string>
+    <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Proportions par défaut de l\'appli"</string>
     <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Plein écran"</string>
     <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Moitié de l\'écran"</string>
     <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Proportions de l\'appareil"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Écouter le flux"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Balayez le code QR d\'un flux audio pour l\'écouter avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Impossible de modifier le mot de passe lors du partage. Pour modifier le mot de passe, désactivez d\'abord le partage audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Votre mot de passe doit contenir de 4 à 16 caractères et utiliser uniquement des lettres, des chiffres et des symboles"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Lecteur de code QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Besoin d\'aide?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Paramètres de recherche"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, stockage, compte"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stockage des contacts"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Appareil uniquement"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Les nouveaux contacts ne seront pas synchronisés avec un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Les contacts seront enregistrés sur votre appareil et synchronisés avec votre compte par défaut"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erreur lors de la définition du compte par défaut"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Aucun compte par défaut n\'a été défini"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Appareil uniquement"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Appareil et %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Où enregistrer les contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Encercler et rechercher"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Maintenez le doigt sur la touche d\'accueil ou sur la barre de navigation pour effectuer une recherche à l\'aide du contenu de votre écran."</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 4a2e6e2f019..1059146c8c5 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Flocon de neige"</item>
     <item msgid="7952183800501346803">"Parasol"</item>
     <item msgid="799139025758265891">"Outils d\'atelier"</item>
-    <item msgid="1330084588359129896">"Tente"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Bobine de film"</item>
     <item msgid="5827426100157335512">"Livre"</item>
     <item msgid="8585828346253128384">"Fleur de lotus"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 02897ef4941..67915268db7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un appareil"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activer automatiquement demain"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Si vous désactivez le Bluetooth, il se réactive le lendemain"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Associer le droit"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Associer le gauche"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Associer l\'autre appareil"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Désactiver Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Désactive la fonctionnalité Bluetooth LE Audio si l\'appareil est compatible avec les capacités matérielles LE Audio"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Mode Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Activer l\'aperçu de l\'UI de diffusion Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Active l\'aperçu de l\'UI de partage LE Audio, y compris le partage audio personnel et la diffusion privée"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Bouton LE Audio dans Détails appareil"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Liste d\'autorisation de contournement Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Utilisez LE Audio par défaut même si le respect des critères de la liste d\'autorisation par le périphérique LE Audio n\'a pas été validé."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Langue de l\'appli"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Langues suggérées"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Toutes les langues"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggestions"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Toutes les langues"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Toutes les régions"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tous les systèmes de numérotation"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Langue du système"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Paramètre système par défaut"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La sélection d\'une langue pour cette appli n\'est pas disponible depuis les paramètres."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Modifier"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s indisponible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Cette langue ne peut pas être utilisée comme langue du système, mais vous avez indiqué aux applis et sites Web qu\'il s\'agissait de votre préférence."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Rechercher"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Ajouter une langue"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Préférences régionales"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Saisissez la langue"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Autres paramètres de langue"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Préférences régionales"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Définir les préférences d\'unités et de nombres"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Indiquez vos préférences régionales aux applis pour qu\'elles puissent personnaliser votre expérience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Les applis utiliseront vos préférences régionales dans la mesure du possible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Préférences régionales"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Température"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Premier jour de la semaine"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Préférences liées aux chiffres"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Se connecter aux services de données en itinérance"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Se connecter aux services de données en itinérance"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Des frais d\'itinérance peuvent s\'appliquer."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Définir l\'heure automatiquement"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Définir automatiquement"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Quand ce bouton est activé, le fuseau horaire est défini selon la position"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Date et heure automatiques"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Définir automatiquement à l\'aide de votre réseau et de vos signaux sans fil"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuseau horaire automatique"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Définir automatiquement en fonction des réseaux mobiles à proximité"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Définir automatiquement grâce à la position de votre appareil, si celle-ci est disponible"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24h"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Heure"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Relevez le doigt, puis reposez-le sur le lecteur"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Impossible d\'utiliser le lecteur d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Contactez un réparateur."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Déverrouillage par empreinte digitale avec l\'écran éteint"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Utilisez le déverrouillage par empreinte digitale même lorsque l\'écran est éteint"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Écran éteint, déverrouillage"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Autres paramètres de sécurité"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Verrouillage du profil professionnel, chiffrement et plus"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Chiffrement, identifiants et plus"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Définissez un schéma pour l\'espace privé"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Verrouiller"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Masquer"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirmez le schéma de votre espace privé"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Saisissez à nouveau le code de votre espace privé"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Saisissez de nouveau le mot de passe de votre espace privé"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal autorisé d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter d\'autres empreintes digitales"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activé"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Désactivé"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Écran externe"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Utiliser un écran externe"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Résolution de l\'écran"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"L\'écran externe est déconnecté"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"La modification de la rotation ou de la résolution peut entraîner l\'arrêt des applis en cours d\'exécution"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Votre appareil doit être connecté à un écran externe pour dupliquer votre écran"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Autres options"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Appuyez de manière prolongée et faites glisser pour réorganiser les écrans."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplication d\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Vérifiez le mot de passe et réessayez"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contactez le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Vérifiez la connexion et réessayez"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ce réseau Wi‑Fi n\'est pas disponible pour le moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ce code QR présente un problème. Essayez de vous connecter d\'une autre manière."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Sélectionner un réseau"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Sélectionnez un réseau pour connecter l\'appareil"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ajouter cet appareil à \"<xliff:g id="SSID">%1$s</xliff:g>\" ?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"En savoir plus sur la rotation automatique"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Résolution d\'écran"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Haute résolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Pleine résolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"La pleine résolution consomme davantage de batterie. Changer de résolution peut entraîner le redémarrage de certaines applis."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Sélectionnée"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Couleurs"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturelles"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptatives"</string>
     <string name="brightness" msgid="6216871641021779698">"Niveau de luminosité"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Luminosité adaptative"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"À propos de la luminosité adaptative"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"La luminosité de l\'écran s\'adapte automatiquement à votre environnement et à vos activités. Vous pouvez déplacer le curseur manuellement pour aider la fonctionnalité à apprendre vos préférences."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activé"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Désactivé"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Paramètres du mode Coucher"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Les modes peuvent également activer le thème sombre}=1{{mode_1} active également le thème sombre}=2{{mode_1} et {mode_2} activent également le thème sombre}=3{{mode_1}, {mode_2} et {mode_3} activent également le thème sombre}one{{mode_1}, {mode_2} et # autre mode activent également le thème sombre}other{{mode_1}, {mode_2} et # autres modes activent également le thème sombre}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Paramètres des modes"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Luminosité ultra-réduite"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Luminosité ultra-réduite"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Autoriser une diminution plus importante de la luminosité de l\'appareil"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Délai de mise en veille de l\'écran"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autorisez les applis et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cela peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Services de localisation"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Services de localisation"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Utiliser la position"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Utiliser la position pour définir le fuseau horaire"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Fuseau horaire : définition automatique impossible"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"La position ou les services de localisation sont désactivés"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Paramètres de localisation"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corriger"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Annuler"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Le fuseau horaire automatique est désactivé"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Non disponible lorsque le fuseau horaire automatique est désactivé"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"La position peut être utilisée pour définir le fuseau horaire"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Si la position de votre appareil est disponible, celle-ci peut être utilisée pour définir votre fuseau horaire"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informations légales"</string>
     <string name="manual" msgid="3651593989906084868">"Manuel"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Options"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilité"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Clavier physique"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Touches à rebonds"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Le clavier ignore les frappes rapides et consécutives d\'une même touche dans un intervalle de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Le clavier ignore les frappes rapides et consécutives d\'une même touche"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Seuil de touches filtres"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choisissez la durée pendant laquelle votre clavier ignore les frappes consécutives d\'une touche"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personnalisé"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valeur personnalisée"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Touches lentes"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Règle le temps de réponse d\'une pression de touche sur <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Règle le temps de réponse à la pression d\'une touche"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Touches persistantes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pour les raccourcis, appuyer sur une touche à la fois au lieu de maintenir les touches enfoncées"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Touches pour la souris"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Utiliser le clavier physique pour contrôler la souris"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Utiliser les touches pour la souris"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utilisez le clavier pour contrôler le pointeur"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Défilement inversé avec la souris"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Faire défiler vers le haut pour déplacer la page vers le bas"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Inverser les boutons gauche et droit"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utiliser le bouton gauche de la souris comme bouton droit"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Touches pour la souris pour <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Utilisez les touches <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> pour déplacer le pointeur de la souris"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Utilisez la touche <xliff:g id="CLICK_LABEL">%s</xliff:g> pour cliquer sur le bouton principal de la souris"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Utilisez la touche <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> pour appuyer de manière prolongée sur le bouton principal de la souris"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Appuyez sur la touche <xliff:g id="RELEASE_LABEL">%s</xliff:g> pour relâcher le bouton principal de la souris"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Utilisez la touche <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> pour activer ou désactiver le mode Défilement. Cette option permet de faire défiler l\'affichage vers le haut, le bas, la gauche ou la droite à l\'aide des touches <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Utilisez la touche <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> pour cliquer sur le bouton secondaire de la souris"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afficher la liste des raccourcis"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Claviers et outils du profil professionnel"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Par défaut"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Pavé tactile"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Pavé tactile et souris"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Souris"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Vitesse du pointeur, gestes"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Taper pour cliquer"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Déplacement tactile"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic en bas à droite"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Pour plus d\'options, cliquez en bas à droite du pavé tactile"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Vitesse du pointeur"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Appuyer avec trois doigts"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Couleur du pointeur"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Définir le remplissage du pointeur sur noir"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Définir le remplissage du pointeur sur vert"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Découvrir gestes au pavé tactile"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"pavé tactile, pavé tactile, souris, curseur, faire défiler, balayer, clic droit, clic, pointeur"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"clic droit, appuyer"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic au milieu"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Lancer l\'Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Retour à l\'accueil"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Retour"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Afficher les applis récentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Retour à l\'accueil"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Balayez vers le haut avec trois doigts sur le pavé tactile"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Retour"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilité du clavier physique"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Touches rémanentes, touches à rebonds, touches pour la souris"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Répéter les touches"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Délai avant répétition"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Fréquence de répétition"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Maintenez une touche enfoncée pour répéter le caractère correspondant jusqu\'à ce que vous la relâchiez"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Mise en page <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatique : <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Taille de la police"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Taille des sous-titres"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Style des sous-titres"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Options de personnalisation"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Couleur d\'arrière-plan"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Modules inclus"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Les applications s\'exécutent normalement"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Remplacement de la batterie recommandé"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"La capacité de la batterie et les performances de recharge sont réduites. Nous vous recommandons de remplacer la batterie."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Niveau de batterie faible"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activer l\'économiseur de batterie pour prolonger l\'autonomie"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Améliorer l\'autonomie de la batterie"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Déconnecter ce VPN ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Déconnecter"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Supprimer le VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Remplacer le VPN existant ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Définir le VPN permanent ?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9h - 17h en semaine\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Événements d\'agenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} est actif}=2{{mode_1} et {mode_2} sont actifs}=3{{mode_1}, {mode_2} et {mode_3} sont actifs}one{{mode_1}, {mode_2} et # de plus sont actifs}other{{mode_1}, {mode_2} et # de plus sont actifs}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode peut s\'activer automatiquement}one{# mode peut s\'activer automatiquement}other{# modes peuvent s\'activer automatiquement}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne pas déranger}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVÉ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Non défini"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Désactivé"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durée"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, événements et rappels"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"OK"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Paramètres"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Aucune notification visuelle ni sonore"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Aucune notification sonore"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Vous ne recevrez aucune notification visuelle ni sonore. Les appels de vos contacts favoris et des appelants fréquents seront autorisés."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Paramètre actuel)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Modifier les paramètres de notification du mode Ne pas déranger ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Utiliser les sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Utiliser les mêmes sons que pour votre profil personnel"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Vous accédez au dernier écran utilisé sans voir l\'écran de déverrouillage et les notifications qu\'il contient. Pour les voir, balayez vers le bas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, verrouiller l\'écran, passer, ignorer"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Quand le profil professionnel est verrouillé"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalisme des notifications sur l\'écran de verrouillage"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Afficher moins de notifications sur l\'écran de verrouillage"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"N\'afficher que les nouvelles notif. sur l\'écran verrouillage"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Supprimer automatiquement de l\'écran de verrouillage les notifications déjà consultées"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Afficher les conversations, par défaut et silencieuses"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Afficher les conversations, par défaut et silencieuses"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Afficher tout le contenu des notifications professionnelles"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Masquer le contenu professionnel sensible"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications du profil s\'affichent ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notifications du profil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notifications des applis"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Si vous recevez beaucoup de notifications en peu de temps, votre appareil réduit le volume et les alertes pendant 2 minutes maximum. Les appels, les alarmes et les conversations prioritaires ne sont pas affectés. \n\nLes notifications reçues pendant la limitation sont accessibles en faisant glisser votre doigt du haut de l\'écran vers le bas."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Appliquer aux profils professionnels"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Appliquer aux applis des profils professionnels"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notifications groupées"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activé"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Désactivé"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Utiliser le regroupement des notifications"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Les notifications portant sur des thèmes similaires seront regroupées et n\'émettront plus de son pour une expérience plus silencieuse. Cela annule les paramètres de notification propres à chaque appli."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Services d\'assistance RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune des applis installées n\'a demandé à être exécutée en tant que service d\'assistance pour la réalité virtuelle."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser \"<xliff:g id="SERVICE">%1$s</xliff:g>\" à accéder au service de RV ?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Paramètres des conversations"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Personnes qui peuvent interrompre"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Même si les applications de messagerie ou d\'appel ne peuvent pas vous envoyer de notifications, les personnes que vous sélectionnez ici peuvent vous contacter par leur biais"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Paramètres des contacts"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Paramètres des contacts favoris"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Aucun"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 appli peuvent interrompre le mode Ne pas déranger}other{{app_1}, {app_2} et # autres applis peuvent interrompre le mode Ne pas déranger}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (professionnel)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calcul en cours"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Paramètres des applis"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Autoriser des applications à ignorer ce mode"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Applis qui peuvent interrompre"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Créer un mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode personnalisé"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nom du mode"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Vous devez indiquer un nom de mode"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Sélectionnez une icône"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Événements d\'agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Heure du coucher"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"En conduisant"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notifications en plein écran"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Autoriser l\'appli à afficher les notifications en plein écran"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Autoriser cette appli à afficher des notifications occupant tout l\'écran lorsque l\'appareil est verrouillé. Les applis peuvent les utiliser pour mettre en avant les alarmes, les appels entrants ou d\'autres notifications urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Écrire les préférences système"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Autoriser cette appli à modifier les préférences système à votre place"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Cette autorisation permet à une appli de modifier les préférences système de base."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Applis de gestion de fichiers multimédias"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Autoriser appli à gérer fichiers multimédias"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Cette appli pourra modifier ou supprimer les fichiers multimédias créés avec d\'autres applis sans vous le demander (à condition qu\'elle soit autorisée à accéder aux fichiers et aux contenus multimédias)."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestes"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Ouvrir rapidement l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Pour accéder rapidement à l\'appareil photo, appuyer deux fois sur le bouton Marche/Arrêt. Fonctionne depuis n\'importe quel écran."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Passer à la caméra frontale"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mode de navigation"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Messagerie par satellite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envoyez et recevez des messages par satellite. Inclus dans votre compte."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envoyez et recevez des messages par satellite. Non inclus dans votre compte."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Messagerie par satellite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"À propos de la messagerie par satellite"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Vous pouvez envoyer et recevoir des messages par satellite dans le cadre d\'un compte <xliff:g id="CARRIER_NAME">%1$s</xliff:g> éligible."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Votre forfait <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"La messagerie par satellite est incluse dans votre compte"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"La messagerie par satellite n\'est pas incluse dans votre compte"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"En savoir plus"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Fonctionnement"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Votre téléphone se connectera automatiquement à un satellite. Pour obtenir une meilleure connexion, restez à l\'extérieur avec une vue dégagée du ciel."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Une fois que votre téléphone se connecte à un satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Vous pouvez envoyer un message à n\'importe qui, y compris les services d\'urgence. Votre téléphone se reconnectera à un réseau mobile le cas échéant."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"L\'envoi de messages par satellite peut prendre plus de temps et n\'est disponible que dans certaines zones. La météo et certaines structures peuvent avoir une incidence sur votre connexion satellite. Il n\'est pas possible d\'appeler par satellite. Il est toutefois possible de se connecter aux appels d\'urgence.\n\nLa prise en compte de ces modifications dans Paramètres peut prendre un certain temps. Pour en savoir plus, contactez votre opérateur."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"En savoir plus sur la messagerie par satellite"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Impossible d\'activer le <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Pour activer le <xliff:g id="FUNCTION">%1$s</xliff:g>, coupez d\'abord la connexion satellite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Connectivité satellite"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Noms des points d\'accès"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Vous utilisez le mode 16 Ko du mode agnostique de page mémoire. L\'intégrité du logiciel ne peut pas être garantie dans ce mode, et toute donnée stockée sur le téléphone alors que le bootloader est déverrouillé peut être exposée à un risque. Certaines fonctionnalités seront désactivées dans ces modes, et certaines applications sont susceptibles de ne pas fonctionner. Pour remettre l\'appareil en mode Production, vous devez repasser au mode 4 Ko, puis verrouiller le bootloader de l\'appareil. Cela permet de rétablir la configuration d\'usine de l\'appareil à nouveau et d\'en rétablir les paramètres de production. Une fois que l\'appareil a bien démarré sous Android, désactivez le déverrouillage OEM dans les Options pour les développeurs. Si l\'appareil ne parvient pas à démarrer sous Android ou s\'il est instable, flashez de nouveau l\'appareil à l\'aide des dernières images d\'usine disponibles à l\'adresse &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou utilisez &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; et sélectionnez \"Nettoyer l\'appareil\", \"Verrouiller le bootloader\", puis \"Forcer le flash de l\'ensemble des partitions\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Mode agnostique de page mémoire 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lire la suite"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Exécuter l\'appli en mode de compatibilité de taille de page"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gestionnaire de rapport de bug"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Détermine quelle application gère le raccourci vers le rapport de bug sur votre appareil."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personnel"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Écouter le flux"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scanner le code QR d\'un flux audio pour l\'écouter avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Impossible de modifier le mot de passe lors du partage. Pour modifier le mot de passe, il faut d\'abord désactiver le partage audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Votre mot de passe doit contenir entre 4 et 16 caractères et n\'être composé que de lettres, de chiffres et de symboles"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Lecteur de code QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Besoin d\'aide ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Rechercher un paramètre"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, stockage, compte"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stockage des contacts"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Appareil uniquement"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Les nouveaux contacts ne seront pas synchronisés avec un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Les contacts seront enregistrés sur votre appareil et synchronisés avec votre compte par défaut"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erreur lors de la définition du compte par défaut"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Aucun compte par défaut n\'a été défini"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Appareil uniquement"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Appareil et %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Où enregistrer les contacts"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Entourer pour chercher"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Appuyez de manière prolongée sur le bouton d\'accueil ou la barre de navigation pour effectuer une recherche basée sur le contenu de votre écran."</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 49cbf334b62..4ce2f6dfe1c 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Folerpa"</item>
     <item msgid="7952183800501346803">"Parasol"</item>
     <item msgid="799139025758265891">"Ferramentas dun taller"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rolo de película"</item>
     <item msgid="5827426100157335512">"Libro"</item>
     <item msgid="8585828346253128384">"Flor de loto"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ba5b2d26460..e3af53d9089 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -27,7 +27,7 @@
     <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Agora estás a # paso de converterte na persoa encargada de programar.}other{Agora estás a # pasos de converterte na persoa encargada de programar.}}"</string>
     <string name="show_dev_on" msgid="2840850085134853754">"Agora xa es programador!"</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Non é necesario, xa es un programador."</string>
-    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Activa primeiro as opcións para programadores."</string>
+    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Activa primeiro as opcións de programación."</string>
     <string name="dev_settings_available_to_admin_only_warning" msgid="3408243404879083111">"Só os usuarios con acceso de administración poden acceder á configuración para programadores."</string>
     <string name="header_category_system" msgid="1665516346845259058">"Sistema"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"En servizo"</string>
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincular novo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar mañá automaticamente"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Se desactivas o Bluetooth, actívase de novo ao día seguinte"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Vincular dereito"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Vincular esquerdo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Vincula o outro audiófono"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Sen Bluetooth de baixo consumo (audio)"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Desactiva a función de audio por Bluetooth de baixo consumo se o dispositivo é compatible coas funcións do hardware de audio de baixo consumo."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo audio por Bluetooth baixo consumo"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Actualizar vista previa da interface de difusión do audio por Bluetooth de baixo consumo"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Activa a vista previa da interface do audio de baixo consumo compartido, incluídos o uso compartido do audio persoal e a difusión privada"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Botón Audio de baixo consumo en detalles"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Sortear lista de entidades permitidas para o audio por Bluetooth de baixo consumo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usa o audio de baixo consumo de forma predeterminada mesmo no caso de que non se verificase se o seu dispositivo periférico cumpre os criterios da lista de entidades permitidas."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma das aplicacións"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas suxeridos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos os idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suxestións"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos os idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas as rexións"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos os sistemas de numeración"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma do sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Aplicación predeterminada do sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"A opción de seleccionar un idioma para esta aplicación non está dispoñible en Configuración."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Cambiar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"O idioma %s non está dispoñible"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Este idioma non se pode usar como idioma do sistema, pero indicácheslles ás aplicacións e aos sitios web que é o que prefires."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Buscar"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Engadir un idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferencia de rexión"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Escribe o nome do idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Máis opcións de configuración de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferencias rexionais"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Configura as preferencias de números e unidades"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permite que as aplicacións coñezan as túas preferencias rexionais para que poidan personalizar a túa experiencia."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"As aplicacións usarán as túas preferencias rexionais cando sexa posible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferencias rexionais"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primeiro día da semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferencias de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conéctase aos servizos de datos durante a itinerancia"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conecta cos servizos de datos durante a itinerancia"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Poden aplicarse tarifas de itinerancia."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Definir automaticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Usarase a localización para definir o fuso horario cando se active este interruptor"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"A data e a hora definiranse automaticamente coa axuda da rede e os sinais sen fíos"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horario automático"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"O fuso horario definirase automaticamente en función das redes de telefonía móbil que teñas preto"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"A data e hora definiranse automaticamente segundo a localización do dispositivo, se está dispoñible"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración rexional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levanta o dedo e despois volve tocar o sensor."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Non se puido usar o sensor de impresión dixital"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visita un provedor de reparacións."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueo dactilar coa pantalla apagada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Usa o desbloqueo dactilar mesmo cando estea apagada a pantalla"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Pantalla apagada, desbloqueo"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Máis opcións de configuración de seguranza"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueo do perfil de traballo, encriptación e moito máis"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encriptación, credenciais e moito máis"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Define un padrón para o espazo privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma o padrón do espazo privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Volve meter o PIN do espazo privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Volve meter o contrasinal do espazo privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> impresións dixitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Engadiches o número máximo de impresións dixitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Non se poden engadir máis impresións dixitais"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activada"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desactivada"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Pantalla externa"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar pantalla externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolución da pantalla"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"A pantalla externa está desconectada"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"O cambio de ángulo ou resolución pode deter as aplicacións que se estean executando"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"O dispositivo ten que estar conectado a unha pantalla externa para que se proxecte a túa"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Máis opcións"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Mantén premido e arrastra para reordenar as pantallas."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proxección"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activar visualización sen fíos"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Comproba o contrasinal e téntao de novo."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contacta co fabricante do dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comproba a conexión e téntao de novo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta rede wifi non está dispoñible neste momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Produciuse un problema con este código QR. Proba a conectarte doutro xeito."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Escoller rede"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Para conectar o dispositivo, escolle unha rede"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Queres engadir este dispositivo a “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Máis información sobre xirar automaticamente"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolución da pantalla"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolución"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Máxima resolución"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"A máxima resolución consome máis batería. Se cambias a resolución, pode que se reinicien algunhas aplicacións."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seleccionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Automáticas"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivel de brillo"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brillo intelixente"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Acerca do brillo intelixente"</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="auto_brightness_summary_on" msgid="2748088951224387004">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desactivado"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Configuración do modo Hora de durmir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Os modos tamén poden activar o tema escuro}=1{O modo {mode_1} tamén activa o tema escuro}=2{Os modos {mode_1} e {mode_2} tamén activan o tema escuro}=3{Os modos {mode_1}, {mode_2} e {mode_3} tamén activan o tema escuro}other{Os modos {mode_1}, {mode_2} e # máis tamén activan o tema escuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Configuración de modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Máis atenuado aínda"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Atenuación extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permite que o dispositivo se atenúe máis do habitual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo de espera da pantalla"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Servizos de localización"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Servizos de localización"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Utilizar localización"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar localización para definir o fuso horario"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Non se puido poñer o fuso horario automaticamente"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Desactivouse a localización ou os servizos de localización"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Configuración de localización"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Arranxar isto"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"A detección automática do fuso horario está desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Non está dispoñible se o fuso horario automático está desactivado"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"A localización pode utilizarse para definir o fuso horario"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Se está dispoñible a localización do dispositivo, pode usarse para definir o teu fuso horario"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Mostra información legal, o estado e a versión do software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Información legal"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcións"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de rebote"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"O teclado ignora as pulsacións repetidas rapidamente da mesma tecla nun intervalo de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignorará as pulsacións repetidas rapidamente da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Límite das teclas de rebote"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolle o tempo durante o cal o teu teclado ignorará as pulsacións repetidas"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Axusta o tempo que tarda a activación dunha tecla premida a <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Axusta o tempo que se tarda en activar a pulsación dunha tecla"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas presas"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Preme unha tecla de cada vez para os atallos, en lugar de manter premidas varias"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do rato"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa o teclado físico para controlar o rato."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas do rato"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa o teclado para controlar o punteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desprazamento inverso do rato"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desprázate cara arriba para mover a páxina cara abaixo"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Cambiar botóns esquerdo e dereito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa o botón esquerdo do rato como se fose o dereito"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas do rato de: <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Usa as teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover o punteiro do rato"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Usa a tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para facer clic no botón principal do rato"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Usa a tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para manter premido o botón principal do rato"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Usa a tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar o botón principal do rato"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Usa a tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para activar ou desactivar o modo de desprazamento. Con esta acción, as teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> desprazarán a vista arriba, abaixo, á esquerda e á dereita"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Usa a tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para facer clic no botón secundario do rato"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atallos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra a lista de atallos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas do perfil de traballo"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predeterminado"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Panel táctil"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Panel táctil e rato"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Rato"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidade do punteiro, xestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Toque para facer clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tocar e arrastrar"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic na esquina inferior dereita"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Fai clic na esquina inferior dereita do panel para máis opcións"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidade do punteiro"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usar o toque con tres dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Cor do punteiro"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Cambiar recheo do punteiro a negro"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Cambiar recheo do punteiro a verde"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Consultar xestos do panel táctil"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"panel táctil, rato, cursor, desprazar, pasar o dedo, facer clic co botón dereito, facer clic, punteiro"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"facer clic co botón dereito, tocar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic no medio"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar Asistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ir á páxina de inicio"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Volver"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver aplicacións recentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ir a Inicio"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Pasa 3 dedos cara arriba en calquera parte do panel táctil"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Atrás"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolle unha nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas presas, teclas de rebote, teclas do rato"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetición de teclas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Retardo previo á repetición"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Índice de repetición"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mantén premida unha tecla para repetir o seu carácter ata que a soltes"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Deseño: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Selección automática: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opcións estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamaño do texto"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamaño dos subtítulos"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo dos subtítulos"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opcións personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor do fondo"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Axustar uso de enerxía"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquetes incluídos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"As aplicacións execútanse con normalidade"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Recoméndase substituír a batería"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Reducíronse a capacidade e o rendemento de carga da batería, polo que se recomenda substituíla."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Queda pouca batería"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Para que a batería dure máis, activa a función Aforro de batería"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Mellora a duración da batería"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Queres desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer perfil da VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Queres substituír a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Queres definir a VPN como sempre activa?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Días de semana, de 9:00 a 17:00\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos do calendario"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{O modo {mode_1} está activo}=2{Os modos {mode_1} e {mode_2} están activos}=3{Os modos {mode_1}, {mode_2} e {mode_3} están activos}other{Os modos {mode_1}, {mode_2} e # máis están activos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Hai 1 modo que se pode activar de forma automática}other{Hai # modos que se poden activar de forma automática}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Modo Non molestar}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Sen configurar"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desactivado"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Entendido"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificacións"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duración"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensaxes, eventos e recordatorios"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Feito"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Configuración"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Notificacións sen son nin elementos visuais"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Notificacións sen son"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Non verás nin escoitarás notificacións. Permítense chamadas de contactos marcados con estrela e chamadas repetidas."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Configuración actual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Queres cambiar a configuración de notificacións do modo Non molestar?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons do perfil de traballo"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usar sons do perfil persoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usa os mesmos sons que o teu perfil persoal"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Tras o desbloqueo, vai á última pantalla usada. As notificacións non se amosarán na pantalla de bloqueo. Pasa o dedo de arriba cara abaixo para velas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, bloquear pantalla, omitir, saltar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Perfil de traballo bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalismo nas notificacións da pantalla de bloqueo"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostraranse menos notificacións na pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar só notificacións novas na pantalla de bloqueo"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Quita automaticamente da pantalla de bloqueo as notificacións que xa viches"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificacións na pantalla de bloqueo"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostra conversas predeterminadas e silenciadas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas predeterminadas e silenciadas"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar todo nas notificacións de traballo"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Oculta o contido laboral confidencial"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Cando o teu dispositivo estea bloqueado, como queres que se mostren as notificacións do perfil?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificacións do perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificacións"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificacións de aplicacións"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Cando recibas moitas notificacións en pouco tempo, o teu dispositivo baixará o volume e reducirá ao mínimo o número de alertas durante un máximo de dous minutos. As chamadas, alarmas e conversas prioritarias non se verán afectadas. \n\nPara ver as notificacións amainadas, arrastra cara abaixo a parte superior da pantalla."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar aos perfís de traballo"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Usa esta opción coas aplicacións do perfil de traballo"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificacións agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Opción activada"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Opción desactivada"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usar agrupación de notificacións"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"As notificacións con temas semellantes silenciaranse e agruparanse para que teñas unha experiencia máis silenciosa. A agrupación ignorará a configuración de notificacións das aplicacións."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizos do asistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ningunha aplicación instalada solicitou executarse como servizo do asistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Queres permitir o acceso do servizo de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversas prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Configuración das conversas"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quen pode interromper"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Aínda que as aplicacións de mensaxaría ou de chamadas non poidan enviarche notificacións, as persoas que elixas aquí poderán poñerse en contacto contigo igualmente a través desas aplicacións"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Configuración dos contactos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Configuración dos contactos marcados con estrela"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ningunha"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Ningunha aplicación pode interromper}=1{{app_1} pode interromper}=2{{app_1} e {app_2} poden interromper}=3{{app_1}, {app_2} e {app_3} poden interromper}other{{app_1}, {app_2} e # aplicacións máis poden interromper}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (traballo)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculando…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Configuración das aplicacións"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que as aplicacións ignoren o modo Non molestar"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplicacións que poden interromper"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crear un modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome do modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"O nome do modo non pode estar baleiro"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Escoller unha icona"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos do calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Hora de durmir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Mentres conduces"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificacións en pantalla completa"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir mostrar notificacións en pantalla completa procedentes desta aplicación"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permite que esta aplicación amose notificacións en pantalla completa cando o dispositivo estea bloqueado. A aplicación pode usar esta opción para destacar alarmas, chamadas entrantes ou outras notificacións urxentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Redactar preferencias do sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permitir que esta aplicación modifique as preferencias do sistema no teu nome"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Este permiso posibilita que unha aplicación modifique as principais preferencias do sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplicacións de xestión multimedia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir á aplicación a xestión multimedia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Se lle concedes os permisos necesarios, esta aplicación non necesitará preguntarche para modificar ou eliminar ficheiros multimedia creados con outras aplicacións. A aplicación debe ter permiso para acceder aos ficheiros e ao contido multimedia."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Xestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir cámara rapidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir rapidamente a cámara, preme dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Xirar para cambiar á cámara dianteira"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegación"</string>
@@ -4523,7 +4622,7 @@
     <string name="financed_privacy_safe_mode" msgid="5362149445732602578">"Reiniciar o dispositivo no modo seguro"</string>
     <string name="financed_privacy_multi_users" msgid="1727194928477613081">"Engadir varios usuarios"</string>
     <string name="financed_privacy_config_date_time" msgid="8567370445374984365">"Cambiar a data, a hora e os fusos horarios"</string>
-    <string name="financed_privacy_developer_options" msgid="7602001474669831672">"Usar opcións de programador"</string>
+    <string name="financed_privacy_developer_options" msgid="7602001474669831672">"Usar opcións de programación"</string>
     <string name="financed_privacy_credit_provider_capabilities_category" msgid="8737902277892987998">"A entidade de crédito pode:"</string>
     <string name="financed_privacy_IMEI" msgid="1852413860963824799">"Acceder ao teu número IMEI"</string>
     <string name="financed_privacy_factory_reset" msgid="5505016667590160732">"Se se produce algún erro, restablece a configuración de fábrica do dispositivo"</string>
@@ -4607,7 +4706,7 @@
     <string name="autofill_max_partitions" msgid="7342195529574406366">"Máximo de solicitudes por sesión"</string>
     <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="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Restablecéronse as opcións de programación 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>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensaxaría por satélite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envía e recibe mensaxes de texto por satélite. Inclúese na túa conta."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envía e recibe mensaxes de texto por satélite. Servizo non incluído na túa conta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensaxaría por satélite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Acerca da mensaxaría por satélite"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Podes enviar e recibir mensaxes de texto por satélite como parte dunha conta de <xliff:g id="CARRIER_NAME">%1$s</xliff:g> que cumpre os requisitos"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"O teu plan de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"A mensaxaría por satélite inclúese na túa conta"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"A mensaxaría por satélite non se inclúe na túa conta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Máis información"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Como funciona?"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"O teu teléfono conectarase automaticamente cun satélite. Para ter unha mellor conexión, debes situarte nunha zona onde o ceo estea despexado."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Despois de que o teléfono se conecte a un satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Podes intercambiar mensaxes de texto con calquera persoa, mesmo cos servizos de emerxencia. O teléfono volverá conectarse a unha rede de telefonía móbil en canto haxa unha dispoñible."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"A mensaxaría por satélite pode tardar máis e só está dispoñible en certas zonas. As condiciones meteorolóxicas e algunhas estruturas poden afectar á túa conexión por satélite. A función de chamada por satélite non está dispoñible. É posible que poidas facer chamadas de emerxencia.\n\nOs cambios na conta poden tardar algo en aparecer na configuración. Contacta co operador para obter información."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Máis información sobre a mensaxaría por satélite"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Non se pode activar a función <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para activar a función <xliff:g id="FUNCTION">%1$s</xliff:g>, primeiro pecha a conexión por satélite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectividade por satélite"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomes dos puntos de acceso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <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>
@@ -4976,25 +5125,28 @@
     <string name="enable_16k_pages" msgid="8001470927566110689">"Arrancar con páxinas de 16 kB"</string>
     <string name="enable_16k_pages_summary" msgid="1964363364670306912">"Arrancar co núcleo compatible con páxinas de 16 kB"</string>
     <string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"Cambiar do modo de 4 kB ao modo de 16 kB"</string>
-    <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Estás no modo independente de páxina executando un núcleo de 4 kB e vas cambiar ao modo de 16 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Esta acción reiniciará o dispositivo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programador."</string>
+    <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Estás no modo independente de páxina executando un núcleo de 4 kB e vas cambiar ao modo de 16 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Esta acción reiniciará o dispositivo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programación."</string>
     <string name="confirm_enable_4k_pages_title" msgid="3210360137887034659">"Cambiar do modo de 16 kB ao modo de 4 kB"</string>
-    <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Estás no modo independente de páxina executando un núcleo de 16 kB e vas cambiar ao modo de 4 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Esta acción reiniciará o dispositivo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programador."</string>
+    <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Estás no modo independente de páxina executando un núcleo de 16 kB e vas cambiar ao modo de 4 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Esta acción reiniciará o dispositivo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programación."</string>
     <string name="toast_16k_update_failed_text" msgid="8888858987184345567">"Produciuse un erro a actualizar o núcleo compatible con páxinas de 16 kB."</string>
     <string name="progress_16k_ota_title" msgid="2117218313875523741">"Aplicando cambio"</string>
     <string name="confirm_format_ext4_title" msgid="6696191800594435577">"Cambiar o formato a ext4? (obrigatorio para o modo de 16 kB)"</string>
-    <string name="confirm_format_ext4_text" msgid="7940372488624630214">"Esta partición de datos do dispositivo debe converterse a ext4 antes de utilizar a opción de programador de 16 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Para activar a opción de 16 kB será necesario reiniciar o dispositivo unha vez máis. Unha vez que esteas neste modo, poderás alternar entre o modo de 4 kB e 16 kB só cun reinicio. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programador. Tras a confirmación, borraranse os datos do dispositivo e cambiarase o sistema de ficheiros a ext4. Unha vez completada esta operación, volve para activar de novo o modo de 16 kB."</string>
+    <string name="confirm_format_ext4_text" msgid="7940372488624630214">"Esta partición de datos do dispositivo debe converterse a ext4 antes de utilizar a opción de programador de 16 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Para activar a opción de 16 kB será necesario reiniciar o dispositivo unha vez máis. Unha vez que esteas neste modo, poderás alternar entre o modo de 4 kB e 16 kB só cun reinicio. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque, o que restablecerá a configuración de fábrica do dispositivo. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programación. Tras a confirmación, borraranse os datos do dispositivo e cambiarase o sistema de ficheiros a ext4. Unha vez completada esta operación, volve para activar de novo o modo de 16 kB."</string>
     <string name="confirm_ext4_button_text" msgid="6045501984773738407">"Borrar todos os datos"</string>
     <string name="format_ext4_failure_toast" msgid="8059453995800471549">"Produciuse un erro ao borrar a partición de datos e cambiar o formato a ext4."</string>
     <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Cómpre desbloquear o cargador de arranque"</string>
     <string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Cómpre desbloquear o cargador de arranque deste dispositivo antes de utilizar a opción de programador de 16 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Borraranse todos os datos e opcións de configuración do usuario cando se active o modo de 16 kB. Despois de desbloquear o cargador de arranque, haberá que reiniciar o dispositivo dúas veces para activar a opción de 16 kB. Unha vez que esteas neste modo, poderás alternar entre o modo de 4 kB e 16 kB só cun reinicio. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que o dispositivo retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque ou o fabricante do equipo orixinal, o que restablecerá a configuración de fábrica do dispositivo. Desbloquea o cargador de arranque e téntao de novo. Podes consultar as instrucións deste proceso en &lt;a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\"&gt;https://source.android.com/docs/core/architecture/bootloader/locking_unlocking&lt;/a&gt;"</string>
     <string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Estase usando o modo independente de páxina de 4 kB"</string>
     <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Estás usando o modo independente de páxina de 4 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que bloquear o cargador de arranque do dispositivo. Toca para obter máis información."</string>
-    <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Estás usando o modo independente de páxina de 4 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que bloquear o cargador de arranque do dispositivo. Esta acción restablecerá de novo a configuración de fábrica do dispositivo e restaurará a súa configuración de produción. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programador. Se o dispositivo non arranca en Android ou é inestable, volve instalar as últimas imaxes de fábrica desde &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecciona as opcións de borrar datos do dispositivo, bloquear o cargador de arranque e forzar a instalación de todas as particións."</string>
+    <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Estás usando o modo independente de páxina de 4 kB. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que bloquear o cargador de arranque do dispositivo. Esta acción restablecerá de novo a configuración de fábrica do dispositivo e restaurará a súa configuración de produción. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programación. Se o dispositivo non arranca en Android ou é inestable, volve instalar as últimas imaxes de fábrica desde &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecciona as opcións de borrar datos do dispositivo, bloquear o cargador de arranque e forzar a instalación de todas as particións."</string>
     <string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Estase usando o modo independente de páxina de 16 kB"</string>
     <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Estás na opción de 16 kB do modo independente de páxina. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque do dispositivo. Toca para obter máis información."</string>
-    <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Estás na opción de 16 kB do modo independente de páxina. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque do dispositivo. Esta acción restablecerá de novo a configuración de fábrica do dispositivo e restaurará a súa configuración de produción. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programador. Se o dispositivo non arranca en Android ou é inestable, volve instalar as últimas imaxes de fábrica desde &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecciona as opcións de borrar datos do dispositivo, bloquear o cargador de arranque e forzar a instalación de todas as particións."</string>
+    <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Estás na opción de 16 kB do modo independente de páxina. A integridade do software non se pode garantir neste modo, e os datos almacenados no teléfono mentres está desbloqueado o cargador de arranque poden correr perigo. Desactivaranse algunhas funcións nestes modos, polo que pode que non funcionen algunhas aplicacións. Para facer que retorne ao modo de produción, terás que volver ao modo de 4 kB e bloquear o cargador de arranque do dispositivo. Esta acción restablecerá de novo a configuración de fábrica do dispositivo e restaurará a súa configuración de produción. Despois de que o dispositivo se inicie correctamente en Android, desactiva o desbloqueo do fabricante do equipo orixinal en Opcións de programación. Se o dispositivo non arranca en Android ou é inestable, volve instalar as últimas imaxes de fábrica desde &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecciona as opcións de borrar datos do dispositivo, bloquear o cargador de arranque e forzar a instalación de todas as particións."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo independente de páxina de 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ler máis"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Executar a aplicación no modo de compatibilidade co tamaño de páxina"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Controlador do Informe de erros"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina que aplicación xestiona o atallo aos informes de erros no teu dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Persoal"</string>
@@ -5121,7 +5273,7 @@
     <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Usar Evitar que soe"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Usar zona wifi"</string>
     <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar fixación de aplicación"</string>
-    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar opcións para programadores"</string>
+    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar opcións de programación"</string>
     <string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar servizo de impresión"</string>
     <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permitir cambiar de usuario"</string>
     <string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"permitir, varios, usuario, deixar, moitos"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Escoitar emisión"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Escanea o código QR dunha emisión de audio para escoitala con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Non se pode modificar o contrasinal mentres se comparte audio. Para facelo, primeiro desactiva o audio compartido."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"O contrasinal debe ter entre 4 e 16 caracteres, e só pode incluír letras, números e símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Escáner de códigos QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Precisas axuda?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Buscar en Configuración"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, almacenamento, conta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Almacenamento de contactos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Só dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contactos non se sincronizarán cunha conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"De forma predeterminada, os contactos gardaranse no teu dispositivo e sincronizaranse coa túa conta"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Produciuse un erro ao configurar a conta predeterminada"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ningunha conta predeterminada definida"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Só dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Engade unha conta para comezar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde gardar os contactos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Rodear para buscar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Mantén premido o botón de inicio ou o controlador de navegación para facer buscas usando o contido da pantalla."</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 7497fb53704..b5b7b340677 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"સ્નોફ્લૅક"</item>
     <item msgid="7952183800501346803">"બીચ પરની છત્રી"</item>
     <item msgid="799139025758265891">"વર્કશોપ ટૂલ"</item>
-    <item msgid="1330084588359129896">"તંબુ"</item>
+    <item msgid="8112685757657659269">"પિયાનો"</item>
     <item msgid="3861584909935022342">"ફિલ્મ રીલ"</item>
     <item msgid="5827426100157335512">"પુસ્તક"</item>
     <item msgid="8585828346253128384">"કમળનું ફૂલ"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6368b767390..c63446fab01 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"નવા ડિવાઇસ જોડો"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"બ્લૂટૂથ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"આવતીકાલે ઑટોમૅટિક રીતે ચાલુ કરો"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"જો તમે બ્લૂટૂથ બંધ કરો છો, તો તે બીજે દિવસે ફરી ચાલુ થાય છે"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"જમણા કાનને જોડો"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ડાબા કાનને જોડો"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"તમારા બીજા કાનનું જોડો"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"બ્લૂટૂથ LE ઑડિયો બંધ કરો"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"જો ડિવાઇસ LE ઑડિયો હાર્ડવેર ક્ષમતાઓને સપોર્ટ કરતું હોય, તો બ્લૂટૂથ LE ઑડિયો સુવિધા બંધ કરે છે."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"બ્લૂટૂથ LE ઑડિયો મોડ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"બ્લૂટૂથ LE ઑડિયો બ્રોડકાસ્ટ UI પ્રીવ્યૂ ચાલુ કરો"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"વ્યક્તિગત ઑડિયો શેરિંગ અને ખાનગી બ્રોડકાસ્ટ સહિત LE ઑડિયો શેરિંગ UI પ્રીવ્યૂ ચાલુ કરે છે"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ડિવાઇસની વિગતોમાં LE ઑડિયો ટૉગલ બતાવો"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"બ્લૂટૂથ LE ઑડિયો માટેની વ્હાઇટલિસ્ટને બાયપાસ કરો"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"વ્હાઇટલિસ્ટના માપદંડનું પાલન કરવા માટે LE ઑડિયો પેરિફેરલની ચકાસણી કરવામાં આવી ન હોય, તો પણ ડિફૉલ્ટ તરીકે LE ઑડિયોનો ઉપયોગ કરો."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ઍપની ભાષા"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"સૂચવેલી ભાષાઓ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"બધી ભાષાઓ"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"સૂચવેલી"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"બધી ભાષાઓ"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"બધા પ્રદેશો"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"નંબરવાળી બધી સિસ્ટમ"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"સિસ્ટમની ભાષા"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"સિસ્ટમ ડિફૉલ્ટ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"આ ઍપ માટે સેટિંગમાંથી ભાષા પસંદ કરી શકાતી નથી."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"બદલો"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ઉપલબ્ધ નથી"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"આ ભાષાનો સિસ્ટમની ભાષા તરીકે ઉપયોગ કરી શકાતો નથી પણ તમે ઍપ અને વેબસાઇટને જણાવ્યું છે કે આ તમારી પસંદગીની ભાષા છે."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"શોધ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ભાષા ઉમેરો"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"પ્રદેશ પસંદગી"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ભાષાનું નામ ટાઇપ કરો"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ભાષાના વધુ સેટિંગ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"પ્રાદેશિક પસંદગીઓ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"એકમો અને સંખ્યાની પસંદગીઓ સેટ કરો"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"તમારા અનુભવને મનગમતો બનાવી શકે તે માટે ઍપને તમારી પ્રાદેશિક પસંદગીઓ જણાવો."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"શક્ય હોય ત્યાં ઍપ તમારી પ્રાદેશિક પસંદગીઓનો ઉપયોગ કરશે."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"પ્રાદેશિક પસંદગીઓ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"તાપમાન"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"અઠવાડિયાનો પહેલો દિવસ"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"નંબરની પસંદગીઓ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"જ્યારે રોમિંગ હોય ત્યારે ડેટા સેવાઓથી કનેક્ટ કરો"</string>
     <string name="roaming_disable" msgid="729512894708689604">"જ્યારે રોમિંગ હોય ત્યારે ડેટા સેવાઓથી કનેક્ટ કરો"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"રોમિંગ શુલ્ક લાગુ થઈ શકે છે."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ઑટોમૅટિક રીતે સમય સેટ કરો"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ઑટોમૅટિક રીતે સેટ કરો"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"જ્યારે આ ટૉગલ ચાલુ હોય, ત્યારે સમય ઝોન સેટ કરવા માટે લોકેશનનો ઉપયોગ કરવામાં આવશે"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ઑટોમૅટિક તારીખ અને સમય"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"તમારા નેટવર્ક અને વાયરલેસ સિગ્નલ વડે ઑટોમૅટિક રીતે સેટ કરેલું સેટિંગ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ઑટોમૅટિક ટાઇમ ઝોન"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"તમારી નજીકના મોબાઇલ નેટવર્કના આધારે ઑટોમૅટિક રીતે સેટ કરેલું સેટિંગ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ઉપલબ્ધ હોવા પર ડિવાઇસના લોકેશન વડે ઑટોમૅટિક રીતે સેટ કરો"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ડિફૉલ્ટ લોકેલનો ઉપયોગ કરો"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-કલાક ફોર્મેટનો ઉપયોગ કરો"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"સમય"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"આંગળીને ઉંચકો, પછી ફરીથી સેન્સરને સ્પર્શ કરો"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ફિંગરપ્રિન્ટ સેન્સરનો ઉપયોગ કરી શકાતો નથી"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"રિપેર કરવાની સેવા આપતા પ્રદાતાની મુલાકાત લો."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"સ્ક્રીન-ઑફ ફિંગરપ્રિન્ટ અનલૉક"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"સ્ક્રીન બંધ હોય ત્યારે પણ ફિંગરપ્રિન્ટ અનલૉકનો ઉપયોગ કરો"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"સ્ક્રીન-ઑફ, અનલૉક કરો"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"સુરક્ષાના વધુ સેટિંગ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ઑફિસની પ્રોફાઇલનું લૉક, એન્ક્રિપ્શન અને બીજું ઘણું"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"એન્ક્રિપ્શન, લૉગ ઇન વિગતો અને બીજું ઘણું"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"તમારી ખાનગી સ્પેસ માટે પૅટર્ન સેટ કરો"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"લૉક કરો"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"છુપાવો"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"તમારી ખાનગી સ્પેસની પૅટર્ન કન્ફર્મ કરો"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"તમારી ખાનગી સ્પેસની પિન કન્ફર્મ કરો"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"તમારી ખાનગી સ્પેસનો પાસવર્ડ ફરીથી દાખલ કરો"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"તમે <xliff:g id="COUNT">%d</xliff:g> જેટલી ફિંગરપ્રિન્ટ ઉમેરી શકો છો"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"તમે મહત્તમ ફિંગરપ્રિન્ટ્સ ઉમેર્યા છે"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"વધુ ફિંગરપ્રિન્ટ્સ ઉમેરી શકતાં નથી"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ચાલુ"</string>
     <string name="external_display_off" msgid="5634413756025351374">"બંધ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"બાહ્ય ડિસ્પ્લે"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"બિલ્ટ-ઇન ડિસ્પ્લે"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"બાહ્ય ડિસ્પ્લેનો ઉપયોગ કરો"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ડિસ્પ્લેનું રિઝોલ્યુશન"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"બાહ્ય ડિસ્પ્લે ડિસ્કનેક્ટેડ છે"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"રોટેશન અથવા રિઝોલ્યુશન બદલવાથી હાલમાં ચાલી રહેલી કોઈપણ ઍપ બંધ થઈ શકે છે"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"તમારી સ્ક્રીનને મિરર કરવા માટે તમારું ડિવાઇસ બાહ્ય ડિસ્પ્લે સાથે કનેક્ટેડ હોવું આવશ્યક છે"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"વધુ વિકલ્પો"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ડિસ્પ્લેનો ક્રમ બદલવા માટે દબાવી રાખીને ખેંચો."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"કાસ્ટ કરો"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"મીરર"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"પાસવર્ડ ચેક કરો અને ફરી પ્રયાસ કરો"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ડિવાઇસ નિર્માતાનો સંપર્ક કરો"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"કનેક્શન ચેક કરો અને ફરી પ્રયાસ કરો"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"અત્યારે આ વાઇ-ફાઇ નેટવર્ક ઉપલબ્ધ નથી"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"આ QR કોડમાં કોઈ સમસ્યા છે. અન્ય કોઈ રીતે કનેક્ટ કરવાનો પ્રયાસ કરો."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"નેટવર્ક પસંદ કરો"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"તમારા ડિવાઇસને કનેક્ટ કરવા માટે, નેટવર્ક પસંદ કરો"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"આ ડિવાઇસને  “<xliff:g id="SSID">%1$s</xliff:g>” પર ઉમેરીએ?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ઑટો રોટેટ (સ્ક્રીનની ઑટોમૅટિક રીતે ફરવાની ક્રિયા) વિશે વધુ જાણો"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"સ્ક્રીન રિઝોલ્યુશન"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"વધુ રિઝોલ્યુશન"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"પૂર્ણ રિઝોલ્યુશન"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"પૂર્ણ રિઝોલ્યુશનથી તમારી બૅટરીનો વપરાશ વધુ થાય છે. તમારું રિઝોલ્યુશન સ્વિચ કરવાથી કેટલીક ઍપ કદાચ ફરી શરૂ થઈ શકે છે."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"ઉચ્ચ રિઝોલ્યુશન"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"ઉચ્ચ રિઝોલ્યુશનથી તમારી બૅટરીનો વપરાશ વધુ થાય છે. તમારું રિઝોલ્યુશન સ્વિચ કરવાથી કેટલીક ઍપ કદાચ ફરી શરૂ થઈ શકે છે."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"પસંદ કર્યું"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"રંગો"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"કુદરતી"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"અડૅપ્ટિવ"</string>
     <string name="brightness" msgid="6216871641021779698">"સ્ક્રીનની બ્રાઇટનેસનું લેવલ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"અડૅપ્ટિવ બ્રાઇટનેસ"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"અડૅપ્ટિવ બ્રાઇટનેસ વિશે"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"તમારી સ્ક્રીનની બ્રાઇટનેસ તમારા પર્યાવરણ અને ઍક્ટિવિટી સાથે ઑટોમૅટિક રીતે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ચાલુ કરો"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"બંધ"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"બેડટાઇમ મોડનાં સેટિંગ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{મોડ ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=1{{mode_1} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=2{{mode_1} અને {mode_2} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=3{{mode_1}, {mode_2} અને {mode_3} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}one{{mode_1}, {mode_2} અને વધુ # ડાર્ક થીમને પણ સક્રિય કરી શકે છે}other{{mode_1}, {mode_2} અને વધુ # ડાર્ક થીમને પણ સક્રિય કરી શકે છે}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"મોડના સેટિંગ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"હજી વધુ ઝાંખું"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"એક્સ્ટ્રા ડિમ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ડિવાઇસને સામાન્ય કરતાં વધુ ઝાંખું થવા દો"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"સ્ક્રીનનો ઑટોમૅટિક સમાપ્તિ સમય"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"નિષ્ક્રિયતાના <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ડિવાઇસ સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ લોકેશન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"લોકેશન સેવાઓ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"લોકેશન સેવાઓ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"લોકેશનનો ઉપયોગ કરો"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ટાઇમ ઝોન માટે લોકેશનનો ઉપયોગ કરો"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"સમય ઝોનને ઑટોમૅટિક રીતે સેટ કરી શકતા નથી"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"લોકેશન અથવા લોકેશન સેવાઓ બંધ છે"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"લોકેશન સેટિંગ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"આને ઠીક કરો"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"રદ કરો"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ઑટોમૅટિક રીતે સમય ઝોનની ઓળખ કરવાનું બંધ છે"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ઑટોમૅટિક ટાઇમ ઝોનની સુવિધા બંધ કરવામાં આવી હોય, ત્યારે ઉપલબ્ધ રહેશે નહીં"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"સમય ઝોન સેટ કરવા માટે લોકેશનનો ઉપયોગ કરવામાં આવી શકે છે"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"જો તમારા ડિવાઇસનું લોકેશન ઉપલબ્ધ હોય, તો તમારા ટાઇમ ઝોનને સેટ કરવા માટે તેનો ઉપયોગ કરવામાં આવી શકે છે"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર વર્ઝન જુઓ"</string>
     <string name="legal_information" msgid="7509900979811934843">"કાનૂની માહિતી"</string>
     <string name="manual" msgid="3651593989906084868">"મેન્યુઅલ"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"વિકલ્પો"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ઍક્સેસિબિલિટી"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ભૌતિક કીબોર્ડ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"બાઉન્સ કી"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> msની અંદર એક જ કીને વારંવાર ઝડપથી દબાવવાની પ્રક્રિયાની કીબોર્ડ અવગણના કરે છે"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"એક જ કીને વારંવાર ઝડપથી દબાવવાની પ્રક્રિયાની કીબોર્ડ અવગણના કરે છે"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"બાઉન્સ કી સંબંધિત મર્યાદા"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"વારંવાર દબાવવામાં આવતી તમારા કીબોર્ડની કીને અવગણવા માટે જરૂરી અવધિ પસંદ કરો"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 સેકન્ડ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 સેકન્ડ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 સેકન્ડ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"કસ્ટમ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"કસ્ટમ મૂલ્ય"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ધીમી કી"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms સુધીમાં સક્રિય થવા માટે, કોઈ કીને દબાવવામાં લાગતા સમયની ગોઠવણી કરે છે"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"કોઈ કીને દબાવવાથી સક્રિય થવામાં લાગતા સમયમાં વધઘટ કરે છે"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"સ્ટીકી કી"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"શૉર્ટકટ માટે કીને એકસાથે દબાવી રાખવાને બદલે એક સમયે એક જ કી દબાવો"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"માઉસની કી"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"માઉસને નિયંત્રિત કરવા માટે, વાસ્તવિક કીબોર્ડનો ઉપયોગ કરો."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"માઉસ કીનો ઉપયોગ કરો"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"પૉઇન્ટરનું નિયંત્રણ કરવા માટે, તમારા કીબોર્ડનો ઉપયોગ કરો"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"માઉસનું રિવર્સ સ્ક્રોલિંગ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"પેજને નીચે લઈ જવા માટે ઉપર સ્ક્રોલ કરો"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ડાબા અને જમણા બટનને સ્વૉપ કરો"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"માઉસના ડાબા બટનનો ઉપયોગ તમારા જમણા બટન તરીકે કરો"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> માટે માઉસ કી"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"માઉસના પૉઇન્ટરને ખસેડવા માટે <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> કીનો ઉપયોગ કરો"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"પ્રાથમિક માઉસ બટન ક્લિક કરવા માટે <xliff:g id="CLICK_LABEL">%s</xliff:g> કીનો ઉપયોગ કરો"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"પ્રાથમિક માઉસ બટન દબાવી રાખવા માટે <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> કીનો ઉપયોગ કરો"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"પ્રાથમિક માઉસ બટન છોડવા માટે <xliff:g id="RELEASE_LABEL">%s</xliff:g> કીનો ઉપયોગ કરો"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"સ્ક્રોલ મોડ ટૉગલ કરવા માટે <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> કીનો ઉપયોગ કરો. આમ કરવાથી <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> કી વ્યૂને ઉપર, નીચે, ડાબે કે જમણે સ્ક્રોલ કરશે"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ગૌણ માઉસ બટન ક્લિક કરવા માટે <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> કીનો ઉપયોગ કરો"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"કીબોર્ડ શૉર્ટકટ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"શૉર્ટકટની સૂચિ બતાવો"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"કાર્યાલયનું પ્રોફાઇલ અને સાધનો"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ડિફૉલ્ટ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ટચપૅડ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ટચપૅડ અને માઉસ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"માઉસ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"પૉઇન્ટરની ઝડપ, સંકેતો"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ક્લિક કરવા ટૅપ કરો"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ટૅપ કરીને ખેંચવું"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"સૌથી નીચે-રાઇટ ક્લિક કરો"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"વધુ વિકલ્પો માટે, ટચપૅડના સૌથી નીચેના જમણા ખૂણા પર ક્લિક કરો"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"પૉઇન્ટરની ઝડપ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"\"ત્રણ આંગળી વડે ટૅપ\"નો ઉપયોગ કરો"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"પૉઇન્ટરનો રંગ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"પૉઇન્ટર ફીલ શૈલીને કાળામાં બદલો"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"પૉઇન્ટર ફીલ શૈલીને લીલામાં બદલો"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ટચપૅડના સંકેતો વિશે જાણો"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ટ્રૅકપૅડ, ટ્રૅક પૅડ, માઉસ, કર્સર, સ્ક્રોલ કરો, સ્વાઇપ કરો, રાઇટ ક્લિક કરો, ક્લિક કરો, પૉઇન્ટર"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"રાઇટ ક્લિક કરો, ટૅપ કરો"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"વચલું ક્લિક કરો"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant લૉન્ચ કરો"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"હોમ પર જાઓ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"પાછા જાઓ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"તાજેતરની ઍપ જુઓ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"હોમ પર જાઓ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"તમારા ટચપૅડ પર ગમે ત્યાં ત્રણ આંગળી વડે ઉપરની તરફ સ્વાઇપ કરો"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"પાછા જાઓ"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> માટે નવી કી પસંદ કરો:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"વાસ્તવિક કીબોર્ડની ઍક્સેસિબિલિટી"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"સ્ટીકી કી, બાઉન્સ કી, માઉસ કી"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"કી રિપીટ કરો"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"રિપીટ થવા પહેલાંનો વિલંબ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"રિપીટ રેટ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"જ્યાં સુધી કી રિલીઝ કરવામાં ન આવે ત્યાં સુધી કીના અક્ષરો રિપીટ કરવા માટે તેને નીચેની તરફ દબાવી રાખો"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> લેઆઉટ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ડિફૉલ્ટ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ઑટોમૅટિક રીતે: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"પ્રીવ્યૂ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"સ્ટૅન્ડર્ડ વિકલ્પો"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ભાષા"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ટેક્સ્ટ કદ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"કૅપ્શનનું કદ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"કૅપ્શન શૈલી"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"કસ્ટમ વિકલ્પો"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"બૅકગ્રાઉન્ડ રંગ"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"પાવર વપરાશ સમાયોજિત કરો"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"સમાવિષ્ટ પૅકેજીસ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ઍપ સામાન્ય રીતે ચાલી રહી છે"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"બૅટરી બદલવાનો સુઝાવ આપવામાં આવે છે"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"બૅટરીની ક્ષમતા અને ચાર્જિંગ પર્ફોર્મન્સ ઘટી ગયું છે અને બૅટરી બદલવાનો સુઝાવ આપવામાં આવે છે."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"બૅટરીનું લેવલ ઓછું છે"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"બૅટરીની આવરદા વધારવા માટે બૅટરી સેવર ચાલુ કરો"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"બૅટરીની આવરદા વધારો"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"આ VPNને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ડિસ્કનેક્ટ કરો"</string>
     <string name="vpn_version" msgid="6344167191984400976">"વર્ઝન"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"વર્ઝન <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ભૂલી ગયાં"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"અસ્તિત્વમાંની VPN ને બદલીએ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"હંમેશાં ચાલુ VPN સેટ કરીએ?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"અઠવાડિયાના દિવસોમાં સવારે 9થી સાંજે 5 વાગ્યા સુધી\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"કૅલેન્ડર ઇવેન્ટ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} સક્રિય છે}=2{{mode_1} અને {mode_2} સક્રિય છે}=3{{mode_1}, {mode_2} અને {mode_3} સક્રિય છે}one{{mode_1}, {mode_2} અને વધુ # સક્રિય છે}other{{mode_1}, {mode_2} અને વધુ # સક્રિય છે}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}one{# મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}other{# મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ખલેલ પાડશો નહીં}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ચાલુ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"સેટ નથી"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"બંધ છે"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"સમજાઈ ગયું"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"નોટિફિકેશન"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"અવધિ"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"મેસેજ, ઇવેન્ટ અને રિમાઇન્ડર"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે મેસેજ, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે મેસેજના સેટિંગ અનુકૂળ કરી શકો છો."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"થઈ ગયું"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"સેટિંગ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"નોટિફિકેશનમાં કોઈ સાઉન્ડ નથી"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"તમે કોઈ નોટિફિકેશન જોઈ અથવા સાંભળી શકશો નહીં. સ્ટાર આપેલા સંપર્કો અને રિપીટ કૉલરના કૉલને પરવાનગી આપવામાં આવે છે."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(વર્તમાન સેટિંગ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ખલેલ પાડશો નહીં નોટિફિકેશનની સેટિંગમાં ફેરફાર કરીએ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ઑફિસની પ્રોફાઇલના સાઉન્ડ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"વ્યક્તિગત પ્રોફાઇલ સાઉન્ડ વાપરો"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"તમારી વ્યક્તિગત પ્રોફાઇલ જે સાઉન્ડનો ઉપયોગ કરે છે, એ જ સાઉન્ડનો ઉપયોગ કરો"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"અનલૉક કરી લીધા પછી, સીધા છેલ્લે ઉપયોગમાં લીધેલી સ્ક્રીન પર જાઓ. લૉક સ્ક્રીન પર નોટિફિકેશન દેખાશે નહીં. તે જોવા માટે સૌથી ઉપરથી નીચે તરફ સ્વાઇપ કરો."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"લૉક સ્ક્રીન, લૉક સ્ક્રીન, છોડો, બાયપાસ"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ઑફિસની પ્રોફાઇલ લૉક થાય ત્યારે"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"લૉક સ્ક્રીન નોટિફિકેશન ઓછા કરવા"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"લૉક સ્ક્રીન પર ઓછા નોટિફિકેશન બતાવો"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"લૉક સ્ક્રીન પર માત્ર નવા નોટિફિકેશન બતાવો"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"લૉક સ્ક્રીન પરથી અગાઉ જોયેલા નોટિફિકેશન ઑટોમૅટિક રીતે કાઢી નાખો"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"લૉક સ્ક્રીન પર નોટિફિકેશન"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ડિફૉલ્ટ અને સાઇલન્ટ વાતચીતો બતાવો"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ડિફૉલ્ટ અને સાઇલન્ટ વાતચીતો બતાવો"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"કાર્યાલયનું તમામ નોટિફિકેશન કન્ટેન્ટ બતાવો"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"કાર્ય સંબંધિત સંવેદનશીલ કન્ટેન્ટ છુપાવો"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે પ્રોફાઇલ નોટિફિકેશનો કેવી રીતે બતાવવા માગો છો?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"જ્યારે ટૂંકા સમયગાળામાં તમને ઘણા નોટિફિકેશન પ્રાપ્ત થાય, ત્યારે તમારું ડિવાઇસ તેનું વૉલ્યૂમ ઘટાડશે અને 2 મિનિટ સુધી અલર્ટને ઓછા કરશે. કૉલ, અલાર્મ અને પ્રાધાન્યતા ધરાવતી વાતચીતોને અસર થતી નથી. \n\nકૂલડાઉન દરમિયાન પ્રાપ્ત થયેલા નોટિફિકેશનને સ્ક્રીનની સૌથી ઉપરની બાજુએથી નીચેની તરફ સ્ક્રોલ કરીને શોધી શકાય છે."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ઑફિસની પ્રોફાઇલ પર લાગુ કરો"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ઑફિસની પ્રોફાઇલ ઍપ પર લાગુ કરો"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"બંડલ બનાવેલા નોટિફિકેશન"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ચાલુ છે"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"બંધ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"નોટિફિકેશન બંડલ બનાવવાની પ્રક્રિયાનો ઉપયોગ કરો"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"વધુ શાંત અનુભવ માટે સમાન થીમવાળા નોટિફિકેશનને સાઇલન્ટ કરીને એકસાથે ગ્રૂપ કરવામાં આવશે. બંડલ બનાવવાની પ્રક્રિયા ઍપના પોતાના નોટિફિકેશનના સેટિંગને ઓવરરાઇડ કરશે."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR સહાયક સેવાઓ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"કોઇ ઇન્સ્ટૉલ કરેલી ઍપએ VR સહાયક સેવાઓ તરીકે શરૂ કરવાની વિનંતી કરી નથી."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે VR સેવા ઍક્સેસની મંજૂરી આપીએ?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"પ્રાધાન્યતા ધરાવતી વાતચીતો"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"કોઈ નહીં"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{એકપણ નહીં}=1{1 વાતચીત}one{# વાતચીત}other{# વાતચીત}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"વાતચીતો સંબંધિત સેટિંગ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"વિક્ષેપ ઊભો કરી શકે છે તે"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"મેસેજિંગ કે કૉલિંગ ઍપ તમને સૂચિત ન કરી શકે, તો પણ તમે અહીં જે લોકોને પસંદ કર્યા છે તેઓ તે ઍપ મારફતે તમારો સંપર્ક કરી શકશે"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"કૉલ"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"કોઈપણ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"સંપર્કો"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"સ્ટાર આપેલા સંપર્કો"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Contactsના સેટિંગ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"સ્ટાર આપેલા Contactsના સેટિંગ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"કોઈ નહીં"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"અલાર્મ"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ઑફિસ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ગણતરી કરી રહ્યાં છીએ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ઍપના સેટિંગ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"અ‍ૅપને ઓવરરાઇડ કરવાની મંજૂરી આપો"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"વિક્ષેપ ઊભો કરી શકે તેવી ઍપ"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"કોઈ મોડ બનાવો"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"કસ્ટમ મોડ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"મોડનું નામ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"મોડનું નામ ખાલી હોઈ શકતું નથી"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"કોઈ આઇકન પસંદ કરો"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"કૅલેન્ડર ઇવેન્ટ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"બેડટાઇમ રૂટિન"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ડ્રાઇવિંગ કરતી વખતે"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"પૂર્ણ-સ્ક્રીન નોટિફિકેશન"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"આ ઍપના પૂર્ણ-સ્ક્રીન નોટિફિકેશનને મંજૂરી આપો"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"જ્યારે ડિવાઇસ લૉક કરેલું હોય, ત્યારે આ ઍપને પૂર્ણ સ્ક્રીનમાં નોટિફિકેશન બતાવવાની મંજૂરી આપો. ઍપ આનો ઉપયોગ અલાર્મ, ઇનકમિંગ કૉલ અથવા અન્ય તાકીદના નોટિફિકેશન હાઇલાઇટ કરવા માટે કરી શકે છે."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"સિસ્ટમની પસંદગીઓ લખો"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"આ ઍપને તમારા વતી સિસ્ટમની પસંદગીઓમાં ફેરફાર કરવાની મંજૂરી આપો"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"આ પરવાનગી કોઈ ઍપને સિસ્ટમની મુખ્ય પસંદગીઓમાં ફેરફાર કરવાની મંજૂરી આપે છે."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"મીડિયા મેનેજમેન્ટ ઍપ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ઍપને મીડિયા મેનેજ કરવાની મંજૂરી આપો"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"જો મંજૂરી આપવામાં આવે, તો આ ઍપ તમને પૂછ્યા વિના અન્ય ઍપ વડે બનાવેલી મીડિયા ફાઇલોમાં ફેરફાર કરી અથવા તેને ડિલીટ કરી શકે છે. ઍપને ફાઇલો અને મીડિયાને ઍક્સેસ કરવાની પરવાનગી હોવી જરૂરી છે."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"સંકેતો"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ઝડપથી કૅમેરા ખોલો"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"વધુ ઝડપથી કૅમેરા ખોલવા માટે, પાવર બટનને બે વાર દબાવો. કોઈપણ સ્ક્રીન પરથી કામ કરે છે."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"સેલ્ફી માટે કૅમેરાને ફ્લિપ કરો"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"નૅવિગેશન મોડ"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"સૅટલાઇટ મેસેજિંગ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"સૅટલાઇટ મારફતે ટેક્સ્ટ મેસેજ મોકલો અને પ્રાપ્ત કરો. તમારા એકાઉન્ટમાં શામેલ છે."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"સૅટલાઇટ મારફતે ટેક્સ્ટ મેસેજ મોકલો અને પ્રાપ્ત કરો. તમારા એકાઉન્ટ સાથે શામેલ નથી."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"સૅટલાઇટ મેસેજિંગ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"સૅટલાઇટ મેસેજિંગ સેવા વિશે"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"સૅટલાઇટ મેસેજિંગ, સૅટલાઇટ કનેક્ટિવિટી"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> વિશે"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"યોગ્ય <xliff:g id="CARRIER_NAME">%1$s</xliff:g> એકાઉન્ટના ભાગ તરીકે તમે સૅટલાઇટ મારફતે ટેક્સ્ટ મેસેજ મોકલી અને પ્રાપ્ત કરી શકો છો"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"તમારો <xliff:g id="CARRIER_NAME">%1$s</xliff:g> પ્લાન"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"સૅટલાઇટ મેસેજિંગ તમારા એકાઉન્ટમાં શામેલ છે"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"મેસેજિંગ તમારા એકાઉન્ટમાં શામેલ છે"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"સૅટલાઇટ મેસેજિંગ તમારા એકાઉન્ટમાં શામેલ નથી"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"વધુ જાણો"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"તેની કામ કરવાની રીત"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"તમારો ફોન સૅટલાઇટ સાથે ઑટોમૅટિક રીતે કનેક્ટ કરવામાં આવશે. શ્રેષ્ઠ કનેક્શન માટે, સ્પષ્ટ રીતે આકાશ જોઈ શકાય તે રીતે બહાર રહો."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"તમારો ફોન સૅટલાઇટ સાથે કનેક્ટ થયા પછી"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"તમે ઇમર્જન્સી સર્વિસ સહિત કોઈને પણ ટેક્સ્ટ કરી શકો છો. જ્યારે કોઈ મોબાઇલ નેટવર્ક ઉપલબ્ધ હશે, ત્યારે તમારો ફોન તેની સાથે ફરીથી કનેક્ટ કરવામાં આવશે."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"સૅટલાઇટ મેસેજિંગને વધુ સમય લાગી શકે છે અને તે માત્ર અમુક વિસ્તારોમાં જ ઉપલબ્ધ છે. વાતાવરણ અને ચોક્કસ સંરચનાઓ તમારા સૅટલાઇટ કનેક્શનને અસર કરી શકે છે. સૅટલાઇટ મારફતે કૉલ કરવાની સુવિધા ઉપલબ્ધ નથી. છતાં પણ ઇમર્જન્સી કૉલ કનેક્ટ થઈ શકે છે.\n\nએકાઉન્ટમાં કરવામાં આવેલા ફેરફારોને સેટિંગમાં દેખાવામાં થોડો સમય લાગી શકે છે. વિગતો માટે તમારા મોબાઇલ ઑપરેટરનો સંપર્ક કરો."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"સૅટલાઇટ મેસેજિંગ વિશે વધુ"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>ને વધુ સમય લાગી શકે છે અને તે માત્ર અમુક વિસ્તારોમાં જ ઉપલબ્ધ છે. વાતાવરણ અને ચોક્કસ સંરચનાઓ તમારા સૅટલાઇટ કનેક્શનને અસર કરી શકે છે. સૅટલાઇટ મારફતે કૉલ કરવાની સુવિધા ઉપલબ્ધ નથી. છતાં પણ ઇમર્જન્સી કૉલ કનેક્ટ થઈ શકે છે.\n\nએકાઉન્ટમાં કરવામાં આવેલા ફેરફારોને સેટિંગમાં દેખાવામાં થોડો સમય લાગી શકે છે. વિગતો માટે <xliff:g id="CARRIER_NAME">%1$s</xliff:g>નો સંપર્ક કરો."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> વિશે વધુ માહિતી"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ચાલુ કરી શકતા નથી"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ચાલુ કરવા માટે, પહેલા સૅટલાઇટ કનેક્શન સમાપ્ત કરો"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"સૅટલાઇટની કનેક્ટિવિટી"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"સૅટલાઇટ કનેક્ટિવિટી"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"સૅટલાઇટ કનેક્ટિવિટી"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"સૅટલાઇટ મેસેજિંગ"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ડેટાનો ઉપયોગ તમારા એકાઉન્ટમાં શામેલ છે"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"ઇમર્જન્સી સૅટલાઇટ સહાય"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"જ્યારે તમે મોબાઇલ અથવા વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કરી શકતા નથી ત્યારે ઇમર્જન્સી સર્વિસ વડે મેસેજ મોકલો"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"ઇમર્જન્સી સૅટલાઇટ સહાય, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"ઇમર્જન્સી સૅટલાઇટ સહાય વિશે"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"જ્યારે તમે મોબાઇલ અથવા વાઇ-ફાઇ નેટવર્કથી કનેક્ટ કરી શકતા નથી ત્યારે તમે ઇમર્જન્સી સર્વિસ વડે મેસેજ કરી શકો છો અને તમારું લોકેશન શેર કરી શકો છો. આ સેવા કદાચ બધા લોકેશનમાં કે અમુક સંજોગોમાં હંમેશાં ઉપલબ્ધ ન પણ હોય."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ઇમર્જન્સી સર્વિસને કૉલ અથવા ટેક્સ્ટ કરો"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ઇમર્જન્સી વિશેના પ્રશ્નોના જવાબ આપો"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"સૅટલાઇટ સાથે કનેક્ટ કરવા માટે પગલાં અનુસરો"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"જો તમે કોઈ મોબાઇલ નેટવર્ક ધરાવતા ન હો, તો તમને ઇમર્જન્સી સૅટલાઇટ સહાયનો ઉપયોગ કરવા માટે કોઈ વિકલ્પ દેખાશે"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"તમને યોગ્ય પ્રકારની સહાય મળી રહે તે માટે ઇમર્જન્સી સર્વિસને જવાબ મોકલો"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"એકવાર તમે કનેક્ટેડ થઈ જાઓ, પછી તમે ઇમર્જન્સી સર્વિસ વડે મેસેજ મોકલી શકો છો"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ડેમો અજમાવી જુઓ"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"જ્યારે તમે સૅટલાઇટ મારફતે ઇમર્જન્સી સર્વિસ સાથે કનેક્ટ કરો, ત્યારે તમારું નામ, ઇમેઇલ, ફોન નંબર, લોકેશન, ડિવાઇસની માહિતી (IMEI, ભાષા, મૉડલ, બૅટરી લેવલ) અને ઇમર્જન્સી માટેના સંપર્કની માહિતીને ઇમર્જન્સી સર્વિસ અને સૅટલાઇટ સેવા પ્રદાતા સાથે શેર કરવામાં આવે છે. \n\nઇમર્જન્સી સૅટલાઇટ સહાયનો ઉપયોગ કરવા માટે, Google Messages તમારી ડિફૉલ્ટ SMS ઍપ હોવી જરૂરી છે. \n\nજો ઑટોમૅટિક નેટવર્કની પસંદગી કરવાની સુવિધા બંધ હોય, તો તે ચાલુ થઈ જશે, અને તમારું ડિવાઇસ ઑટોમૅટિક રીતે બીજા કોઈપણ નેટવર્ક સાથે કનેક્ટ થઈ જશે."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"શેરિંગ સંબંધી પસંદગીઓ"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ઇમર્જન્સી માટેના સંપર્કો"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"તમારું Google એકાઉન્ટ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ઇમર્જન્સી સર્વિસ સાથે શેર કરવાની હોય તે માહિતી રિવ્યૂ કે અપડેટ કરો"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ઍક્સેસ પૉઇન્ટના નામ"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"તમે પેજ-એગ્નોસ્ટિક મોડના 16KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોનમાં સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશનો કામ ન કરે એવું બની શકે છે. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે 4KB મોડ પર પાછા સ્વિચ કરવું આવશ્યક છે અને પછી ડિવાઇસના બૂટલોડરને લૉક કરો. આ ડિવાઇસને ફરીથી ફેક્ટરી રીસેટ કરશે અને તેને પ્રોડક્શન સેટિંગમાં રિસ્ટોર કરશે. ડિવાઇસ સફળતાપૂર્વક Androidમાં બૂટ થાય તે પછી, ડેવલપરના વિકલ્પોમાં OEM અનલૉક કરવાના સેટિંગને બંધ કરો. જો ડિવાઇસ Android OSથી બૂટ થવાનું નિષ્ફળ રહે અથવા અસ્થિર હોય, તો ડિવાઇસને &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;ની નવીનતમ ફેક્ટરી છબીઓથી OS ફરીથી ફ્લૅશ કરો અથવા &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;નો ઉપયોગ કરો તેમજ \'ડિવાઇસનો ડેટા વાઇપ કરો\', \'બૂટલોડર લૉક કરો\' અને \'તમામ પાર્ટિશન ફરજિયાત રીતે ફલૅશ કરો\' પસંદ કરો."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB પેજ એગ્નોસ્ટિક મોડ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"વધુ વાંચો"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"પેજના કદ સુસંગતતા મોડમાં ઍપને ચલાવો"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"બગ રિપોર્ટ હૅન્ડલ કરનાર"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"તમારા ડિવાઇસ પર કઈ ઍપ ખામીની જાણકારીના શૉર્ટકટને હૅન્ડલ કરે તે નક્કી કરે છે."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"વ્યક્તિગત"</string>
@@ -5159,7 +5282,7 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"UWB ધરાવતા નજીકના ડિવાઇસનું સંબંધિત અંતર ઓળખવામાં સહાય કરે છે"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWBનો ઉપયોગ કરવા માટે એરપ્લેન મોડ બંધ કરો"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"હાલના લોકેશનમાં UWB અનુપલબ્ધ છે"</string>
-    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"થ્રેડ"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"થ્રેડનો ઉપયોગ કરો"</string>
     <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"થ્રેડ તમારા સ્માર્ટ ઘરના સ્માર્ટ ડિવાઇસ કનેક્ટ કરવામાં, કાર્યક્ષમતા અને પર્ફોર્મન્સને બહેતર બનાવવામાં સહાય કરે છે.\n\nજ્યારે ચાલુ હોય, ત્યારે આ ડિવાઇસ થ્રેડ નેટવર્કમાં જોડાવા માટે યોગ્ય છે, જે આ ફોન મારફતે Matter દ્વારા સપોર્ટ કરવામાં આવતા ડિવાઇસના નિયંત્રણની મંજૂરી આપે છે."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"થ્રેડ વિશે વધુ જાણો"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"સ્ટ્રીમ સાંભળો"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> વડે સાંભળવા માટે, ઑડિયો સ્ટ્રીમનો QR કોડ સ્કૅન કરો"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"શેર કરતી વખતે પાસવર્ડમાં ફેરફાર કરી શકાતો નથી. પાસવર્ડ બદલવા માટે, પહેલાં ઑડિયો શેરિંગ બંધ કરો."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"તમારા પાસવર્ડમાં 4-16 અક્ષર હોવા જોઈએ અને તેમાં માત્ર અક્ષરો, અંકો અને પ્રતીકોનો ઉપયોગ થવો જોઈએ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR કોડ સ્કૅનર"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"શું સહાયની જરૂર છે?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"સેટિંગમાં શોધો"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"સંપર્કો, સ્ટોરેજ, એકાઉન્ટ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"સંપર્કો માટે સ્ટોરેજ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ફક્ત ડિવાઇસ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"નવા સંપર્કોને કોઈ એકાઉન્ટ સાથે સિંક કરવામાં આવશે નહીં"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ડિફૉલ્ટ તરીકે, સંપર્કોને તમારા ડિવાઇસમાં સાચવવામાં આવશે અને તેને તમારા એકાઉન્ટ સાથે સિંક કરવામાં આવશે"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ડિફૉલ્ટ એકાઉન્ટ સેટ કરવામાં ભૂલ આવી"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"કોઈ ડિફૉલ્ટ સેટ નથી"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ફક્ત ડિવાઇસ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ડિવાઇસ અને %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"શરૂ કરવા માટે કોઈ એકાઉન્ટ ઉમેરો"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"સંપર્કો ક્યાં સાચવવા"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"શોધવા માટે વર્તુળ દોરો"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"તમારી સ્ક્રીન પરના કન્ટેન્ટનો ઉપયોગ કરીને શોધવા માટે હોમ બટનને અથવા નૅવિગેશન હૅન્ડલને ટચ કરીને થોડીવાર દબાવી રાખો."</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 0ff70119449..7ff6293dcf4 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"स्नोफ़्लेक"</item>
     <item msgid="7952183800501346803">"बीच अंब्रेला"</item>
     <item msgid="799139025758265891">"वर्कशॉप टूल"</item>
-    <item msgid="1330084588359129896">"टेंट"</item>
+    <item msgid="8112685757657659269">"पियानो"</item>
     <item msgid="3861584909935022342">"फ़िल्म रील"</item>
     <item msgid="5827426100157335512">"किताब"</item>
     <item msgid="8585828346253128384">"कमल का फूल"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a8e24b6e1c2..84a1e9d74ee 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नया डिवाइस जोड़ें"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लूटूथ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ब्लूटूथ कल अपने-आप चालू हो जाए"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ब्लूटूथ बंद करने पर, यह अगले दिन फिर से चालू हो जाता है"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"दाईं मशीन को जोड़ें"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"बाईं मशीन को जोड़ें"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"दूसरे कान की मशीन जोड़ें"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"\'ब्लूटूथ LE Audio\' को बंद करें"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"अगर डिवाइस पर LE Audio हार्डवेयर चलता है, तो \'ब्लूटूथ LE Audio\' को बंद करें."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ब्लूटूथ LE Audio मोड"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ब्लूटूथ LE Audio के ज़रिए ऑडियो ब्रॉडकास्ट करने से जुड़े यूज़र इंटरफ़ेस (यूआई) की झलक दिखाने वाली सेटिंग चालू करें"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"यह सेटिंग चालू करने पर, LE Audio के ज़रिए ऑडियो शेयर करने से जुड़े यूआई की झलक दिखने लगती है. इसमें निजी ऑडियो शेयर करने और प्राइवेट ब्रॉडकास्ट करने से जुड़ी सुविधा की झलक भी शामिल होती है"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"डिवाइस डिटेल में LE Audio टॉगल दिखाएं"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ब्लूटूथ LE Audio के लिए अनुमति वाली सूची को बायपास करें"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio का इस्तेमाल डिफ़ॉल्ट रूप से करें, भले ही अनुमति वाली सूची में शामिल करने के लिए, LE Audio वाले सहायक डिवाइसों की पुष्टि न की गई हो."</string>
@@ -136,10 +139,10 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"सभी देखें"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"सभी देखें"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"स्टाइलस"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"स्टाइलस बटन दबाने पर यह ऐप्लिकेशन खुले"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"टेल बटन दबाने पर खुले"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (वर्क प्रोफ़ाइल)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"टेक्स्ट फ़ील्ड में कुछ लिखें"</string>
-    <string name="stylus_ignore_button" msgid="7734540973145241391">"स्टाइलस के बटन के सभी इनपुट को नज़रअंदाज़ करें"</string>
+    <string name="stylus_ignore_button" msgid="7734540973145241391">"स्टाइलस बटन के सभी इनपुट नज़रअंदाज़ करें"</string>
     <string name="stylus_connected_devices_title" msgid="2823967577941359812">"स्टाइलस"</string>
     <string name="date_and_time" msgid="1788358029823431692">"तारीख और समय"</string>
     <string name="proxy_settings_title" msgid="4201866858226087066">"प्रॉक्सी"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ऐप्लिकेशन की भाषा"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"सुझाई गई भाषाएं"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"सभी भाषाएं"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"सुझाए गए"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"सभी भाषाएं"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"सभी देश/इलाके"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"सभी नंबरिंग सिस्टम"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"सिस्टम की भाषा"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"सिस्टम डिफ़ॉल्ट"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"सेटिंग में, इस ऐप्लिकेशन की भाषा चुनने का विकल्प मौजूद नहीं है."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"बदलें"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s उपलब्ध नहीं है"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"इस भाषा को सिस्टम की भाषा के तौर पर इस्तेमाल नहीं किया जा सकता. हालांकि, आपने ऐप्लिकेशन और वेबसाइटों पर इसे अपनी पसंदीदा भाषा के तौर पर चुना है."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"खोजें"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"कोई भाषा जोड़ें"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"क्षेत्र प्राथमिकता"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"भाषा का नाम लिखें"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"भाषा की ज़्यादा सेटिंग"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"जगह के हिसाब से प्राथमिकताएं"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"यूनिट और नंबर की प्राथमिकताएं तय करें"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ऐप्लिकेशन को जगह के हिसाब से तय की गई अपनी प्राथमिकताओं का ऐक्सेस दें, ताकि आपको मनमुताबिक अनुभव मिल सके."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ऐप्लिकेशन, जगह के हिसाब से तय की गई आपकी प्राथमिकताओं का इस्तेमाल करेंगे."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"जगह के हिसाब से प्राथमिकताएं"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"तापमान"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"हफ़्ते का पहला दिन"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"नंबर की प्राथमिकताएं"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"रोमिंग में मोबाइल डेटा चालू करें"</string>
     <string name="roaming_disable" msgid="729512894708689604">"रोमिंग में डेटा चालू करें"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"रोमिंग शुल्क लागू हो सकते हैं."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"समय अपने-आप सेट हो जाए"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"अपने-आप सेट हो जाए"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"यह टॉगल चालू रहने पर, टाइम ज़ोन सेट करने के लिए, जगह की जानकारी का इस्तेमाल किया जाएगा"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"तारीख और समय अपने-आप सेट होने की सुविधा"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"नेटवर्क और वायरलेस सिग्नल के ज़रिए तारीख और समय अपने-आप सेट होने की सुविधा पाएं"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"टाइम ज़ोन अपने-आप सेट होने की सुविधा"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"अपने आस-पास के मोबाइल नेटवर्क के मुताबिक तारीख और समय अपने-आप सेट होने की सुविधा पाएं"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"उपलब्ध होने पर, डिवाइस की जगह के हिसाब से समय और तारीख अपने-आप सेट होने की सुविधा पाएं"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"जगह और भाषा के हिसाब से समय का फ़ॉर्मैट सेट करें"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 घंटे वाले फ़ॉर्मैट का इस्तेमाल करें"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"समय"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"उंगली हटाएं और सेंसर को फिर से छूएं"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"फ़िंगरप्रिंट सेंसर इस्तेमाल नहीं किया जा सकता"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"रिपेयर करने की सेवा देने वाली कंपनी से संपर्क करें."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"स्क्रीन के बंद होने पर, उसे फ़िंगरप्रिंट से अनलॉक करने की सुविधा"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"डिवाइस की स्क्रीन बंद होने पर भी, फ़िंगरप्रिंट अनलॉक का इस्तेमाल करें"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"स्क्रीन के बंद होने पर, उसे अनलॉक करने की सुविधा"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"सुरक्षा से जुड़ी और सेटिंग"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"वर्क प्रोफ़ाइल लॉक, एन्क्रिप्शन वगैरह"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"एन्क्रिप्शन, क्रेडेंशियल वगैरह"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"प्राइवेट स्पेस के लिए पैटर्न सेट करें"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"लॉक करें"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"छिपाएं"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"प्राइवेट स्पेस के पैटर्न की पुष्टि करें"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"प्राइवेट स्पेस का पिन फिर से डालें"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"प्राइवेट स्पेस का पासवर्ड फिर से डालें"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ज़्यादा से ज़्यादा <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट जोड़े जा सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"और ज़्यादा फ़िंगरप्रिंट नहीं जोड़े जा सकते"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"चालू है"</string>
     <string name="external_display_off" msgid="5634413756025351374">"बंद है"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"बाहरी डिसप्ले"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"बाहरी डिसप्ले का इस्तेमाल करें"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"डिसप्ले का रिज़ॉल्यूशन"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"बाहरी डिसप्ले डिसकनेक्ट कर दिया गया है"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"रोटेशन या रिज़ॉल्यूशन बदलने की वजह से, बैकग्राउंड में चल रहे ऐप्लिकेशन बंद हो सकते हैं"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"डिवाइस की स्क्रीन को किसी बाहरी डिसप्ले पर दिखाने के लिए, इनका आपस में कनेक्ट होना ज़रूरी है"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ज़्यादा विकल्प"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"डिसप्ले का क्रम बदलने के लिए, उन्हें दबाकर रखें और खींचकर छोड़ें."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्ट करने की सेटिंग"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रीन शेयर करें"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"कृपया अपना पासवर्ड फिर से डालें"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"डिवाइस बनाने वाली कंपनी से संपर्क करें"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"कनेक्शन जाँचें और फिर से कोशिश करें"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"फ़िलहाल, यह वाई-फ़ाई नेटवर्क उपलब्ध नहीं है"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"इस क्यूआर कोड में कोई समस्या है. किसी दूसरे तरीके से कनेक्ट करने की कोशिश करें."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"नेटवर्क चुनें"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"अपना डिवाइस जोड़ने के लिए कोई नेटवर्क चुनें"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"इस डिवाइस को “<xliff:g id="SSID">%1$s</xliff:g>” से जोड़ें?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"स्क्रीन के अपने-आप घूम जाने (ऑटो-रोटेट) की सुविधा के बारे में ज़्यादा जानें"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"स्क्रीन रिज़ॉल्यूशन"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"हाई रिज़ॉल्यूशन"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"फ़ुल रिज़ॉल्यूशन"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"फ़ुल रिज़ॉल्यूशन में ज़्यादा बैटरी खर्च होती है. रिज़ॉल्यूशन बदलने पर, कुछ ऐप्लिकेशन रीस्टार्ट हो सकते हैं."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"चुना गया"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"बिना किसी बदलाव के"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"आस-पास की रोशनी के हिसाब से रंग बदल जाता है"</string>
     <string name="brightness" msgid="6216871641021779698">"स्क्रीन की रोशनी का लेवल"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"आस-पास की लाइट के हिसाब से स्क्रीन की रोशनी"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"आस-पास की लाइट के हिसाब से स्क्रीन की रोशनी से जुड़ी जानकारी"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"आपकी गतिविधियों और आस-पास मौजूद लाइट के हिसाब से, डिवाइस की स्क्रीन की रोशनी अपने-आप अडजस्ट हो जाएगी. स्लाइडर को मैन्युअल तरीके से अडजस्ट करें. ऐसा करने से इस सुविधा को आपकी पसंद का पता चलेगा और अगली बार स्क्रीन की रोशनी आपके हिसाब से अडजस्ट करने में मदद मिलेगी."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"चालू है"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"बंद"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"बेडटाइम मोड की सेटिंग"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{मोड के हिसाब से भी गहरे रंग वाली थीम चालू हो सकती है}=1{{mode_1} से भी गहरे रंग वाली थीम चालू हो जाती है}=2{{mode_1} और {mode_2} से भी गहरे रंग वाली थीम चालू हो जाती है}=3{{mode_1}, {mode_2}, और {mode_3} से भी गहरे रंग वाली थीम चालू हो जाती है}one{{mode_1}, {mode_2}, और # अन्य मोड से भी गहरे रंग वाली थीम चालू हो जाती है}other{{mode_1}, {mode_2}, और # अन्य मोड से भी गहरे रंग वाली थीम चालू हो जाती है}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"मोड की सेटिंग"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"सामान्य लेवल से भी कम"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"स्क्रीन की रोशनी को सामान्य लेवल से और कम करने की सुविधा"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"डिवाइस की रोशनी को सामान्य लेवल से भी कम रखें"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रीन इतनी देर में बंद हो जाए"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> तक इस्तेमाल न होने पर"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. उदाहरण के लिए, इसका इस्तेमाल जगह की जानकारी से जुड़ी सुविधाओं और सेवाओं में सुधार करने के लिए किया जा सकता है."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"जगह की जानकारी"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"जगह की जानकारी"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"जगह की जानकारी का इस्तेमाल करें"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"टाइम ज़ोन के लिए जगह की जानकारी का इस्तेमाल करें"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"टाइम ज़ोन अपने-आप सेट नहीं हो सकता"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"जगह की जानकारी वाली सेटिंग बंद है"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"जगह की जानकारी की सेटिंग"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"इसे ठीक करें"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"अभी नहीं"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"समय क्षेत्र अपने-आप सेट होने की सुविधा बंद है"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"टाइम ज़ोन अपने-आप सेट होने की सुविधा बंद होने पर, यह सुविधा उपलब्ध नहीं होती"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"टाइम ज़ोन सेट करने के लिए, जगह की जानकारी का इस्तेमाल किया जा सकता है"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"अगर आपके डिवाइस की जगह की जानकारी उपलब्ध है, तो इसका इस्तेमाल आपके टाइम ज़ोन को सेट करने के लिए किया जा सकता है"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"क़ानूनी जानकारी, स्‍थिति, सॉफ़्टवेयर वर्शन देखें"</string>
     <string name="legal_information" msgid="7509900979811934843">"कानूनी जानकारी"</string>
     <string name="manual" msgid="3651593989906084868">"मैन्युअल"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"अन्य विकल्प"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"सुलभता सुविधा"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"सामान्य कीबोर्ड"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"बाउंस बटन"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"एक ही कुंजी को <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> मि॰से॰ के अंदर बार-बार दबाने पर, कीबोर्ड उसे अनदेखा कर देता है"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"एक ही बटन को बार-बार दबाने पर, कीबोर्ड तुरंत कोई कार्रवाई नहीं करेगा"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"बाउंस बटन का थ्रेशोल्ड"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"चुनें कि किसी बटन को कितनी देर तक बार-बार दबाने पर कीबोर्ड कोई कार्रवाई नहीं करेगा"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 सेकंड"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 सेकंड"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 सेकंड"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"अपने हिसाब से सेट करें"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"अपने हिसाब से वैल्यू सेट करें"</string>
     <string name="slow_keys" msgid="2891452895499690837">"स्लो बटन"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"किसी कुंजी को दबाने पर, स्क्रीन पर होने वाली प्रतिक्रिया का समय <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> मि॰से॰ तक अडजस्ट किया जा सकता है"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"किसी बटन को दबाने पर स्क्रीन पर होने वाली प्रतिक्रिया के समय में बदलाव करें"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"स्टिकी बटन"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"शॉर्टकट के लिए, कई कुंजियों को एक साथ दबाकर रखने के बजाय एक बार में एक कुंजी दबाएं"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस का काम करने वाले बटन"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"माउस पॉइंटर को कंट्रोल करने के लिए, फ़िज़िकल कीबोर्ड का इस्तेमाल करें."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"माउस वाले बटन का इस्तेमाल करें"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"पॉइंटर को कंट्रोल करने के लिए, कीबोर्ड का इस्तेमाल करें"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउस रिवर्स स्क्रोलिंग"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज को नीचे ले जाने के लिए, ऊपर की ओर स्क्रोल करें"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"बाएं और दाएं बटन स्वैप करें"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माउस के बाएं बटन को दाएं बटन की तरह इस्तेमाल करें"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> के लिए माउस का काम करने वाले बटन"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"माउस पॉइंटर को मूव करने के लिए, <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> बटन का इस्तेमाल करें"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"माउस के मुख्य बटन पर क्लिक करने के लिए, <xliff:g id="CLICK_LABEL">%s</xliff:g> बटन का इस्तेमाल करें"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"माउस का मुख्य बटन दबाकर रखने के लिए,<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> बटन का इस्तेमाल करें"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"माउस के मुख्य बटन को रिलीज़ करने के लिए, <xliff:g id="RELEASE_LABEL">%s</xliff:g> बटन का इस्तेमाल करें"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"स्क्रोल मोड को टॉगल करने के लिए, <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> बटन का इस्तेमाल करें. इससे, <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> बटन से व्यू को ऊपर, नीचे, बाएं या दाएं स्क्रोल किया जा सकता है"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"माउस के सेकंडरी बटन पर क्लिक करने के लिए, <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> बटन का इस्तेमाल करें"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"कीबोर्ड शॉर्टकट"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"शॉर्टकट की सूची दिखाएं"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"काम के प्रोफ़ाइल से जुड़े कीबोर्ड और टूल"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"डिफ़ॉल्ट रूप से"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"टचपैड"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"टचपैड और माउस"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"माउस"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"पॉइंटर की स्पीड, हाथ के जेस्चर"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"क्लिक करने के लिए टैप करें"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"टैप करके खींचें और छोड़ें"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"सबसे नीचे दाईं ओर क्लिक करें"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"टचपैड के सबसे नीचे दाएं कोने पर क्लिक करके अन्य विकल्प पाएं"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"पॉइंटर की स्पीड"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"तीन उंगलियों से टैप करें"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"पॉइंटर का कलर"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"पॉइंटर फ़िल स्टाइल, ब्लैक में बदलें"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"पॉइंटर फ़िल स्टाइल, ग्रीन में बदलें"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"टचपैड पर हाथ के जेस्चर जानें"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ट्रैकपैड, ट्रैक पैड, माउस, कर्सर, स्क्रोल, स्वाइप, राइट क्लिक, क्लिक, पॉइंटर"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"राइट क्लिक, टैप"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"बीच में क्लिक करें"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant को लॉन्च करें"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"होम स्क्रीन पर जाएं"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"वापस जाएं"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"हाल ही में इस्तेमाल किए गए ऐप देखें"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"होम स्क्रीन पर जाएं"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"टचपैड पर तीन उंगलियों से कहीं भी ऊपर की ओर स्वाइप करें"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"वापस जाएं"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> के लिए, कोई नई कुंजी चुनें:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"फ़िज़िकल कीबोर्ड की सुलभता सेटिंग"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी बटन, बाउंस बटन, माउस बटन"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"बटन को दबाकर रखें"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"कीबोर्ड का बटन दबाकर दोहराने में लगने वाला समय"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"दोहराने की दर"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"किसी बटन को दबाकर रखने पर, उस बटन का वर्ण तब तक दोहराया जाएगा, जब तक बटन को छोड़ा नहीं जाता"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> का लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफ़ॉल्ट"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"अपने-आप चुना गया: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"झलक"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"मानक विकल्प"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"टेक्स्ट का साइज़"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"कैप्शन का साइज़"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"कैप्शन की स्टाइल"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"आपके मुताबिक विकल्प"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"पृष्ठभूमि का रंग"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"पावर उपयोग एडजस्ट करें"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"शामिल पैकेज"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ऐप्लिकेशन सामान्य रूप से काम कर रहे हैं"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"बैटरी बदलने की ज़रूरत है"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"बैटरी की क्षमता और चार्जिंग की परफ़ॉर्मेंस कम हो गई है. इसलिए, बैटरी बदलने की ज़रूरत है."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"बैटरी कम है"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"बैटरी लाइफ़ बढ़ाने के लिए, बैटरी सेवर को चालू करें"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"बैटरी लाइफ़ बढ़ाएं"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"इस VPN को डिसकनेक्ट करना चाहते हैं?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"डिसकनेक्ट करें"</string>
     <string name="vpn_version" msgid="6344167191984400976">"वर्शन"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"वर्शन <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"इस वीपीएन नेटवर्क को हटाएं"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"मौजूदा वीपीएन को बदलें?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"हमेशा-चालू VPN सेट करें?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"सोमवार से शुक्रवार, सुबह 9 से 5 बजे तक\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"कैलेंडर इवेंट"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} चालू है}=2{{mode_1} और {mode_2} चालू हैं}=3{{mode_1}, {mode_2}, और {mode_3} चालू हैं}one{{mode_1}, {mode_2}, और # अन्य मोड चालू है}other{{mode_1}, {mode_2}, और # अन्य मोड चालू हैं}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 मोड अपने-आप चालू हो सकता है}one{# मोड अपने-आप चालू हो सकता है}other{# मोड अपने-आप चालू हो सकते हैं}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{परेशान न करें}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"चालू है"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"सेट नहीं है"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"बंद है"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ठीक है"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"सूचनाएं"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"कुल समय"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"मैसेज, इवेंट और रिमाइंडर"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'परेशान न करें\' सुविधा चालू होने पर मैसेज (एसएमएस), रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव करके अपने दोस्तों, परिवार के लोगों या दूसरे संपर्कों के मैसेज (एसएमएस) मिलने की मंज़ूरी दे सकते हैं."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"हो गया"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"सेटिंग"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही कोई आवाज़ सुनाई दे"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"सूचना आने पर कोई आवाज़ न हो"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"अगर आप यह सेटिंग चुनते हैं तो, सूचना आने पर न तो स्क्रीन पर कुछ दिखाया जाएगा और न ही कोई आवाज़ आएगी. पसंदीदा संपर्कों और दोबारा (पहली बार कॉल रिसीव न करने के 15 मिनट के अंदर ही दोबारा) कॉल करने वालों के कॉल आने दिए जाएंगे."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(मौजूदा सेटिंग)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"क्या आप \'परेशान न करें\' की सूचना सेटिंग में बदलाव करना चाहते हैं?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"वर्क प्रोफ़ाइल से जुड़ी आवाज़ें"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"निजी प्रोफ़ाइल पर सेट की गई आवाज़ें इस्तेमाल करें"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"निजी प्रोफ़ाइल पर सेट की गई आवाज़ें इस्तेमाल करें"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"डिवाइस को अनलॉक करने के बाद, सीधे पिछली खुली स्क्रीन पर जाएं. लॉक स्क्रीन पर सूचनाएं नहीं दिखेंगी. सूचनाएं देखने के लिए ऊपर से नीचे की ओर स्वाइप करें."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, छोड़ें, बायपास"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"वर्क प्रोफ़ाइल लॉक होने पर"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"लॉक स्क्रीन पर कम सूचनाएं दिखाने का विकल्प"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"लॉक स्क्रीन पर कम सूचनाएं दिखाएं"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"लॉक स्क्रीन पर सिर्फ़ नई सूचनाएं दिखाएं"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"देखी जा चुकी सूचनाएं लॉक स्क्रीन से अपने-आप हट जाएंगी"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"लॉक स्क्रीन पर दिखने वाली सूचनाएं"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"डिफ़ॉल्ट और साइलेंट, दोनों मोड वाली सूचनाएं और बातचीत दिखाएं"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"बातचीत, डिफ़ॉल्ट, और साइलेंट मोड पर सेट की गई सूचनाएं दिखाएं"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ऑफ़िस के काम से जुड़ी सभी सूचनाएं दिखाएं"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ऑफ़िस के काम से जुड़ी संवेदनशील सूचनाएं छिपाएं"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"जब आपका डिवाइस लॉक हो, तो आप प्रोफ़ाइल सूचना को किस तरह दिखाया जाना चाहेंगे?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3673,7 +3744,7 @@
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"अगर <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का ऐक्सेस बंद किया जाता है, तो \'परेशान न करें\' सेवा का ऐक्सेस भी बंद हो सकता है."</string>
     <string name="notification_listener_disable_modes_warning_summary" msgid="7528432011433844158">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचनाओं का ऐक्सेस बंद करने पर, मोड का ऐक्सेस भी बंद हो सकता है."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"बंद करें"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"रद्द करें"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"अभी नहीं"</string>
     <string name="notif_type_ongoing" msgid="135675014223627555">"रीयल-टाइम"</string>
     <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"इस्तेमाल हो रहे ऐप्लिकेशन में चल रही बातचीत, नेविगेशन, फ़ोन कॉल, और दूसरी गतिविधियां"</string>
     <string name="notif_type_conversation" msgid="4383931408641374979">"बातचीत"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"कम समय में कई सूचनाएं मिलने पर, दो मिनट के लिए आपका डिवाइस इन सूचनाओं से होने वाली आवाज़ों को कम करेगा और स्क्रीन पर कम सूचनाएं दिखाएगा. हालांकि, कॉल, अलार्म, और अहम बातचीत से जुड़ी सूचनाएं अब भी पहले की तरह ही मिलती रहेंगी. \n\n इस सेटिंग के चालू रहने के दौरान मिली सभी सूचनाएं देखने के लिए, स्क्रीन पर सबसे ऊपर से नीचे की ओर स्वाइप करें."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"वर्क प्रोफ़ाइल पर लागू करें"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"वर्क प्रोफ़ाइल के ऐप्लिकेशन पर लागू करें"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"सूचनाओं को एक ग्रुप में रखने की सेटिंग"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"चालू है"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"बंद है"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"सूचनाओं को एक ग्रुप में रखने की सेटिंग का इस्तेमाल करें"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"एक जैसी थीम वाली सूचनाओं की आवाज़ या वाइब्रेशन को बंद कर दिया जाएगा और इन्हें एक ही ग्रुप में रखा जाएगा. इससे आपको बिना किसी शोर के सूचनाएं मिलेंगी. सूचनाओं को एक ही ग्रुप में रखने से, ऐप्लिकेशन की सूचना सेटिंग बदल जाएंगी."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"वीआर के साथ काम करने वाली सेवाएं"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"डिवाइस पर मौजूद किसी भी ऐप्लिकेशन ने वीआर के साथ काम करने वाली सेवा के तौर पर चलाए जाने का अनुरोध नहीं किया है."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> को वीआर सेवा के इस्तेमाल की अनुमति दें?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"अहम बातचीत"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोई भी नहीं"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कोई बातचीत नहीं}=1{1 बातचीत}one{# बातचीत}other{# बातचीत}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"बातचीत की सेटिंग"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"वे कॉल और मैसेज जो \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"मैसेज और कॉल वाले ऐप्लिकेशन की सूचनाएं बंद होने पर भी, वे लोग इन ऐप्लिकेशन के ज़रिए आपसे संपर्क कर सकते हैं जिन्हें आपने चुना है"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोई भी"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"स्टार के निशान वाले संपर्क"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"संपर्क सेटिंग"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"स्टार के निशान वाले संपर्कों से जुड़ी सेटिंग"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"कोई नहीं"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्म"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (काम के लिए)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"डेटा फ़ेच किया जा रहा है…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ऐप्लिकेशन की सेटिंग"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ऐप्लिकेशन को ओवरराइड करने की मंज़ूरी दें"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ऐप्लिकेशन जो \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"कोई मोड बनाएं"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोड का नाम"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"मोड का नाम डालना ज़रूरी है"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"कोई आइकॉन चुनें"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"कैलेंडर इवेंट"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"सोने के समय का रूटीन"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ड्राइव करते समय"</string>
@@ -3929,7 +4011,7 @@
     <string name="suggestion_button_close" msgid="6865170855573283759">"बंद करें"</string>
     <string name="device_feedback" msgid="5351614458411688608">"इस डिवाइस के बारे में सुझाव भेजें"</string>
     <string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"व्यवस्थापक पिन डालें"</string>
-    <string name="switch_on_text" msgid="5664542327776075105">"चालू"</string>
+    <string name="switch_on_text" msgid="5664542327776075105">"चालू है"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"बंद"</string>
     <string name="nfc_setting_on" msgid="7701896496026725772">"चालू है"</string>
     <string name="nfc_setting_off" msgid="7142103438532732309">"बंद है"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"पूरी स्क्रीन पर सूचनाएं दिखाने की अनुमति"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"इस ऐप्लिकेशन को पूरी स्क्रीन पर सूचनाएं दिखाने की अनुमति दें"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"डिवाइस लॉक रहने पर, इस ऐप्लिकेशन को सूचनाएं पूरी स्क्रीन पर दिखाने की अनुमति दें. ऐसा करने पर, अलार्म, इनकमिंग कॉल या अन्य ज़रूरी सूचनाएं पूरी स्क्रीन पर दिखाई जा सकती हैं."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"सिस्टम की सेटिंग में बदलाव करने की अनुमति"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"इस ऐप्लिकेशन को अपनी ओर से सिस्टम की सेटिंग में बदलाव करने की अनुमति दें"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"किसी ऐप्लिकेशन को यह अनुमति देने पर, वह सिस्टम की मुख्य सेटिंग में बदलाव कर सकता है."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"मीडिया मैनेजमेंट ऐप्लिकेशन"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ऐप्लिकेशन को मीडिया मैनेज करने की अनुमति दें"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"अनुमति देने पर, यह दूसरे ऐप्लिकेशन का इस्तेमाल करके बनाई गई मीडिया फ़ाइलों में बदलाव कर सकेगा या उन्हें मिटा सकेगा. यह ऐप्लिकेशन ये काम आपसे बिना पूछे कर सकता है. इसके लिए, इसके पास मीडिया और अन्य फाइलों को ऐक्सेस करने की अनुमति होनी चाहिए."</string>
@@ -4396,6 +4481,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"हाथ के जेस्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"तुरंत कैमरा खोलने की सुविधा"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"कैमरा तुरंत खोलने के लिए, पावर बटन को दो बार दबाएं. ऐसा किसी भी स्क्रीन से किया जा सकता है."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"पावर बटन पर दो बार टैप करें"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"दो बार टैप करें"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"पावर बटन पर दो बार टैप करें"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"कैमरा खोलें"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"कैमरा ऐक्सेस करें"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Wallet खोलें"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Wallet को ऐक्सेस करें"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"सेल्फ़ी के लिए कैमरा फ़्लिप करें"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"नेविगेशन मोड"</string>
@@ -4793,11 +4885,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"सैटलाइट के ज़रिए मैसेज भेजने की सुविधा"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"सैटलाइट के ज़रिए मैसेज भेजें और पाएं. यह सुविधा, आपके खाते के लिए उपलब्ध नहीं है."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"सैटलाइट के ज़रिए मैसेज भेजें और पाएं. आपके खाते से इस सुविधा का इस्तेमाल नहीं किया जा सकता."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"सैटलाइट के ज़रिए मैसेज भेजने की सुविधा"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"सैटलाइट के ज़रिए मैसेज भेजने की सुविधा के बारे में जानकारी"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"अगर आपके पास <xliff:g id="CARRIER_NAME">%1$s</xliff:g> खाता है, तो आपके लिए सैटलाइट के ज़रिए मैसेज भेजने और पाने की सुविधा उपलब्ध है"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"आपका <xliff:g id="CARRIER_NAME">%1$s</xliff:g> प्लान"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"आपके खाते के प्लान में सैटलाइट के ज़रिए मैसेज भेजने की सुविधा शामिल है"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"आपके खाते के प्लान में सैटलाइट के ज़रिए मैसेज भेजने की सुविधा शामिल नहीं है"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ज़्यादा जानें"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"यह सुविधा कैसे काम करती है"</string>
@@ -4805,10 +4900,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"आपका फ़ोन, सैटलाइट से अपने-आप कनेक्ट हो जाएगा. अच्छे कनेक्शन के लिए, यह ज़रूरी है कि आप किसी खुली जगह में हों और आसमान साफ़ हो."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"फ़ोन के सैटलाइट के साथ कनेक्ट होने पर"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"इस सुविधा के ज़रिए किसी को भी मैसेज किया जा सकता है. इसमें आपातकालीन सेवाएं भी शामिल हैं. मोबाइल नेटवर्क के उपलब्ध होने पर, आपका फ़ोन फिर से कनेक्ट हो जाएगा."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"सैटलाइट के ज़रिए मैसेज भेजने में ज़्यादा समय लग सकता है. यह सुविधा, कुछ ही जगहों पर इस्तेमाल की जा सकती है. मौसम और ऊंची इमारतों, पहाड़ों वगैरह की वजह से, आपके सैटलाइट कनेक्शन पर असर पड़ सकता है. सैटलाइट के ज़रिए कॉल करने की सुविधा उपलब्ध नहीं है. हालांकि, आपातकालीन कॉल कनेक्ट हो सकती हैं.\n\nखाते में हुए बदलावों को सेटिंग पर दिखने में थोड़ा समय लग सकता है. ज़्यादा जानकारी के लिए, मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"सैटलाइट के ज़रिए मैसेज भेजने की सुविधा के बारे में ज़्यादा जानकारी"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> चालू नहीं किया जा सकता"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> चालू करने के लिए, पहले सैटलाइट कनेक्शन बंद करें"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"सैटलाइट कनेक्टिविटी"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ऐक्सेस पॉइंट नेम"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"एपीएन"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
@@ -4995,6 +5137,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"आप पेज-ऐग्नोस्टिक मोड के 16 केबी मोड में हैं. इस मोड में, सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक होने के दौरान आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में हो सकती है. इन मोड में, कुछ सुविधाएं बंद हो जाएंगी. इसलिए, ऐसा हो सकता है कि कुछ ऐप्लिकेशन काम न करें. प्रोडक्शन मोड पर वापस जाने के लिए, आपको 4 केबी मोड पर फिर से स्विच करना होगा. इसके बाद, आपको डिवाइस का बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फिर से फ़ैक्ट्री रीसेट हो जाएगा और इसकी प्रोडक्शन सेटिंग पहले जैसी हो जाएंगी. डिवाइस के Android में बूट हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. अगर डिवाइस Android में बूट नहीं होता या ठीक से काम नहीं करता, तो &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; पर जाकर नई फ़ैक्ट्री इमेज का इस्तेमाल करके डिवाइस को फिर से फ़्लैश करें या &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; पर दिए गए टूल का इस्तेमाल करें. इसके बाद, \'डिवाइस वाइप करें\', \'बूटलोडर को लॉक करें\', और \'सभी हिस्से ज़बरदस्ती फ़्लैश करें\' को चुनें."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 केबी पेज-एग्नोस्टिक मोड"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ज़्यादा पढ़ें"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ऐप्लिकेशन को पेज साइज़ कंपैटबिलिटी मोड में चलाएं"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"गड़बड़ी की रिपोर्ट हैंडल करने वाला"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"तय करें कि आपके डिवाइस पर कौनसा ऐप्लिकेशन गड़बड़ी की रिपोर्ट के शॉर्टकट का इस्तेमाल करता है."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"निजी"</string>
@@ -5161,7 +5306,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"यूडब्ल्यूबी टेक्नोलॉजी मौजूदा जगह पर उपलब्ध नहीं है"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread का इस्तेमाल करें"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread, स्मार्ट होम डिवाइसों को कनेक्ट करने, उनके काम करने की क्षमता बढ़ाने, और उनकी परफ़ॉर्मेंस बेहतर करने में मदद करते हैं.\n\nचालू करने पर, डिवाइस को Thread नेटवर्क से कनेक्ट किया जा सकता है. इससे Matter की सुविधा वाले डिवाइसों को फ़ोन से कंट्रोल किया जा सकेगा."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread, स्मार्ट होम डिवाइसों को कनेक्ट करने, उनकी क्षमता बढ़ाने, और उनकी परफ़ॉर्मेंस बेहतर करने में मदद करते हैं.\n\nचालू होने पर, इस डिवाइस को Thread नेटवर्क से कनेक्ट किया जा सकता है. इससे Matter की सुविधा वाले डिवाइसों को फ़ोन से कंट्रोल किया जा सकेगा."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread के बारे में ज़्यादा जानें"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"कैमरे का ऐक्सेस"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"माइक्रोफ़ोन का ऐक्सेस"</string>
@@ -5433,7 +5578,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"स्ट्रीम सुनें"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> पर सुनने के लिए, ऑडियो स्ट्रीम का क्यूआर कोड स्कैन करें"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"शेयर करने के दौरान पासवर्ड में बदलाव नहीं किया जा सकता. पासवर्ड बदलने के लिए, पहले ऑडियो शेयर करने की सुविधा बंद करें."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"आपके पासवर्ड में 4 से 16 वर्ण होने चाहिए. इसके लिए, सिर्फ़ अक्षर, नंबर, और सिंबल इस्तेमाल करें"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"क्यूआर कोड स्कैनर"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"मदद चाहिए?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"सेटिंग खोजें"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"संपर्क, स्टोरेज, खाता"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"संपर्क स्टोरेज"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"संपर्क सिर्फ़ डिवाइस में सेव करें"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"नए संपर्क किसी खाते से सिंक नहीं किए जाएंगे"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"डिफ़ॉल्ट रूप से, संपर्क आपके डिवाइस में सेव हो जाएंगे और आपके खाते से सिंक हो जाएंगे"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"डिफ़ॉल्ट खाता सेट करने में गड़बड़ी हुई"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"कोई डिफ़ॉल्ट खाता सेट नहीं किया गया है"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"सिर्फ़ डिवाइस का इस्तेमाल करें"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिवाइस और %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सिंक करने के लिए कोई खाता जोड़ें"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"संपर्कों को कहां सेव करना है"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"सर्कल बनाकर ढूंढें"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"स्क्रीन पर दिख रहे कॉन्टेंट की मदद से कोई चीज़ खोजने के लिए, होम बटन या नेविगेशन हैंडल को दबाकर रखें."</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 3af0878963d..baef0e803b9 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snježna pahuljica"</item>
     <item msgid="7952183800501346803">"Suncobran za plažu"</item>
     <item msgid="799139025758265891">"Radionički alati"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
+    <item msgid="8112685757657659269">"Klavir"</item>
     <item msgid="3861584909935022342">"Filmska vrpca"</item>
     <item msgid="5827426100157335512">"Knjiga"</item>
     <item msgid="8585828346253128384">"Lotosov cvijet"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ac77b281511..79f97de72c8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ako ga isključite, Bluetooth će se ponovo uključiti sljedeći dan"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Upari desno uho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Upari lijevo uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Uparite drugo uho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Onemogući Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Onemogućuje značajku Bluetooth LE audio ako uređaj podržava mogućnosti za LE audio hardvera."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Način Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Omogući pregled korisničkog sučelja za Bluetooth LE Audio emitiranje"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Omogućuje pregled korisničkog sučelja za LE Audio dijeljenje, uključujući dijeljenje osobnog zvuka i privatno emitiranje"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Prikaži prekidač LE audio u pojedinostima o uređaju"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Zaobiđi popis dopuštenih za Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Upotrebljavajte LE Audio prema zadanim postavkama čak i ako nije potvrđeno da LE Audio periferni uređaj ispunjava kriterije za popis dopuštenih."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jezik aplikacije"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Predloženi jezici"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Svi jezici"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Predloženo"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Svi jezici"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Sve regije"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Svi brojevni sustavi"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Jezik sustava"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Zadane postavke sustava"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Odabir jezika za ovu aplikaciju nije dostupan u postavkama."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Promijeni"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nije dostupan"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Taj se jezik ne može upotrebljavati kao jezik sustava, no postavili ste ga kao preferirani jezik za aplikacije i web-lokacije."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pretraži"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dodajte jezik"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Postavke regije"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Unesite naziv jezika"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Više postavki jezika"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionalne preferencije"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Odredite kako će se prikazivati mjerne jedinice i brojke"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Unesite svoje regionalne preferencije u aplikacije kako bi mogle personalizirati vaš doživljaj."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacije će upotrebljavati vaše regionalne preferencije kad je to moguće."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionalne preferencije"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prvi dan u tjednu"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Postavke brojeva"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Poveži se s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Poveži se s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Moguća je naplata dodatnih naknada za roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Automatski postavi vrijeme"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Postavi automatski"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokacija će se upotrebljavati za postavljanje vremenske zone kad je ovaj prekidač uključen"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatski datum i vrijeme"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Postavi automatski pomoću mreže i bežičnih signala"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatski postavi na temelju mobilnih mreža u blizini"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Postavi automatski pomoću lokacije uređaja, ako je dostupna"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi zadani lokalni format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vrijeme"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Podignite prst, a zatim ponovo dodirnite senzor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Senzor otiska prsta ne može se koristiti"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Posjetite servisera."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Otključavanje otiskom prsta kad je zaslon isključen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Koristi se otključavanje otiskom prsta čak i kad je zaslon isključen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Isključivanje zaslona, otključavanje"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Više sigurnosnih postavki"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zaključavanje poslovnog profila, šifriranje i drugo"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifriranje, vjerodajnice i drugo"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Postavljanje uzorka za privatni prostor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zaključavanje"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Sakrivanje"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potvrdite uzorak za privatni prostor"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Ponovo unesite PIN za privatni prostor"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Ponovo unesite zaporku za privatni prostor"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maksimalni broj otisaka prstiju koji možete dodati: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nije moguće dodati više otisaka prstiju"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Uključeno"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Isključeno"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Vanjski zaslon"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ugrađeni zaslon"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Koristi vanjski zaslon"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Razlučivost zaslona"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Prekinuta je veza vanjskog zaslona"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Promjenom rotacije ili razlučivosti mogu se zaustaviti sve aplikacije koje su trenutačno pokrenute"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Da biste zrcalili svoj zaslon, vaš uređaj mora biti povezan s vanjskim zaslonom"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Više opcija"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Zadržite i povucite da biste promijenili raspored zaslona."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcalo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Provjerite zaporku i pokušajte ponovo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Obratite se proizvođaču uređaja"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Provjerite vezu i pokušajte ponovo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ova Wi‑Fi mreža trenutačno nije dostupna"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Došlo je do problema s ovim QR kodom. Pokušajte se povezati na neki drugi način."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Odabir mreže"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Da biste povezali uređaj, odaberite mrežu."</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Želite li dodati ovaj uređaj na mrežu “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saznajte više o automatskom zakretanju"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Razlučivost zaslona"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Visoka razlučivost"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Puna razlučivost"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Puna razlučivost troši više baterije. Promjena razlučivosti može dovesti do ponovnog pokretanja nekih aplikacija."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimalna razlučivost"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimalna razlučivost više troši bateriju. Promjena razlučivosti može uzrokovati ponovno pokretanje nekih aplikacija."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Odabrano"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodno"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Prilagodljivo"</string>
     <string name="brightness" msgid="6216871641021779698">"Svjetlina zaslona"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Prilagodljiva svjetlina"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"O prilagodljivoj svjetlini"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Svjetlina zaslona automatski će se prilagoditi vašoj okolini i aktivnostima. Klizač možete pomicati ručno kako bi prilagodljiva svjetlina dobila podatke o tome što vam odgovara."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Uključeno"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Isključeno"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Postavke načina rada za spavanje"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Načini rada mogu aktivirati i tamnu temu}=1{{mode_1} aktivira i tamnu temu}=2{{mode_1} i {mode_2} aktiviraju i tamnu temu}=3{{mode_1}, {mode_2} i {mode_3} aktiviraju i tamnu temu}one{{mode_1}, {mode_2} i još # aktiviraju tamnu temu}few{{mode_1}, {mode_2} i još # aktiviraju tamnu temu}other{{mode_1}, {mode_2} i još # aktiviraju tamnu temu}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Postavke načina rada"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Još tamnije"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Dodatno zatamnjenje"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Omogući da se uređaj zatamni više nego obično"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Automatsko isključivanje zaslona"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1623,7 +1647,7 @@
     <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. Time se primjerice mogu poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Usluge lokacije"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Koristi lokaciju"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Koristi lokaciju za vremensku zonu"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Nije moguće automatski postaviti vremensku zonu"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Isključeni su lokacija ili usluge lokacije"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Postavke lokacije"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Popravi"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Odustani"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nije dostupno kad je automatska vremenska zona isključena"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokacija se može koristiti za postavljanje vremenske zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ako je lokacija vašeg uređaja dostupna, može se upotrebljavati za postavljanje vremenske zone"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="7509900979811934843">"Pravne informacije"</string>
     <string name="manual" msgid="3651593989906084868">"Priručnik"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcije"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pristupačnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizička tipkovnica"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Zanemari slučajne pritiske tipki"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tipkovnica zanemaruje brzo ponovljene pritiske iste tipke unutar <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tipkovnica zanemaruje brzo ponovljene pritiske iste tipke"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag zanemarivanja slučajnih pritisaka"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Odaberite koliko dugo će tipkovnica zanemarivati ponovljene pritiske tipki"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Prilagođeno"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"prilagođena vrijednost"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Spore tipke"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Vrijeme potrebno za aktivaciju pritiska tipke prilagođava se na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Prilagođava vrijeme potrebno za aktivaciju pritiska tipke"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Ljepljive tipke"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Za prečace pritišćite jednu po jednu tipku, a ne sve u isto vrijeme"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke miša"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Upotrijebite fizičku tipkovnicu za upravljanje mišem."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Koristi tipke miša"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Upravljajte pokazivačem pomoću tipkovnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto pomicanje pomoću miša"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Pomičite se prema gore za pomicanje stranice prema dolje"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamjena lijeve i desne tipke"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Upotrebljavajte lijevu tipku miša kao desnu"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tipke miša za tipkovnicu <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Pomoću tipki <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> pomičite pokazivač miša"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Pomoću tipke <xliff:g id="CLICK_LABEL">%s</xliff:g> kliknite primarnu tipku miša"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Pomoću tipke <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> pritisnite i zadržite primarnu tipku miša"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Pomoću tipke <xliff:g id="RELEASE_LABEL">%s</xliff:g> otpustite primarnu tipku miša"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Pomoću tipke <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> uključite način pomicanja. To će omogućiti da tipkama <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> pomičete prikaz prema gore, dolje, ulijevo ili udesno"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Pomoću tipke <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> kliknite sekundarnu tipku miša"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tipkovni prečaci"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaži popis prečaca"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tipkovnice i alati radnog profila"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Zadano"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Dodirna podloga"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Dodirna podloga i miš"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Miš"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Brzina pokazivača, pokreti"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Dodirni za klik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Povlačenje dodirom"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik dolje desno"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliknite donji desni kut dodirne podloge za više opcija"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Brzina pokazivača"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Koristi dodir s tri prsta"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Boja pokazivača"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Promjena ispunj. pokaz. na crno"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Promjena ispunj. pokaz. na zeleno"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Učenje pokreta za dodirnu podlogu"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"dodirna površina, miš, pokazivač, pomicanje, prijeći prstom, kliknuti desnom tipkom, kliknuti, pokazivači"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kliknuti desnom tipkom, dodirnuti"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Srednji klik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Pokreni Asistenta"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Na početni zaslon"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Natrag"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Prikaži nedavne aplikacije"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Na početni zaslon"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Prijeđite trima prstima nagore bilo gdje na dodirnoj podlozi"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Natrag"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tipkovnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ljepljive tipke, sprečavanje slučajnih pritisaka tipki, tipke miša"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Tipke za ponavljanje unosa"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Odgodi prije ponavljanja"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Stopa ponavljanja"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pritisnite tipku i zadržite pritisak da biste ponavljali unos znaka dok je ne otpustite"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Izgled: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatski: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Veličina teksta"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titlova"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titlova"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Podesi potrošnju energije"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Uključeni paketi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacije se izvode na uobičajen način"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Preporučuje se zamjena baterije"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Smanjen je kapacitet baterije i učinkovitost punjenja, pa se preporučuje zamjena baterije."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Niska razina baterije"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Uključite štednju baterije radi produljenja trajanja baterije"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Produljenje trajanja baterije"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Prekinuti vezu s VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li zamijeniti dosadašnji VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li postaviti uvijek uključeni VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00 – 17:00, radnim danom\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Događaji iz kalendara"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Aktivno: {mode_1}}=2{Aktivno: {mode_1} i {mode_2}}=3{Aktivno: {mode_1}, {mode_2} i {mode_3}}one{Aktivno: {mode_1}, {mode_2} i još #}few{Aktivno: {mode_1}, {mode_2} i još #}other{Aktivno: {mode_1}, {mode_2} i još #}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Jedan način može se automatski uključiti}one{# način može se automatski uključiti}few{# načina mogu se automatski uključiti}other{# načina može se automatski uključiti}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne uznemiravaj}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"UKLJUČENO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nije postavljeno"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Onemogućeno"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Shvaćam"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Obavijesti"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trajanje"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Poruke, događaji i podsjetnici"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gotovo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Postavke"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bez vizualnih i zvučnih signala obavijesti"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bez zvuka obavijesti"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Obavijesti se neće prikazivati niti će se čuti zvučni signali. Dopušteni su pozivi kontakata označenih zvjezdicom i ponovnih pozivatelja."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Trenutačna postavka)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Želite li promijeniti postavke obavijesti za način Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvukovi poslovnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Koristi zvukove osobnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Upotrebljavaju se isti zvukovi kao na vašem osobnom profilu"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Nakon otključavanja otvara se posljednji korišteni zaslon. Obavijesti se neće prikazivati na zaključanom zaslonu. Prijeđite prstom prema dolje za prikaz."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Zaključani zaslon, preskakanje, zaobilaženje"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kad je poslovni profil zaključan"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Smanji broj obavijesti na zaključanom zaslonu"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Prikaži manje obavijesti na zaključanom zaslonu"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Prikazuj samo nove obavijesti na zaključanom zaslonu"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Prethodno pregledane obavijesti automatski se uklanjaju sa zaključanog zaslona"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Obavijesti na zaključanom zaslonu"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Prikaži razgovore, zadane i bešumne"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Prikaži razgovore, zadane i bešumne"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Prikaži cijeli sadržaj obavijesti poslovnog profila"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Sakrij osjetljiv sadržaj poslovnog profila"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kako želite da se prikazuju obavijesti profila kada je uređaj zaključan?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Obavijesti profila"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Obavijesti"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Obavijesti aplikacija"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Ako u kratkom vremenskom razdoblju primite velik broj obavijesti, uređaj će smanjiti glasnoću i minimizirati upozorenja u trajanju do dvije minute. To ne utječe na pozive, alarme i prioritetne razgovore. \n\nObavijesti primljene tijekom stišavanja mogu se pronaći tako da povučete prstom prema dolje s vrha zaslona."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Primijeni na poslovne profile"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Primjenjuje se na aplikacije poslovnog profila"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupirane obavijesti"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Uključeno"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Isključeno"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Koristi grupiranje obavijesti"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Obavijesti sa sličnim temama utišat će se i grupirati radi tišeg doživljaja. Grupiranje će nadjačati postavke obavijesti aplikacije."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomoćne usluge za virtualnu stvarnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila pokretanje kao pomoćna usluga za virtualnu stvarnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li dopustiti pristup usluge virtualne stvarnosti za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Postavke razgovora"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Tko može prekidati"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Čak i ako vas aplikacije za slanje poruka ili pozivanje ne mogu obavijestiti, osobe koje odaberete ovdje i dalje mogu stupiti u kontakt s vama putem tih aplikacija"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svatko"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti označeni zvjezdicom"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Postavke kontakata"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Postavke kontakata označenih zvjezdicom"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nitko"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nitko"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (posao)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Izračun u tijeku…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Postavke aplikacija"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dopusti aplikacijama da nadjačaju"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacije koje mogu prekidati"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Izradite način rada"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Prilagođeni način"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Naziv načina"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Polje za naziv načina ne može biti prazno"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Odaberite ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Događaji iz kalendara"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina prije spavanja"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Tijekom vožnje"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Obavijesti na cijelom zaslonu"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Dopusti obavijesti te aplikacije na cijelom zaslonu"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Omogućuje toj aplikaciji da prikazuje obavijesti koje zauzimaju cijeli zaslon kad je uređaj zaključan. Aplikacije na taj način mogu istaknuti alarme, dolazne pozive ili druge hitne obavijesti."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Pisanje postavki sustava"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Dopustite ovoj aplikaciji da u vaše ime mijenja postavke sustava"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Ovo dopuštenje aplikaciji omogućuje izmjenu osnovnih postavki sustava."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacije za upravljanje medijima"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Dopusti aplikaciji da upravlja medijima"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ako je dopušteno, ta aplikacija može mijenjati ili brisati medijske datoteke izrađene putem ostalih aplikacija bez vašeg dopuštenja. Aplikacija mora imati dopuštenje za pristup datotekama i medijima."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Pokreti"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Brzo otvaranje kamere"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Da biste brzo otvorili kameru, dvaput pritisnite tipku za uključivanje/isključivanje. Funkcionira na svim zaslonima."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Promjena u selfie kameru trzajem"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Način navigacije"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Slanje poruka putem satelita"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Šaljite i primajte tekstne poruke putem satelita. Uključeno s vašim računom."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Šaljite i primajte tekstne poruke putem satelita. Nije uključeno s vašim računom."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Slanje poruka putem satelita"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"O slanju poruka putem satelita"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Slanje poruka putem satelita, satelitska povezivost"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"O značajci <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Možete razmjenjivati tekstne poruke putem satelita u sklopu računa pri mobilnom operateru <xliff:g id="CARRIER_NAME">%1$s</xliff:g> koji ispunjava kriterije"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Vaš paket pri mobilnom operateru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Slanje poruka putem satelita uključeno je s vašim računom"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Slanje poruka uključeno je za vaš račun"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Slanje poruka putem satelita nije uključeno s vašim računom"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saznajte više"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Kako to funkcionira"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Vaš telefon automatski će se povezati sa satelitom. Za najbolju vezu potreban je jasan pogled na nebo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Nakon što se vaš telefon poveže sa satelitom"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Možete slati poruke svima, uključujući hitne službe. Vaš telefon ponovno će se povezati s mobilnom mrežom kad bude dostupna."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Slanje poruka putem satelita moglo bi potrajati dulje, a dostupno je samo u nekim područjima. Na vašu satelitsku vezu mogu utjecati vremenski uvjeti i određene strukture. Pozivanje putem satelita nije dostupno. Hitni pozivi i dalje se mogu povezati.\n\nMože proći neko vrijeme da promjene računa budu vidljive u postavkama. Više informacija zatražite od svog operatera."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Više o slanju poruka putem satelita"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Izvršavanje značajke <xliff:g id="SUBJECT">%1$s</xliff:g> moglo bi potrajati dulje, a ta je značajka dostupna samo u nekim područjima. Na vašu satelitsku vezu mogu utjecati vremenski uvjeti i određene strukture. Pozivanje putem satelita nije dostupno. Hitni pozivi i dalje se mogu povezati.\n\nMože proteći neko vrijeme dok se promjene računa prikažu u postavkama. Za pojedinosti se obratite mobilnom operateru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Više o značajci <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nije moguće uključiti funkciju <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Da biste uključili funkciju <xliff:g id="FUNCTION">%1$s</xliff:g>, najprije prekinite satelitsku vezu"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelitska povezivost"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelitska povezivost"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelitska povezivost"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"slanje poruka putem satelita"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Upotreba podataka uključena je za vaš račun"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS putem satelita"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Slanje poruka hitnim službama kad se ne možete povezati s mobilnom ili Wi‑Fi mrežom"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos putem satelita, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"O SOS-u putem satelita"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Možete slati poruke hitnim službama i dijeliti svoju lokaciju kad se ne možete povezati s mobilnom ili Wi-Fi mrežom. Ova usluga možda neće biti uvijek dostupna na svim lokacijama ili u svim okolnostima."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Nazovite hitne službe ili im pošaljite SMS poruku"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Odgovorite na pitanja o hitnom slučaju"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Slijedite korake za povezivanje sa satelitom"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ako niste povezani s mobilnom mrežom, prikazuje se opcija upotrebe SOS-a putem satelita"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Pošaljite odgovore hitnim službama da biste dobili odgovarajuću pomoć"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kad se povežete, možete slati poruke hitnim službama"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Isprobajte pokaznu verziju"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kad se povežete s hitnim službama putem satelita, vaše ime, e-adresa, telefonski broj, lokacija, podaci o uređaju (IMEI, jezik, model, razina baterije) i podaci za kontakt za hitne slučajeve dijele se s hitnim službama i davateljima satelitskih usluga. \n\nZa upotrebu SOS-a putem satelita Google poruke moraju biti zadana aplikacija za SMS-ove. \n\nAko je automatski odabir mreže isključen, on će se uključiti, a vaš će se uređaj automatski povezati s bilo kojom mrežom."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Postavke dijeljenja"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kontakti za hitne slučajeve"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Vaš Google račun"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Pregledajte ili ažurirajte informacije koje će se podijeliti s hitnim službama"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nazivi pristupnih točaka"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Aktivan je način rada od 16 KB koji ne ovisi o veličini stranice. U ovom se načinu ne može zajamčiti integritet softvera, a svi podaci pohranjeni na telefonu mogu biti ugroženi dok je pokretač operativnog sustava otključan. Neke će značajke biti onemogućene u tim načinima, pa neke aplikacije možda neće funkcionirati. Da biste ponovno ušli u produkcijski način rada, morate se vratiti na način od 4 KB, a zatim zaključati pokretač operativnog sustava. To će ponovno vratiti uređaj na tvorničke postavke i vratiti ga na produkcijske postavke. Nakon što uređaj uspješno pokrene Android, onemogućite OEM otključavanje u opcijama za razvojne programere. Ako uređaj ne uspije pokrenuti Android ili ako nije stabilan, ponovno instalirajte sliku sustava na uređaju s najnovijim tvorničkim verzijama firmwarea s web-lokacije &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ili upotrijebite web-lokaciju &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;, a zatim odaberite opcije Izbriši uređaj, Zaključaj pokretač operativnog sustava i Prisilno instaliraj sliku sustava na svim particijama."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Način 16 od KB koji ne ovisi o veličini stranice"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Pročitajte više"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Pokretanje aplikacije s načinom kompatibilnosti veličine stranice"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Rukovatelj izvješćem o programskim pogreškama"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Određuje koja je aplikacija zadužena za prečac Izvješće o programskim pogreškama na vašem uređaju."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Osobno"</string>
@@ -5161,7 +5284,7 @@
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Isključite način rada u zrakoplovu da biste koristili UWB"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB nije dostupan na trenutačnoj lokaciji"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
-    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Upotrebljavajte Thread"</string>
+    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Koristi Thread"</string>
     <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread vam pomaže da povežete svoje pametne kućanske uređaje te potiče učinkovitost i izvedbu.\n\nKad je omogućen, ovaj uređaj ispunjava kriterije za pridruživanje mreži Thread, čime se omogućuje kontrola nad uređajima koji podržavaju Matter putem ovog telefona."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Saznajte više o Threadu"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Pristup kameri"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Slušajte stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skenirajte QR kôd audiostreama da biste slušali s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Nije moguće urediti zaporku dok je zajedničko slušanje u tijeku. Da biste promijenili zaporku, prvo isključite zajedničko slušanje."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Zaporka mora sadržavati od 4 do 16 znakova i upotrebljavati samo slova, brojeve i simbole"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Čitač QR koda"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Trebate li pomoć?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Pretražite postavke"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakti, pohrana, račun"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Prostor za pohranu kontakata"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Samo uređaj"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi kontakti neće se sinkronizirati s računom"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti će se spremiti na vaš uređaj i prema zadanim postavkama sinkronizirati s vašim računom"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Pogreška pri postavljanju zadanog računa"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nema zadane postavke"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da biste započeli"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdje spremiti kontakte"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zaokružite i potražite"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Dodirnite gumb početnog zaslona ili oznaku za navigaciju i zadržite pritisak za pretraživanje pomoću sadržaja na vašem zaslonu."</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index d6002b8c664..44532f9a07b 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Hópehely"</item>
     <item msgid="7952183800501346803">"Strandernyő"</item>
     <item msgid="799139025758265891">"Workshop-eszközök"</item>
-    <item msgid="1330084588359129896">"Sátor"</item>
+    <item msgid="8112685757657659269">"Zongora"</item>
     <item msgid="3861584909935022342">"Filmtekercs"</item>
     <item msgid="5827426100157335512">"Könyv"</item>
     <item msgid="8585828346253128384">"Lótuszvirág"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e18abe11643..939d6293064 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Új eszköz párosítása"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatikus bekapcsolás holnap"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ha kikapcsolja a Bluetootht, másnap újra bekapcsol"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Jobb fül párosítása"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Bal fül párosítása"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Párosítsa a másik fület"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE hangátvitel kikapcsolása"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Kikapcsolja a Bluetooth alacsony energiaszintű hangátvitel funkciót, ha az eszköz támogatja az Alacsony energiaszintű hangátvitel hardver működését."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth alacsony energiaszintű hangátvitel mód"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"A Bluetooth alacsony energiaszintű hangátviteli közvetítéséhez tartozó felhasználói felület előnézetének engedélyezése"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Engedélyezi az alacsony energiaszintű hangátvitel kezelőfelületének előnézetét, beleértve a személyes hanganyagok megosztását és privát közvetítést"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"„Alacsony energiaszintű hangátvitel” az Eszközadatokban"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth alacsony energiaszintű hangátvitel engedélyezőlistájának megkerülése"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Alacsony energiaszintű hangátvitel használata alapértelmezés szerint akkor is, ha az Alacsony energiaszintű hangátvitelt használó periféria nem teljesíti igazoltan az engedélyezőlista feltételeit."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Az alkalmazás nyelve"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Javasolt nyelvek"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Minden nyelv"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Javasolt"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Minden nyelv"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Minden régió"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Minden számozási rendszer"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Alapértelmezett nyelv"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Rendszerbeállítás"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"A Nyelvválasztás nem áll rendelkezésre ehhez az alkalmazáshoz a Beállításokban."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Módosítás"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"A(z) %s nyelv nem áll rendelkezésre"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Ez a nyelv nem használható a rendszer nyelveként, de jelezte az alkalmazásoknak és a webhelyeknek, hogy ezt a nyelvet részesíti előnyben."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Keresés"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Nyelv hozzáadása"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Régió beállítása"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Adja meg a nyelvet"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"További nyelvi beállítások"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionális preferenciák"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Mértékegységekkel és számokkal kapcsolatos preferenciák beállítása"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Tudassa az alkalmazásokkal a regionális preferenciáit, hogy személyre szabhassák a felhasználói élményt."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Ahol lehetséges, ott az alkalmazások az Ön regionális preferenciáit használják majd."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionális preferenciáik"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Hőmérséklet"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"A hét első napja"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Számbeállítások"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Csatlakozás adatszolgáltatásokhoz roaming során"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Csatlakozás adatszolgáltatásokhoz roaming során"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"A szolgáltató roamingdíjat számíthat fel."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Időpont automatikus beállítása"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Automatikus beállítás"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"A helyadatok az időzóna beállítására szolgálnak majd, ha a váltógomb be van kapcsolva"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatikus dátum és idő"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatikus beállítás a hálózat és a vezeték nélküli jelek alapján"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatikus időzóna"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatikus beállítás a közeli mobilhálózatok alapján"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Automatikus beállítás az eszköz helyadatai alapján (ha rendelkezésre állnak)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Helyi alapértelmezés használata"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 órás formátum használata"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Idő"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Emelje fel ujját, majd érintse meg újra az érzékelőt"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Nem lehet használni az ujjlenyomat-érzékelőt"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Keresse fel a szervizt."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Feloldás ujjlenyomattal kikapcsolt képernyő esetén"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"A Feloldás ujjlenyomattal funkció használata akkor is, ha ki van kapcsolva a képernyő"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Képernyő kikapcsolva, feloldás"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"További biztonsági beállítások"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Munkaprofil zárolása, titkosítás és egyebek"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Titkosítás, hitelesítési adatok és egyebek"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Minta beállítása a privát területhez"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zárolás"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Elrejtés"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Erősítse meg a privát terület mintáját"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Adja meg újra a privát terület PIN-kódját"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Adja meg újra a privát terület jelszavát"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> ujjlenyomatot adhat hozzá"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Elérte a hozzáadható ujjlenyomatok maximális számát"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nem lehet több ujjlenyomatot hozzáadni"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Be"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Ki"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Külső kijelző"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Külső kijelző használata"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Kijelző felbontása"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Nem csatlakozik külső kijelző"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Az elforgatás vagy a felbontás módosítása leállíthatja az aktuálisan futó alkalmazásokat"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"A képernyő tükrözéséhez az eszköznek csatlakoznia kell egy külső kijelzőhöz"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"További lehetőségek"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"A kijelzők átrendezéséhez tartsa lenyomva és húzza őket."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tartalomátküldés"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"tükrözés"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Vezeték nélküli kijelző engedélyezése"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Ellenőrizze a jelszót, és próbálkozzon újra"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Vegye fel a kapcsolatot az eszköz gyártójával"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Ellenőrizze a kapcsolatot, és próbálja újra."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ez a Wi‑Fi-hálózat jelenleg nem áll rendelkezésre"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Probléma adódott ezzel a QR-kóddal. Próbáljon más módon csatlakozni."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Hálózat kiválasztása"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Az eszköz csatlakoztatásához válasszon hálózatot"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Hozzáadja ezt az eszközt a(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"További információ az automatikus forgatásról"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Képernyőfelbontás"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Nagy felbontás"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Teljes felbontás"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"A teljes felbontás jobban igénybe veszi az akkumulátort. A felbontás váltásakor előfordulhat, hogy néhány alkalmazás újraindul."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Kijelölve"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Színek"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Természetes"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptív"</string>
     <string name="brightness" msgid="6216871641021779698">"Fényerőszint"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Alkalmazkodó fényerő"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Az alkalmazkodó fényerőről"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"A képernyő fényerőssége automatikusan alkalmazkodik a környezethez és az adott tevékenységhez. A csúszka mozgatásával segíthet az alkalmazkodó fényerő funkciónak, hogy megtanulja az Ön személyes preferenciáit."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Bekapcsolva"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Kikapcsolva"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Az Alvásidő mód beállításai"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{A módok a sötét témát is aktiválhatják}=1{A(z) {mode_1} a sötét témát is aktiválja}=2{A(z) {mode_1} és a(z) {mode_2} a sötét témát is aktiválja}=3{A(z) {mode_1}, a(z) {mode_2} és a(z) {mode_3} a sötét témát is aktiválja}other{A(z) {mode_1}, a(z) {mode_2} és # további a sötét témát is aktiválja}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Módbeállítások"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Még kevesebb fényerő"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extrasötét"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Engedélyezi az eszköz számára, hogy a szokásosnál kevesebb fényerővel működjön"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Képernyő időkorlátja"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Helyszolgáltatások"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Helyszolgáltatások"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Hely használata"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Helyadatok használata az időzóna beállításához"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Nem állítható be automatikusan az időzóna"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Helyadatok és Helyszolgáltatások kikapcsolva"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Helybeállítások"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Javítás"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Mégse"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Az automatikus időzóna ki van kapcsolva"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nem áll rendelkezésre, ha az automatikus időzóna 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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"A helyadatok felhasználhatók az időzóna beállításához"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ha az eszköz helyadatai rendelkezésre állnak, használhatók lehetnek az időzóna beállításához"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Jogi információk, állapot, szoftververzió megtekintése"</string>
     <string name="legal_information" msgid="7509900979811934843">"Jogi információk"</string>
     <string name="manual" msgid="3651593989906084868">"Útmutató"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opciók"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Kisegítő lehetőségek"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizikai billentyűzet"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Billentyűblokkolás"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"A billentyűzet nem veszi figyelembe, ha ugyanazt a billentyűt többször is lenyomják <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms-on belül"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"A billentyűzet nem veszi figyelembe, ha ugyanazt a billentyűt gyorsan egymás után többször is lenyomja."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Billentyűblokkolás küszöbértéke"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Válassza ki, hogy a billentyűzet mennyi ideig hagyja figyelmen kívül az ismétlődő gombnyomásokat."</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 mp"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 mp"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 mp"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Egyéni"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"egyéni érték"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lassú billentyűk"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Átállítja a billentyű lenyomásától az aktiválásig eltelő időtartamot <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms-ra"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Módosítja a billentyű lenyomásától az aktiválásig eltelő időtartamot."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Beragadó billentyűk"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Egyszerre egy billentyű lenyomásával használhat billentyűparancsokat több billentyű egyszeri lenyomva tartása helyett"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Egérgombok"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"A fizikai billentyűzettel irányíthatja az egeret."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Egérgombok használata"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"A billentyűzettel vezérelheti a mutatót."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Fordított görgetés az egérrel"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Az oldal lefelé mozgatásához görgessen felfelé"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Bal és jobb gomb felcserélése"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"A bal egérgomb használata jobb egérgombként"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Egérgombok a következőhöz: <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"A következő billentyűkkel mozgathatja az egérmutatót: <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"A(z) <xliff:g id="CLICK_LABEL">%s</xliff:g> billentyű használatával kattinthat az elsődleges egérgombbal."</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"A(z) <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> billentyűvel lenyomva tarthatja az elsődleges egérgombot."</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Az <xliff:g id="RELEASE_LABEL">%s</xliff:g> billentyű használatával engedheti fel az elsődleges egérgombot."</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"A(z) <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> billentyűvel kapcsolhatja be vagy ki a görgetési módot. Ebben a módban a következő billentyűkkel görgetheti felfelé, lefelé, balra vagy jobbra a nézetet: <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"A(z) <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> billentyű használatával kattinthat a másodlagos egérgombbal."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Billentyűparancsok"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Billentyűparancsok listájának megjelenítése"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Munkaprofil billentyűzetei és eszközei"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Alapértelmezett"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Érintőpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Érintőpad és egér"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Egér"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Mutató sebessége, kézmozdulatok"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Érintéssel kattintás"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Érintéssel húzás"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kattintás a jobb alsó sarokban"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Több beállítás: kattintson az érintőpad jobb alsó sarkában"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Mutató sebessége"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Koppintás három ujjal"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Mutató színe"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Mutatókitöltés-stílus módosítása: fekete"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Mutatókitöltés-stílus módosítása: zöld"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Érintőpad-kézmozdulatok megismerése"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"érintőpad, érintő pad, egér, kurzor, görgetés, csúsztatás, kattintás jobb egérgombbal, kattintás, mutató"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kattintás jobb egérgombbal, koppintás"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Középső gombos kattintás"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"A Segéd indítása"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ugrás a kezdőképernyőre"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Vissza"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Legutóbbi alkalmazások megtekintése"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ugrás a főoldalra"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Csúsztasson gyorsan felfelé 3 ujjával bárhol az érintőpadon"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Vissza"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Válasszon új billentyűt a(z) <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> számára:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fizikai billentyűzet kisegítő lehetőségei"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Beragadó billentyűk, billentyűblokkolás, egérgombok"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ismétlődő billentyűk"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Ismétlés előtti késleltetés"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Ismétlési sebesség"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Ha lenyomva tartja valamelyik billentyűt, a billentyűhöz tartozó karakter többször is bevitelre kerül, amíg fel nem emeli az ujját."</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> elrendezés"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Alapértelmezett"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatikus: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Előnézet"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Normál beállítások"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Nyelv"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Szöveg mérete"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Felirat mérete"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Felirat stílusa"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Egyéni beállítások"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Háttérszín"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Az energiafelhasználás beállítása"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Mellékelt csomagok"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Az alkalmazások megfelelően futnak"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Javasoljuk az akkumulátor cseréjét"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Csökkent az akkumulátor kapacitása és töltési teljesítménye, ezért javasoljuk a cseréjét."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Alacsony töltöttség"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Az akkumulátor üzemidejének meghosszabbításához kapcsolja be az Akkumulátorkímélő módot"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Az akkumulátor élettartamának növelése"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Leválasztja a VPN-t?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Leválasztás"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzió"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verzió: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN elfelejtése"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Lecseréli a meglévő VPN-t?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Beállítja a mindig bekapcsolt VPN-t?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„Reggel kilenctől délután ötig, hétköznapokon”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Naptáresemények"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{A(z) {mode_1} aktív}=2{{mode_1} és {mode_2} aktív}=3{{mode_1}, {mode_2} és {mode_3} aktív}other{{mode_1}, {mode_2} és # egyéb aktív}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mód automatikusan bekapcsolódhat}other{# mód automatikusan bekapcsolódhat}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne zavarjanak}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2} és {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"BE"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nincs beállítva"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Kikapcsolva"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Értem"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Értesítések"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Időtartam"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Üzenetek, események és emlékeztetők"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Ha a „Ne zavarjanak” mód aktív, akkor az üzenetek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Kész"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Beállítások"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Nincs hang vagy vizuális jelzés az értesítéseknél"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Nincs hang az értesítéseknél"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Nem fog értesítéseket látni vagy hallani. A csillaggal megjelölt névjegyektől és az ismétlődő hívóktól érkező hívások engedélyezettek."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Jelenlegi beállítás)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Módosítja a „Ne zavarjanak” értesítési beállításokat?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Munkaprofil hangebállításai"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Személyes profil hangjainak használata"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Használja ugyanazokat a hangbeállításokat, mint a személyes profilja"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Feloldás után a legutóbbi képernyő nyílik meg. Nem láthatók értesítések a lezárási képernyőn. A megtekintésükhöz csúsztasson le a képernyő tetejéről."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lezárási képernyő, Kihagyás, Megkerülés"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Zárolt munkaprofil esetén"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Értesítések számának minimalizálása a lezárási képernyőn"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Kevesebb értesítés megjelenítése a lezárási képernyőn"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Csak az új értesítések megjelenítése a lezárási képernyőn"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"A korábban megtekintett értesítések automatikus eltávolítása a zárolási képernyőről"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Értesítések a lezárási képernyőn"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Beszélgetések megjelenítése, alapértelmezett és néma is"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Beszélgetések megjelenítése, alapértelmezett és néma is"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"A munkaprofil-értesítés teljes tartalmának megjelenítése"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Bizalmas munkahelyi tartalom elrejtése"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Ha az eszköz zárolva van, hogyan szeretné megjeleníteni a profilértesítéseket?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilértesítések"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Értesítések"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Alkalmazásértesítések"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Ha rövid időn belül sok értesítést kap, telefonja két percig csökkenti a hangerőt, és kis méretűre állítja a figyelmeztetéseket. A hívásokat, az ébresztéseket és a fontos beszélgetéseket nem érinti ez a beállítás. \n\nA befagyasztás ideje alatt kapott értesítések megtekintéséhez húzza lefelé az ujját a képernyő tetejéről."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Alkalmazás munkaprofilokra"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Alkalmazás a munkaprofil alkalmazásaira"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Kategorizált értesítések"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Be"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Ki"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Értesítéskategorizálás használata"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"A hasonló témájú értesítések némítva és csoportosítva jelennek meg a csendesebb felhasználói élmény érdekében. A kategorizálás felülírja az alkalmazások saját értesítési beállításait."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Virtuálisvalóság-segédszolgáltatás"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Egy telepített alkalmazás sem kérte, hogy virtuálisvalóság-segédszolgáltatásként legyen futtatva."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Hozzáférhet a(z) <xliff:g id="SERVICE">%1$s</xliff:g> a virtuálisvalóság-szolgáltatáshoz?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"fontos beszélgetések"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Beszélgetések beállításai"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Megszakítás engedélyezve"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Az itt megadott emberek még akkor is felvehetik Önnel a kapcsolatot az üzenetküldésre vagy hívásra használt alkalmazásokon keresztül, ha ezek az alkalmazások nem értesíthetik a bejövő üzenetekről vagy hívásokról."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hívások"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Névjegyek beállításai"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Csillaggal megjelölt névjegyek beállításai"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Egyik sem"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Egyik sem"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Riasztások"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (munkahely)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Számítás…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Alkalmazásbeállítások"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Felülbírálás engedélyezése az alkalmazások számára"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Azok az alkalmazások, amelyeknél engedélyezve van a megszakítás"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Mód létrehozása"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Egyéni mód"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mód neve"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"A mód neve nem lehet üres"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Válasszon ikont"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Naptáresemények"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Alvásidő rutin"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Vezetés közben"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Teljes képernyős értesítések"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Teljes képernyős értesítések engedélyezése ettől az alkalmazástól"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Teljes képernyős értesítések megjelenítésének engedélyezése az alkalmazásnak, amikor az eszköz zárolva van. Az alkalmazások ébresztések, bejövő hívások vagy más sürgős értesítések kiemelésére használhatják ezt a funkciót."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Rendszerbeállítások írása"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Engedélyezi az alkalmazásnak, hogy az Ön nevében módosítsa a rendszerbeállításokat"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Ez az engedély lehetővé teszi az alkalmazás számára az alapvető rendszerbeállítások módosítását."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Médiakezelő alkalmazások"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Az alkalmazás kezelheti a médiafájlokat"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ha engedélyezte, akkor ez az alkalmazás anélkül módosíthatja vagy törölheti a más alkalmazásokkal létrehozott médiafájlokat, hogy Önt megkérdezné róla. Az alkalmazások csak engedéllyel férhetnek hozzá a fájlokhoz és a médiatartalmakhoz."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Kézmozdulatok"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kamera gyors megnyitása"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"A kamera gyors megnyitásához nyomja meg a bekapcsológombot kétszer. Bármelyik képernyőről működik."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Szelfikészítés a kamera megfordításával"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigációs mód"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Műholdas üzenetváltás"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Szöveges üzeneteket küldhet és fogadhat műholdon keresztül. A szolgáltatás rendelkezésre áll a fiókjában."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Szöveges üzeneteket küldhet és fogadhat műholdon keresztül. A szolgáltatás nem áll rendelkezésre a fiókjában."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Műholdas üzenetváltás"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"A műholdas üzenetváltásról"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Jogosult <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-fiók részeként szöveges üzeneteket küldhet és fogadhat műholdas kapcsolaton keresztül."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"A <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-csomag"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"A műholdas üzenetváltás szolgáltatás rendelkezésre áll a fiókjában"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"A műholdas üzenetváltás szolgáltatás nem áll rendelkezésre a fiókjában"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"További információ"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Hogyan működik?"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"A telefon automatikusan csatlakozik az egyik műholdhoz. A jobb kapcsolat érdekében biztosítsa az eszköz szabad rálátását az égre."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Miután telefonja műholdhoz kapcsolódik"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Bárkinek küldhet szöveges üzeneteket, a segélyhívó szolgálatokat is beleértve. A telefon újracsatlakozik az adott mobilhálózatra (ha rendelkezésre áll)."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"A műholdas üzenetváltás hosszabb időt vehet igénybe, és csak bizonyos területeken áll rendelkezésre. Az időjárás és bizonyos építmények befolyásolhatják a műholdas kapcsolatot. Műholdas telefonálásra nincs lehetőség. Ettől függetlenül előfordulhat, hogy a segélyhívásokat kapcsolják.\n\nNémi időbe telhet, amíg a fiókkal kapcsolatos változások megjelennek a Beállításoknál. További információért forduljon a szolgáltatójához."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"További információ a műholdas üzenetváltásról"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nem lehetséges a(z) <xliff:g id="FUNCTION">%1$s</xliff:g> bekapcsolása"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"A(z) <xliff:g id="FUNCTION">%1$s</xliff:g> bekapcsolásához előbb szakítsa meg a műholdas kapcsolatot"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Műholdas kapcsolat"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Hozzáférési pontok nevei"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ön jelenleg a lapmérettől független mód 16 kB-os módjában van. A szoftverek integritása nem garantálható ebben a módban, és a telefonon tárolt összes adat veszélyben lehet, amíg a rendszerindító zárolása fel van oldva. Egyes funkciók le lesznek tiltva ezekben a módokban, ezért előfordulhat, hogy néhány alkalmazás nem működik. Ha szeretne visszalépni az éles üzemmódba, váltson vissza a 4 kB-os módra, majd zárolja az eszköz rendszerindítóját. Ezzel újra visszaállítja az eszközt a gyári beállításokra, és egyúttal az éles beállításokra is. Miután az eszköz sikeresen elindította az Android rendszert, tiltsa le az OEM-feloldást a Fejlesztői beállítások funkcióban. Ha az eszköz nem indítja el az Android rendszert, vagy nem stabil, telepítse újra az eszközt a legújabb gyári képfájlokkal a következő oldalon leírt módon: &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;. Másik megoldásként használhatja a &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; webhelyet is, ahol válassza a következő lehetőségeket: „Wipe Device” (Eszközadatok visszaállíthatatlan törlése), „Lock Bootloader” (Rendszerindító zárolása) és „Force Flash all partitions” (Összes partíció telepítésének kényszerítése)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 kB-os, lapmérettől független mód"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Továbbiak"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Alkalmazás futtatása oldalméret-kompatibilitási módban"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Hibajelentés kezelője"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Meghatározza, hogy melyik alkalmazás kezeli a Hibajelentés gyorsparancsot az eszközön."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Személyes"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Stream hallgatása"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Olvassa be az audiostream QR-kódját a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközön való hallgatáshoz"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Megosztás közben a jelszó nem módosítható. Ha módosítani kívánja a jelszót, először kapcsolja ki a hang megosztását."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"A jelszónak 4–16 karakterből kell állnia, és csak betűket, számokat és szimbólumokat tartalmazhat"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kód-szkennelő"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Segítségre van szüksége?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Keresési beállítások"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"névjegyek, tárhely, fiók"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Névjegytár"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Csak az eszközön"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Az új névjegyeket semmilyen fiókkal nem szinkronizálja a rendszer."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"A névjegyek alapértelmezés szerint az eszközére lesznek mentve, és szinkronizálódnak a fiókjával."</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Hiba történt az alapértelmezett fiók beállításakor"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nincs alapértelmezett beállítás"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Csak a készüléken"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Eszköz és %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"A kezdéshez adjon hozzá egy fiókot."</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"A névjegyek mentésének helye"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Bekarikázással keresés"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Tartsa lenyomva a Kezdőképernyő gombot vagy a navigációs fogópontot a képernyőn lévő tartalommal való kereséshez."</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index b64125dd81b..5ea9fd98132 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Ձյան փաթիլ"</item>
     <item msgid="7952183800501346803">"Լողափի հովանոց"</item>
     <item msgid="799139025758265891">"Արհեստանոցի գործիքներ"</item>
-    <item msgid="1330084588359129896">"Վրան"</item>
+    <item msgid="8112685757657659269">"Դաշնամուր"</item>
     <item msgid="3861584909935022342">"Ֆիլմի սյուժե"</item>
     <item msgid="5827426100157335512">"Գիրք"</item>
     <item msgid="8585828346253128384">"Լոտոսի ծաղիկ"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ccb55f6fe12..a1bb242fb32 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Նոր սարքի զուգակցում"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ավտոմատ միացնել վաղը"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Եթե անջատեք Bluetooth-ը, հաջորդ օրը այն նորից կմիանա"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Զուգակցել աջ ականջը"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Զուգակցել ձախ ականջը"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Զուգակցեք մյուս ականջը"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Անջատել Bluetooth LE Audio-ն"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Անջատում է Bluetooth LE Audio գործառույթը, եթե սարքն այն աջակցում է։"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio ռեժիմ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Միացնել Bluetooth LE Audio-ի հեռարձակման ինտերֆեյսի նախադիտումը"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Միացնում է LE Audio-ի փոխանցման ինտեֆեյսի նախադիտումը, որը ներառում է անձնական աուդիոյի փոխանցումը և անձնական հեռարձակումը"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Տեսնել LE Audio-ն սարքի տվյալներում"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Շրջանցել Bluetooth LE Audio-ի թույլատրվածների ցուցակը"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Օգտագործել LE Audio-ն ըստ կանխադրման, անգամ եթե LE Audio-ի արտաքին սարքի համապատասխանությունը թույլատրվածների ցուցակի չափանիշներին չի հաստատվել։"</string>
@@ -130,7 +133,7 @@
     <string name="connected_device_fast_pair_device_title" msgid="543124539265592392">"Կապված է հաշվի հետ"</string>
     <string name="connected_device_previously_associated_fast_pair_device_title" msgid="8353405823992023457">"Նախկինում օգտագործվել են այս հաշվի հետ"</string>
     <string name="connected_device_add_device_summary" msgid="8671009879957120802">"Bluetooth-ը կմիանա զուգակցման համար"</string>
-    <string name="connected_device_connections_title" msgid="4164120115341579170">"Միացման կարգավորումներ"</string>
+    <string name="connected_device_connections_title" msgid="4164120115341579170">"Միացման պարամետրեր"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Նախկինում միացված սարքեր"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth-ը միացված է"</string>
     <string name="previous_connected_see_all" msgid="7759413145713251328">"Տեսնել բոլորը"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Հավելվածի լեզու"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Առաջարկվող լեզուներ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Բոլոր լեզուները"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Առաջարկվող"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Բոլոր լեզուները"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Բոլոր տարածաշրջանները"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Համարակալման բոլոր համակարգերը"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Համակարգի լեզու"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Կանխադրված"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Լեզվի ընտրությունն այս հավելվածի համար հասանելի չէ Կարգավորումներում։"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Փոխել"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s լեզուն հասանելի չէ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Այս լեզուն չի կարող օգտագործվել որպես համակարգի լեզու, սակայն դուք սահմանել եք այն որպես նախընտրած լեզու հավելվածների և կայքերի համար։"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Որոնում"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Լեզվի ավելացում"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Նախընտրելի տարածաշրջան"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Մուտքագրեք լեզուն"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Լեզվի այլ կարգավորումներ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Տարածաշրջանային կարգավորումներ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Սահմանել չափման միավորների և թվերի կարգավորումներ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Հասանելի դարձրեք հավելվածներին ձեր տարածաշրջանային կարգավորումները, որպեսզի նրանք կարողանան անհատականացնել իրենց ծառայությունները"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Հավելվածները, որտեղ միգուցե կօգտագործեն ձեր տարածաշրջանային կարգավորումները"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Տարածաշրջանային կարգավորումներ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Ջերմաստիճան"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Շաբաթվա առաջին օրը"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Թվերի կարգավորումներ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Ռոումինգի համար կարող է գումար գանձվել:"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Ժամի ավտոմատ կարգավորում"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Ավտոմատ որոշում"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Երբ փոխանջատիչը միացված է, ժամային գոտին ընտրվում է տեղադրության տվյալների հիման վրա"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Ամսաթվի և ժամի ավտոմատ որոշում"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Ավտոմատ կարգավորել՝ օգտագործելով ցանցը և անլար ազդանշանները"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Ժամային գոտու ավտոմատ որոշում"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ավտոմատ սահմանել՝ հիմնվելով ձեր մոտակայքում գործող բջջային ցանցերի վրա"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Ավտոմատ կարգավորել՝ օգտագործելով սարքի տեղադրությունը, եթե առկա է"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Օգտագործել կանխադրված տեղույթը"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Օգտագործել 24-ժամյա ձևաչափը"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ժամը"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Բարձրացրեք մատը, ապա կրկին հպեք սենսորին"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Մատնահետքերի սկաները հնարավոր չէ օգտագործել"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Այցելեք սպասարկման կենտրոն։"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Մատնահետքով ապակողպում էկրանն անջատված ժամանակ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Օգտագործեք մատնահետքով ապակողպում, նույնիսկ եթե էկրանն անջատված է"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Էկրանն անջատված է, ապակողպել"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Անվտանգության այլ կարգավորումներ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Աշխատանքային պրոֆիլի կողպում, գաղտնագրում և ավելին"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Գաղտնագրում, մուտքի տվյալներ և ավելին"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Նախշ մասնավոր տարածքի համար"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Կողպում"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Թաքցնել"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Հաստատեք ձեր մասնավոր տարածքի նախշը"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Նորից մուտքագրեք ձեր մասնավոր տարածքի PIN կոդը"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Նորից մուտքագրեք ձեր մասնավոր տարածքի գաղտնաբառը"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> մատնահետք"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Դուք ավելացրել եք մատնահետքերի առավելագույն թույլատրելի քանակը"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Հնարավոր չէ ավելացնել այլ մատնահետքեր"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Միացված է"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Անջատված է"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Արտաքին էկրան"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Արտաքին էկրանի օգտագործում"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Էկրանի լուծաչափ"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Արտաքին էկրանն անջատված է"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Եթե փոխեք էկրանի դիրքը կամ լուծաչափը, գործարկված հավելվածները կարող են փակվել"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Էկրանը հայելապատճենելու համար ձեր սարքը պետք է միացված լինի արտաքին էկրանի"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Այլ ընտրանքներ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Պահեք և քաշեք՝ էկրանները վերադասավորելու համար։"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Հեռարձակում"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"հայելապատճենում"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Միացնել անլար էկրանը"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Ստուգեք գաղտնաբառն ու նորից փորձեք"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Կապվեք սարքը արտադրողի հետ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Ստուգեք ինտերնետ կապը և նորից փորձեք"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Wi-Fi ցանցն այս պահին հասանելի չէ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Այս QR կոդի հետ կապված խնդիր կա։ Փորձեք այլ եղանակով միանալ։"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Ընտրեք ցանց"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Սարքը միացնելու համար ընտրեք ցանցը"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ավելացնե՞լ այս սարքը «<xliff:g id="SSID">%1$s</xliff:g>» ցանցում"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Իմանալ ավելին ինքնապտտման մասին"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Էկրանի լուծաչափը"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Բարձր լուծաչափ"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Լրիվ լուծաչափ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Լրիվ լուծաչափը մարտկոցի լիցքն ավելի շատ է սպառում։ Այս լուծաչափին անցնելու դեպքում որոշ հավելվածներ կարող են վերագործարկվել։"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Ընտրված է"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Գույներ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Բնական"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Հարմարվող"</string>
     <string name="brightness" msgid="6216871641021779698">"Պայծառության մակարդակ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Հարմարվող պայծառություն"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Հարմարվող պայծառության մասին"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Էկրանի պայծառությունն ավտոմատ կկարգավորվի՝ կախված միջավայրի պայմաններից և ձեր գործողություններից։ Դուք կարող եք տեղաշարժել սահիչը՝ թույլ տալով հարմարվող պայծառությանը հիշել ձեր կարգավորումները։"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Միացված է"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Անջատված է"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"«Քնելու ժամ» ռեժիմի կարգավորումներ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Ռեժիմները կարող են նաև ակտիվացնել մուգ թեման}=1{{mode_1} ռեժիմը նաև ակտիվացնում է մուգ թեման}=2{{mode_1} և {mode_2} ռեժիմները նաև ակտիվացնում են մուգ թեման}=3{{mode_1}, {mode_2} և {mode_3} ռեժիմները նաև ակտիվացնում են մուգ թեման}one{{mode_1}, {mode_2} ու ևս # ռեժիմներ նաև ակտիվացնում են մուգ թեման}other{{mode_1}, {mode_2} ու ևս # ռեժիմներ նաև ակտիվացնում են մուգ թեման}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Ռեժիմների կարգավորումներ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ավելի խամրեցված"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Հավելյալ խամրեցում"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Թույլատրել սովորականից ավելի շատ խամրեցնել սարքի էկրանը"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Էկրանի անջատում"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> անգործուն լինելուց հետո"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Թույլ տալ հավելվածներին և ծառայություններին որոնել մոտակայքում գտնվող սարքեր, նույնիսկ երբ Bluetooth-ն անջատված է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը:"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Տեղորոշման ծառայություններ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Տեղորոշման ծառայություններ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Օգտագործել տեղադրության տվյալները"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Օգտագործել տեղադրությունը ժամային գոտու համար"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Ժամային գոտին չի կարող ավտոմատ կարգավորվել"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Տեղորոշումը կամ տեղորոշման ծառայություններն անջատված են"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Տեղադրության կարգավորումներ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Շտկել"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Չեղարկել"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Ժամային գոտու ավտոմատ որոշումն անջատված է"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Հասանելի չէ, երբ ժամային գոտու ավտոմատ որոշումն անջատված է"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Ժամային գոտին սահմանելու համար կարող են օգտագործվել տեղադրության տվյալները"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Եթե ձեր սարքի տեղադրությունը հասանելի է, այն կարող է օգտագործվել ձեր ժամային գոտին սահմանելու համար"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Դիտել իրավական տեղեկությունները, կարգավիճակը, ծրագրի տարբերակը"</string>
     <string name="legal_information" msgid="7509900979811934843">"Իրավական տեղեկություններ"</string>
     <string name="manual" msgid="3651593989906084868">"Ձեռքով"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Տարբերակներ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Հատուկ գործառույթներ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Ֆիզիկական ստեղնաշար"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Կրկնակի սեղմման անտեսում"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Ստեղնաշարը անտեսում է միևնույն ստեղնի արագ սեղմումները, որոնք կրկնվում են <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> մվ-ի ընթացքում"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Ստեղնաշարը անտեսում է միևնույն ստեղնի կրկնվող արագ սեղմումները"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Կրկնվող սեղմումների անտեսման շեմ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Ընտրեք, թե որքան ժամանակ պետք է անտեսվեն ստեղնաշարի ստեղների կրկնվող սեղմումները"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 վ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 վ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 վ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Այլ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"հատուկ արժեք"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Դանդաղ ստեղներ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Կարգավորում է ժամանակի տևողությունը, որից հետո ստեղնը արձագանքում է սեղմմանը՝ <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> մվ"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Կարգավորում է ժամանակի տևողությունը, որից հետո ստեղնը արձագանքում է սեղմմանը"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Կպչուն ստեղներ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Դյուրանցումների համար միաժամանակ սեղմեք մեկ ստեղն, այլ ոչ թե միասին սեղմած պահեք մի քանիսը"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Մկնիկի ստեղներ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Կառավարեք մկնիկը ֆիզիկական ստեղնաշարի միջոցով։"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Կառավարել մկնիկը ստեղների միջոցով"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ցուցիչը կառավարել ստեղնաշարի միջոցով"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Մկնիկով հետադարձ ոլորում"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Ոլորեք վերև՝ էջի ներքև անցնելու համար"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Տեղերով փոխել աջ և ձախ կոճակները"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Օգտագործեք մկնիկի ձախ կոճակը որպես աջը"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Մկնիկի կառավարման ստեղներ «<xliff:g id="KEYBOARD_NAME">%s</xliff:g>» սարքի համար"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Մկնիկի ցուցիչը տեղափոխելու համար օգտագործեք <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ստեղները"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"<xliff:g id="CLICK_LABEL">%s</xliff:g> ստեղնի սեղմումը համապատասխանում է մկնիկի հիմնական կոճակի սեղմմանը"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ստեղնի սեղմումը համապատասխանում է մկնիկի հիմնական կոճակի սեղմմանն ու պահմանը"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"<xliff:g id="RELEASE_LABEL">%s</xliff:g> ստեղնի սեղմումը համապատասխանում է մկնիկի հիմնական կոճակի բաց թողնմանը"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Սեղմեք <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ստեղնը՝ թերթելու ռեժիմը միացնելու համար։ Այս ռեժիմում <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ստեղնի օգնությամբ կարող եք թերթել էկրանը վերև, ներքև, ձախ և աջ։"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ստեղնի սեղմումը համապատասխանում է մկնիկի լրացուցիչ կոճակի սեղմմանը"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Ստեղնային դյուրանցումներ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ցույց տալ ստեղնաշարի դյուրանցումների ցանկը"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Աշխատանքային պրոֆիլի ստեղնաշարեր և գործիքներ"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Կանխադրված"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Հպահարթակ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Հպահարթակ և մկնիկ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Մուկ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Նշորդի արագությունը, ժեստեր"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Հպումով սեղմում"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Հպումով քաշում"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Սեղմում ներքևի անկյունին"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Այլ տարբերակների համար սեղմեք հպահարթակի ներքևի աջ անկյունին"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Նշորդի արագությունը"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Երեք մատով հպում"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Նշորդի գույնը"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Ցուցիչի լցման ոճը դարձնել սև"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Ցուցիչի լցման ոճը դարձնել կանաչ"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Սովորել հպահարթակի ժեստերը"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"հպահարթակ, մկնիկ, նշորդ, ոլորել, թերթել, աջ սեղմել, սեղմում, ցուցիչ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"սեղմել մկնիկի աջ կոճակը, հպել"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Մեջտեղի սեղմում"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Գործարկել Օգնականը"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Անցնել գլխավոր էջ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Հետ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Դիտել վերջին հավելվածները"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Վերադարձ հիմնական էկրան"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Հպահարթակի վրա երեք մատը սահեցրեք վերև"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Հետ"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Ընտրել նոր ստեղն <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ստեղնի փոխարեն՝"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ֆիզիկական ստեղնաշարի հատուկ գործառույթներ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Կպչուն ստեղներ, Վերադարձի ստեղներ, Մկնիկի ստեղներ"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ստեղների նիշերի կրկնություն"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Հապաղում կրկնությունից առաջ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Կրկնման արագությունը"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Կրկնել ստեղնի նիշն այնքան ժամանակ, քանի դեռ ստեղնը սեղմված է"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> դասավորություն"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Կանխադրված"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Ավտոմատ՝ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Նախադիտում"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Սովորական ընտրանքներ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Լեզու"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Տեքստի չափսը"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ենթագրերի չափսը"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Ենթագրերի ոճը"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Հատուկ ընտրանքներ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Ֆոնի գույնը"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Կարգավորել հոսանքի օգտագործումը"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Ներառված փաթեթները"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Հավելվածների աշխատանքում շեղումներ չեն հայտնաբերվել"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Խորհուրդ է տրվում փոխարինել մարտկոցը"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Մարտկոցի տարողունակությունը և լիցքավորման արդյունավետությունը նվազեցված են։ Խորհուրդ է տրվում փոխարինել մարտկոցը։"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Մարտկոցի ցածր լիցք"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Միացրեք Մարտկոցի տնտեսումը՝ դրա աշխատաժամանակը երկարացնելու համար"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Երկարացրեք մարտկոցի աշխատաժամանակը"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Անջատե՞լ այս VPN-ը:"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Անջատել"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Տարբերակ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Տարբերակ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Մոռանալ VPN-ը"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Փոխարինե՞լ ընթացիկ VPN-ը:"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Սահմանե՞լ որպես «միշտ միացված» VPN:"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"«9:00 – 17:00, աշխատանքային օրեր»"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Օրացույցի միջոցառումներ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{«{mode_1}» ռեժիմն ակտիվ է}=2{«{mode_1}» և «{mode_2}» ռեժիմներն ակտիվ են}=3{«{mode_1}», «{mode_2}» և «{mode_3}» ռեժիմներն ակտիվ են}one{«{mode_1}» և «{mode_2}» ռեժիմներն ու ևս #-ը ակտիվ են}other{«{mode_1}» և «{mode_2}» ռեժիմներն ու ևս #-ը ակտիվ են}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ռեժիմ կարող է ավտոմատ միանալ}one{# ռեժիմ կարող է ավտոմատ միանալ}other{# ռեժիմ կարող է ավտոմատ միանալ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Չանհանգստացնել}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ՄԻԱՑՎԱԾ Է"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Կարգավորված չէ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Անջատված է"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Եղավ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Ծանուցումներ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Տևողություն"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Հաղորդագրություններ, իրադարձություններ և հիշեցումներ"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և միջոցառումների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Պատրաստ է"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Կարգավորումներ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ամբողջությամբ անջատել ծանուցումները"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Անջատել ծանուցումների ձայնը"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Ծանուցումներն ամբողջությամբ կանջատվեն։ Դուք կստանաք միայն աստղանշված կոնտակտներից և կրկնվող զանգեր։"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ընթացիկ կարգավորումը)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Փոփոխե՞լ «Չանհանգստացնել» ռեժիմի ծանուցումների կարգավորումները"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Աշխատանքային պրոֆիլի ձայներ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Օգտագործել անձնական պրոֆիլի ձայները"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Օգտագործել նույն ձայները, ինչ անձնական պրոֆիլում"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Ապակողպելուց հետո անցնել վերջին օգտագործած էկրանին։ Ծանուցումները չեն ցուցադրվի կողպէկրանին։ Դրանք տեսնելու համար էկրանի վերևից մատը սահեցրեք ներքև։"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Էկրանի կողպում, կողպէկրան, բաց թողնել, շրջանցել"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Երբ պրոֆիլը կողպված է"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Ավելի քիչ ծանուցումներ կողպէկրանին"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Ցույց տալ ավելի քիչ ծանուցումներ կողպէկրանին"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Կողպէկրանին ցույց տալ միայն նոր ծանուցումները"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Ավտոմատ հեռացնել նախկինում դիտված ծանուցումները կողպէկրանից"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Ծանուցումներ կողպէկրանին"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Ցուցադրել զրույցները, կանխադրված և անձայն"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Ցուցադրել զրույցները, կանխադրված և անձայն"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Ցույց տալ աշխատանքային ծանուցումներն ամբողջությամբ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Թաքցնել աշխատանքային գաղտնի տվյալները"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Ինչպե՞ս ցուցադրել պրոֆիլի ծանուցումները, երբ սարքը կողպված է:"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Եթե կարճ ժամանակահատվածում շատ ծանուցումներ ստանաք, ձեր սարքը երկու րոպեով կիջեցնի ձայնը և կնվազեցնի ծանուցումների քանակը։ Դա չի ազդի զանգերի, զարթուցիչների և կարևոր զրույցների վրա։ \n\nԾանուցումների ձայնի իջեցման ռեժիմում ստացված ծանուցումները կարելի է գտնել՝ էկրանի վերևի եզրից սահեցնելով ներքև։"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Կիրառել աշխատանքային պրոֆիլների համար"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Կիրառել աշխատանքային պրոֆիլի հավելվածների նկատմամբ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Խմբավորված ծանուցումներ"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Միացված է"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Անջատված է"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Խմբավորել ծանուցումները"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Նույն թեմայով ծանուցումները կխմբավորվեն և կցուցադրվեն առանց ձայնի։ Ծանուցումների խմբավորումը կփոխարինի հավելվածի ծանուցումների սեփական կարգավորումները։"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR օգնության ծառայություններ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Տեղադրված հավելվածներից ոչ մեկը որպես VR օգնության ծառայություն գործարկվելու հարցում չի ուղարկել:"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Թույլատրե՞լ VR ծառայությանն օգտագործել <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"կարևոր զրույցներ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ոչ մեկը"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ոչ մի զրույց}=1{1 զրույց}one{# զրույց}other{# զրույց}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Զրույցների կարգավորումներ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ով կարող է ընդհատել"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Նույնիսկ եթե հաղորդագրման և զանգերի հավելվածները չկարողանան ձեզ ծանուցել, ձեր ընտրած մարդիկ կկարողանան կապվել ձեզ հետ այդ հավելվածների միջոցով։"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Զանգեր"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Բոլորը"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Կոնտակտներ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Աստղանշված կոնտակտներ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Կոնտակտների կարգավորումներ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Աստղանշված կոնտակտների կարգավորումներ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ոչ մեկը"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ոչ մեկը"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Զարթուցիչ"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (աշխատանքային)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Հաշվարկում…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Հավելվածների կարգավորումներ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Թույլատրել հավելվածներին փոխել «Չանհանգստացնել» ռեժիմի կարգավորումները"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Հավելվածներ, որոնք կարող են ընդհատել"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Ստեղծեք ռեժիմ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Հատուկ ռեժիմ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Ռեժիմի անվանումը"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Նշեք ռեժիմի անվանումը"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Ընտրեք պատկերակ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Օրացույցի միջոցառումներ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"«Քնի ժամ» ծրագիր"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Մեքենա վարելիս"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Ծանուցումներ լիաէկրան ռեժիմում"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Թույլատրել այս հավելվածին ցույց տալ ծանուցումներ լիաէկրան ռեժիմում"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Թույլատրել այս հավելվածին ցույց տալ ծանուցումներ լիաէկրան ռեժիմում, երբ սարքը կողպված է։ Հավելվածները կարող են օգտագործել այս գործառույթը՝ զարթուցիչներ, մուտքային զանգեր և այլ շտապ ծանուցումներ ցուցադրելու համար։"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Գրել համակարգի կարգավորումներ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Թույլ տալ հավելվածին ձեր փոխարեն փոփոխել համակարգի կարգավորումները"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Այս թույլտվությունը հնարավորություն է տալիս հավելվածին փոփոխել համակարգի հիմնական կարգավորումները"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Մեդիա ֆայլերի կառավարման հավելվածներ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Թույլատրել հավելվածին կառավարել մեդիա ֆայլերը"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Թույլտվություն ունենալու դեպքում այս հավելվածը կարող է փոփոխել կամ ջնջել այլ հավելվածների միջոցով ստեղծված մեդիա ֆայլերը՝ առանց ձեզ հարցնելու։ Հավելվածը պետք է ֆայլերը (այդ թվում մեդիա ֆայլերը) բացելու թույլտվություն ունենա։"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Ժեստեր"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Արագ բացել տեսախցիկը"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Տեսախցիկն արագ գործարկելու համար երկու անգամ սեղմեք սնուցման կոճակը: Դա կարող եք անել ցանկացած էկրանից:"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Շրջել տեսախցիկը սելֆիի համար"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Նավիգացիայի ռեժիմ"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Արբանյակային կապով հաղորդագրում"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Տեքստային հաղորդագրությունների ուղարկում և ստացում արբանյակային կապի միջոցով։ Ներառված է ձեր հաշվում։"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Տեքստային հաղորդագրությունների ուղարկում և ստացում արբանյակային կապի միջոցով։ Հասանելի չէ ձեր հաշվի համար։"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Արբանյակային կապով հաղորդագրում"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Արբանյակային կապով հաղորդագրման մասին"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ձեր <xliff:g id="CARRIER_NAME">%1$s</xliff:g> հաշիվը թույլ է տալիս տեքստային հաղորդագրություններ ուղարկել և ստանալ արբանյակային կապի միջոցով"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ձեր <xliff:g id="CARRIER_NAME">%1$s</xliff:g> պլանը"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Արբանյակային կապով հաղորդագրումը ներառված է ձեր հաշվում"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Արբանյակային կապով հաղորդագրումը ներառված չէ ձեր հաշվում"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Իմանալ ավելին"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Ինչպես է դա աշխատում"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ձեր հեռախոսն ավտոմատ կմիանա արբանյակային կապին։ Կապի օպտիմալ որակի համար պետք է դրսում լինեք, և երկինքը պետք է պարզ երևա։"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Երբ հեռախոսը միանա արբանյակային կապին"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Դուք կարող եք տեքստային հաղորդագրություններ ուղարկել ցանկացած համարի, այդ թվում՝ արտակարգ իրավիճակների ծառայություններին։ Ձեր հեռախոսը նորից կմիանա բջջային ցանցին, երբ այն հասանելի դառնա։"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Արբանյակային կապով հաղորդագրումը կարող է ավելի երկար տևել և հասանելի է միայն որոշ տարածաշրջաններում։ Եղանակը և որոշակի կառույցներ կարող են ազդել արբանյակային կապի վրա։ Արբանյակային կապի միջոցով զանգերը հասանելի չեն՝ բացառությամբ շտապ կանչերի։\n\nԿարող է որոշակի ժամանակ պահանջվել, որպեսզի ձեր հաշվի փոփոխությունները ցուցադրվեն Կարգավորումներում։ Մանրամասների համար դիմեք կապի օպերատորին։"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Լրացուցիչ տեղեկություններ արբանյակային կապով հաղորդագրման մասին"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Հնարավոր չէ միացնել այս գործառույթը (<xliff:g id="FUNCTION">%1$s</xliff:g>)"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Այս գործառույթը (<xliff:g id="FUNCTION">%1$s</xliff:g>) միացնելու համար նախ անջատեք արբանյակային կապը"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Արբանյակային կապ"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Մուտքի կետերի անունները"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Հասանելի չէ <xliff:g id="CARRIER">%1$s</xliff:g>-ին միանալու դեպքում"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Դուք էջի չափսից չկախված ռեժիմի 16 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Սարքի գործարանային կարգավորումները նորից կվերականգնվեն, և այն կանցնի արտադրական կարգավորումների ռեժիմ։ Android-ը հաջողությամբ գործարկելուց հետո Մշակողի ընտրանքներում անջատեք OEM-ի ապակողպումը։ Եթե սարքն անկայուն է աշխատում, կամ չհաջողվի այն գործարկել Android-ով, թարմացրեք սարքը՝ օգտագործելով գործարանային պատկերներ &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; էջից կամ անցեք &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; և ընտրեք «Սրբել սարքը», «Կողպել օպերացիոն համակարգի բեռնիչը» և «Ստիպողաբար թարմացնել բոլոր բաժինները»։"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Էջաչափից անկախ 16 ԿԲ ռեժիմ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Կարդալ ավելին"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Հավելվածի գործարկում էջի չափսի համատեղելիության ռեժիմում"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Վրիպակների մասին հաշվետվությունների մշակիչ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Որոշում է, թե որ հավելվածն է ձեր սարքում կառավարում վրիպակների մասին հաշվետվության դյուրանցումը:"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Անձնական"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Լսել հոսքը"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Սկանավորեք աուդիո հոսքի QR կոդը՝ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքով լսելու համար"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Փոխանցման ժամանակ հնարավոր չէ փոխել գաղտնաբառը։ Գաղտնաբառը փոխելու համար նախ անջատեք աուդիոյի փոխանցումը։"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Ձեր գաղտնաբառը պետք է պարունակի 4-ից 16 նիշ, ընդ որում՝ դրանք պետք է լինեն միայն տառեր, թվեր և նշաններ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR կոդերի սկաներ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Օգնության կարի՞ք ունեք"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Որոնեք կարգավորումներում"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"կոնտակտներ, տարածք, հաշիվ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Կոնտակտների տարածք"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Միայն սարքում"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Նոր կոնտակտները չեն համաժամացվի հաշվի հետ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Կոնտակտներն ըստ կանխադրման կպահվեն սարքում և կհամաժամացվեն ձեր հաշվի հետ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Չհաջողվեց հաշիվը սահմանել որպես կանխադրված"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Կանխադրված հաշիվ չկա"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Միայն սարքում"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Սարք և %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Սկսելու համար ավելացրեք հաշիվ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Որտեղ պահել կոնտակտները"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Շրջագծել որոնելու համար"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Հպեք և պահեք գլխավոր էկրանի կոճակը կամ նավիգացիայի նշիչը, որպեսզի որոնեք՝ օգտագործելով ձեր էկրանի բովանդակությունը։"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 5c759e9d5d2..96457dadd6c 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Kepingan salju"</item>
     <item msgid="7952183800501346803">"Payung pantai"</item>
     <item msgid="799139025758265891">"Alat workshop"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rol film"</item>
     <item msgid="5827426100157335512">"Buku"</item>
     <item msgid="8585828346253128384">"Bunga teratai"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1b1aa838b52..cfb5da4469b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sambungkan perangkat baru"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktifkan otomatis besok"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Jika Bluetooth dinonaktifkan, Bluetooth akan diaktifkan lagi pada hari berikutnya"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Sambungkan ke telinga kanan"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Sambungkan ke telinga kiri"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Sambungkan ke telinga satunya"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Nonaktifkan Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Nonaktifkan fitur Bluetooth LE Audio jika perangkat mendukung kemampuan hardware LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Mode Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Aktifkan pratinjau UI Siaran Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Mengaktifkan pratinjau UI Berbagi LE Audio termasuk berbagi audio pribadi dan siaran pribadi"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Tampilkan tombol LE Audio di Detail Perangkat"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Abaikan Daftar yang Diizinkan Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Gunakan LE Audio secara default meskipun periferal LE Audio belum diverifikasi untuk memenuhi kriteria Daftar yang diizinkan."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Bahasa aplikasi"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Bahasa yang disarankan"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Semua bahasa"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Disarankan"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Semua bahasa"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Semua wilayah"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Semua sistem penomoran"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Bahasa sistem"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Default sistem"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Pemilihan bahasa untuk aplikasi ini tidak tersedia dari Setelan."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Ubah"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s tidak tersedia"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bahasa ini tidak dapat digunakan sebagai bahasa sistem, tetapi Anda telah memberi tahu aplikasi dan situs bahwa ini adalah bahasa pilihan Anda."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Telusuri"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Tambahkan bahasa"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferensi wilayah"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Ketik nama bahasa"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Setelan bahasa lainnya"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferensi regional"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Setel preferensi satuan dan angka"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Izinkan aplikasi mengetahui preferensi regional Anda sehingga dapat mempersonalisasi pengalaman Anda."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikasi akan menggunakan preferensi regional Anda jika memungkinkan."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferensi regional"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Suhu"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Hari pertama dalam seminggu"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferensi angka"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Terhubung ke layanan data ketika roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Terhubung ke layanan data ketika roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Biaya roaming dapat berlaku."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Setel waktu otomatis"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Setel otomatis"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokasi akan digunakan untuk menyetel zona waktu saat tombol ini aktif"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Tanggal dan waktu otomatis"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Setel secara otomatis menggunakan jaringan dan sinyal nirkabel Anda"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zona waktu otomatis"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setel otomatis berdasarkan jaringan seluler di sekitar Anda"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Setel secara otomatis menggunakan lokasi perangkat, jika tersedia"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan default lokalitas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Waktu"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Angkat jari, lalu sentuh sensor lagi"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Tidak dapat menggunakan sensor sidik jari"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Kunjungi penyedia reparasi."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Buka dengan Sidik Jari saat Layar Nonaktif"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Gunakan Buka dengan Sidik Jari bahkan saat layar nonaktif"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Layar nonaktif, Buka kunci"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Setelan keamanan lainnya"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Kunci profil kerja, enkripsi, dan lainnya"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Enkripsi, kredensial, dan lainnya"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Setel pola untuk ruang privasi Anda"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kunci"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Sembunyikan"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Konfirmasi pola ruang privasi Anda"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Masukkan kembali PIN ruang privasi Anda"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Masukkan kembali sandi ruang privasi Anda"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Anda dapat menambahkan maksimal <xliff:g id="COUNT">%d</xliff:g> sidik jari"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Anda telah menambahkan jumlah maksimum sidik jari"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Tidak dapat menambahkan sidik jari lagi"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aktif"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Nonaktif"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Layar Eksternal"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Layar bawaan"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Gunakan layar eksternal"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolusi layar"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Layar eksternal tidak terhubung"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Mengubah rotasi atau resolusi dapat menghentikan aplikasi yang sedang berjalan"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Perangkat harus terhubung ke layar eksternal untuk mencerminkan layar Anda"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Opsi lainnya"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Tahan dan tarik untuk mengatur ulang tampilan."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktifkan layar nirkabel"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Periksa sandi dan coba lagi"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Hubungi produsen perangkat"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Periksa koneksi dan coba lagi"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Jaringan Wi‑Fi ini tidak tersedia untuk saat ini"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ada masalah dengan kode QR ini. Coba hubungkan dengan cara lain."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Pilih jaringan"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Untuk menyambungkan perangkat Anda, pilih jaringan"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Tambahkan perangkat ini ke “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Pelajari putar otomatis lebih lanjut"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolusi layar"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Resolusi tinggi"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolusi penuh"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Resolusi penuh menggunakan lebih banyak daya baterai. Mengganti resolusi dapat menyebabkan beberapa aplikasi dimulai ulang."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Resolusi maksimum"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Resolusi maksimum menggunakan lebih banyak daya baterai. Mengganti resolusi mungkin menyebabkan beberapa aplikasi dimulai ulang."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Dipilih"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Alami"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptif"</string>
     <string name="brightness" msgid="6216871641021779698">"Tingkat kecerahan"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Kecerahan adaptif"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Tentang kecerahan adaptif"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Kecerahan layar akan otomatis disesuaikan dengan lingkungan dan aktivitas Anda. Anda dapat menggeser tombol kecerahan secara manual untuk membantu fitur ini mempelajari preferensi Anda."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aktif"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Nonaktif"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Setelan Mode Waktu Tidur"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Mode juga dapat mengaktifkan tema gelap}=1{{mode_1} juga mengaktifkan tema gelap}=2{{mode_1} dan {mode_2} juga mengaktifkan tema gelap}=3{{mode_1}, {mode_2}, dan {mode_3} juga mengaktifkan tema gelap}other{{mode_1}, {mode_2}, dan # lainnya juga mengaktifkan tema gelap}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Setelan Mode"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Lebih redup"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ekstra redup"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Mungkinkan perangkat menjadi lebih redup dari biasanya"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Waktu tunggu layar"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Izinkan aplikasi dan layanan untuk memindai perangkat di sekitar kapan saja, bahkan saat Bluetooth nonaktif. Ini dapat dilakukan, misalnya, untuk meningkatkan kualitas fitur dan layanan berbasis lokasi."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Layanan lokasi"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Layanan lokasi"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Gunakan lokasi"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Gunakan lokasi untuk zona waktu"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Tidak dapat otomatis menyetel zona waktu"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokasi atau Layanan Lokasi nonaktif"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Setelan lokasi"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Perbaiki ini"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Batal"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Zona waktu otomatis nonaktif"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Tidak tersedia saat zona waktu otomatis nonaktif"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokasi dapat digunakan untuk menyetel zona waktu"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Jika lokasi perangkat tersedia, lokasi dapat digunakan untuk menyetel zona waktu"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Lihat info legal, status, versi software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informasi hukum"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opsi"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Aksesibilitas"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Keyboard fisik"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Tombol pantul"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Keyboard mengabaikan penekanan tombol yang sama secara berulang dan cepat dalam <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> md"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Keyboard mengabaikan penekanan tombol yang sama secara berulang dan cepat"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Batas tombol pantul"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pilih durasi waktu keyboard Anda mengabaikan penekanan tombol berulang"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 dtk"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 dtk"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 dtk"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Kustom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"Nilai kustom"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tombol lambat"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Menyesuaikan waktu yang diperlukan agar penekanan tombol aktif ke <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> md"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Menyesuaikan lama waktu tombol untuk merespons setelah ditekan"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tombol lekat"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tekan tombol satu per satu untuk menggunakan pintasan, bukan menekan beberapa tombol secara bersamaan"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tombol mouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Gunakan keyboard fisik untuk mengontrol mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Gunakan tombol mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gunakan keyboard untuk mengontrol kursor"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Scroll terbalik mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll ke atas untuk memindahkan halaman ke bawah"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Tukar tombol kiri dan kanan"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gunakan tombol mouse kiri sebagai tombol kanan"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tombol mouse untuk <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Gunakan tombol <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> untuk memindahkan kursor mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Gunakan tombol <xliff:g id="CLICK_LABEL">%s</xliff:g> untuk mengklik tombol mouse utama"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Gunakan tombol <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> untuk menekan &amp; menahan tombol mouse utama"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Gunakan tombol <xliff:g id="RELEASE_LABEL">%s</xliff:g> untuk melepaskan tombol mouse utama"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Gunakan tombol <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> untuk mengaktifkan/menonaktifkan mode scroll. Tindakan ini akan membuat tombol <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> men-scroll tampilan ke atas, bawah, kiri, atau kanan"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Gunakan tombol <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> untuk mengklik tombol mouse sekunder"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pintasan keyboard"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tampilkan daftar pintasan"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Keyboard &amp; fitur profil kerja"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad &amp; mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Kecepatan kursor, gestur"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Ketuk untuk mengklik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Ketuk tarik"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik kanan bawah"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klik pojok kanan bawah touchpad untuk melihat opsi lainnya"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kecepatan kursor"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Gunakan ketuk dengan tiga jari"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Warna kursor"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Ubah gaya isian pointer ke warna hitam"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Ubah gaya isian pointer ke warna hijau"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Pelajari gestur touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, kursor, scroll, geser, klik kanan, klik, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"klik kanan, ketuk"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Klik tengah"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Luncurkan Asisten"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Buka layar utama"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Kembali"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Lihat aplikasi terbaru"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Membuka layar utama"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Geser ke atas dengan tiga jari di touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Kembali"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih tombol baru untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Aksesibilitas keyboard fisik"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tombol lekat, Tombol pantul, Tombol mouse"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Tombol Ulangi"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Tunda sebelum mengulangi"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Rasio Pengulangan"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Menahan tombol untuk mengulangi karakternya hingga tombol dilepaskan"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Tata letak <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Otomatis: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pratinjau"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opsi standar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Bahasa"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Ukuran teks"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ukuran teks"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Gaya teks"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opsi khusus"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Warna latar belakang"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Sesuaikan penggunaan daya"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Termasuk paket"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikasi berjalan normal"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Disarankan mengganti baterai"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Performa pengisian daya dan kapasitas baterai berkurang, dan disarankan untuk mengganti baterai."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Tingkat daya baterai rendah"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Aktifkan Penghemat Baterai untuk memperpanjang masa pakai baterai"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Tingkatkan masa pakai baterai"</string>
@@ -2633,7 +2691,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Akan aktif saat baterai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <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_title_new" msgid="5942813274115684599">"Nonaktifkan saat daya cukup terisi"</string>
     <string name="battery_saver_sticky_title_percentage" msgid="1178162022087559148">"Nonaktifkan pada <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" msgid="8543277078136947874">"Penghemat Baterai dinonaktifkan saat daya baterai terisi lebih dari <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Berhenti hubungkan"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versi <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Ganti VPN yang sudah ada?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setel VPN selalu aktif?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09.00 - 17.00 hari kerja\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Acara kalender"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} aktif}=2{{mode_1} dan {mode_2} aktif}=3{{mode_1}, {mode_2}, dan {mode_3} aktif}other{{mode_1}, {mode_2}, dan # lainnya aktif}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode dapat otomatis diaktifkan}other{# mode dapat otomatis diaktifkan}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Jangan Ganggu}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AKTIF"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Tidak disetel"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Dinonaktifkan"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Oke"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifikasi"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durasi"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Pesan, acara &amp; pengingat"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Selesai"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Setelan"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Tidak ada visual atau suara dari notifikasi"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Tidak ada suara dari notifikasi"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Anda tidak akan melihat atau mendengar notifikasi. Panggilan dari kontak berbintang dan penelepon berulang diizinkan."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Setelan saat ini)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Ubah setelan notifikasi mode Jangan Ganggu?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Suara profil kerja"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Gunakan suara profil pribadi"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Gunakan suara yang sama dengan profil pribadi"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Setelah membuka kunci, langsung buka layar yang terakhir digunakan. Notifikasi tidak akan muncul di layar kunci. Geser layar dari atas ke bawah untuk melihat notifikasi."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Layar kunci, Layar kunci, Lewati, Abaikan"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Saat profil kerja dikunci"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Notifikasi layar kunci minimalis"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Tampilkan lebih sedikit notifikasi di layar kunci"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Tampilkan hanya notifikasi baru di layar kunci"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Otomatis hapus notifikasi yang telah dilihat sebelumnya dari layar kunci"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifikasi di layar kunci"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Tampilkan percakapan, default, dan senyap"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Tampilkan percakapan, default, dan senyap"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Tampilkan semua konten notifikasi profil kerja"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Sembunyikan konten kerja sensitif"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notifikasi profil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifikasi"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notifikasi aplikasi"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Saat Anda menerima banyak notifikasi dalam waktu singkat, perangkat akan menurunkan volumenya dan meminimalkan getaran hingga selama 2 menit. Panggilan, alarm, dan percakapan prioritas tidak akan terpengaruh. \n\nNotifikasi yang diterima saat pengurangan suara dan getaran diaktifkan dapat ditemukan dengan menarik layar ke bawah."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Terapkan pada profil kerja"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Diterapkan untuk aplikasi profil kerja"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Gabungan notifikasi"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aktif"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Nonaktif"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Gunakan penggabungan notifikasi"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notifikasi dengan tema serupa akan disenyapkan dan dikelompokkan bersama untuk pengalaman yang lebih tenang. Penggabungan akan menggantikan setelan notifikasi aplikasi itu sendiri."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Layanan bantuan VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tidak ada aplikasi terinstal yang meminta dijalankan sebagai layanan bantuan VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Izinkan akses layanan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"percakapan prioritas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Setelan percakapan"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Siapa yang boleh mengganggu"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Meskipun aplikasi pesan atau telepon tidak dapat memberikan notifikasi, orang yang dipilih di sini tetap dapat menghubungi Anda melalui aplikasi tersebut"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan telepon"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Setelan kontak"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Setelan kontak berbintang"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Tidak ada"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Tidak ada"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarm"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Tidak ada aplikasi yang boleh mengganggu}=1{{app_1} boleh mengganggu}=2{{app_1} dan {app_2} boleh mengganggu}=3{{app_1}, {app_2}, dan {app_3} boleh mengganggu}other{{app_1}, {app_2}, dan # lainnya boleh mengganggu}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Kerja)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Menghitung…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Setelan aplikasi"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Izinkan aplikasi mengganti"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikasi yang boleh mengganggu"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Buat mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode kustom"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nama mode"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Nama mode wajib diisi"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Pilih ikon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Acara kalender"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutinitas waktu tidur"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Saat mengemudi"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notifikasi layar penuh"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Izinkan notifikasi layar penuh dari aplikasi ini"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Mengizinkan aplikasi ini menampilkan notifikasi dalam layar penuh ketika perangkat terkunci. Aplikasi mungkin menggunakan tindakan ini untuk memperjelas alarm, panggilan masuk, atau notifikasi penting lainnya."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Tulis preferensi sistem"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Izinkan aplikasi ini mengubah preferensi sistem atas nama Anda"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Izin ini memungkinkan aplikasi mengubah preferensi sistem inti."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikasi pengelolaan media"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Izinkan aplikasi mengelola media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Jika diizinkan, aplikasi ini dapat mengubah atau menghapus file media yang dibuat dengan aplikasi lain tanpa bertanya kepada Anda. Aplikasi harus memiliki izin untuk mengakses file dan media."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestur"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Buka cepat kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Untuk membuka kamera dengan cepat, tekan tombol daya dua kali. Berfungsi di layar mana pun."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Gelengkan kamera untuk selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mode navigasi"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Fitur pesan satelit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Kirim dan terima pesan teks melalui satelit. Disertakan dengan akun Anda."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Mengirim dan menerima pesan teks melalui satelit. Tidak disertakan di akun Anda."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Fitur pesan satelit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Tentang fitur pesan satelit"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Fitur pesan satelit, konektivitas satelit"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Tentang <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Anda dapat mengirim dan menerima pesan teks melalui satelit sebagai bagian dari akun <xliff:g id="CARRIER_NAME">%1$s</xliff:g> yang valid"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Paket <xliff:g id="CARRIER_NAME">%1$s</xliff:g> Anda"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Fitur pesan satelit disertakan pada akun Anda"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Fitur pesan disertakan dalam akun Anda"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Fitur pesan satelit tidak disertakan pada akun Anda"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Pelajari Lebih Lanjut"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cara kerjanya"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ponsel Anda akan terhubung otomatis ke satelit. Untuk koneksi terbaik, pastikan langit terlihat tanpa terhalang."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Setelah ponsel Anda terhubung ke satelit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Anda dapat mengirim pesan kepada siapa pun, termasuk layanan darurat. Ponsel Anda akan terhubung kembali ke jaringan seluler jika tersedia."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Fitur pesan satelit mungkin memakan waktu lebih lama dan hanya tersedia di wilayah tertentu. Cuaca dan struktur tertentu dapat memengaruhi koneksi satelit Anda. Menelepon dengan bantuan satelit tidak tersedia. Panggilan darurat masih dapat terhubung.\n\nMungkin perlu waktu beberapa saat agar perubahan akun ditampilkan di Setelan. Hubungi operator untuk mengetahui detailnya."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Lebih lanjut tentang fitur pesan satelit"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> mungkin memakan waktu lebih lama dan hanya tersedia di beberapa area. Cuaca dan struktur tertentu dapat memengaruhi koneksi satelit Anda. Menelepon dengan bantuan satelit tidak tersedia. Panggilan darurat masih dapat terhubung.\n\nMungkin perlu waktu beberapa saat agar perubahan akun ditampilkan di Setelan. Hubungi <xliff:g id="CARRIER_NAME">%1$s</xliff:g> untuk mengetahui detailnya."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Selengkapnya tentang <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Tidak dapat mengaktifkan <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Untuk mengaktifkan <xliff:g id="FUNCTION">%1$s</xliff:g>, akhiri koneksi satelit terlebih dahulu"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Konektivitas satelit"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Konektivitas satelit"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"konektivitas satelit"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"fitur pesan satelit"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Penggunaan data disertakan dalam akun Anda"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS via Satelit"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Kirim pesan ke layanan darurat saat Anda tidak dapat terhubung ke jaringan seluler atau Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos via satelit, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Tentang SOS via Satelit"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Anda dapat mengirim pesan ke layanan darurat dan membagikan lokasi Anda saat tidak dapat terhubung ke jaringan seluler atau Wi-Fi. Layanan ini mungkin hanya tersedia pada saat-saat tertentu di lokasi atau keadaan tertentu."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Telepon atau kirim pesan ke layanan darurat"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Jawab pertanyaan tentang keadaan darurat"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Ikuti langkah-langkah untuk terhubung ke satelit"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Jika jaringan seluler tidak tersedia, Anda akan melihat opsi untuk menggunakan SOS via Satelit"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Kirimkan jawaban ke layanan darurat untuk mendapatkan bantuan yang tepat"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Setelah terhubung, Anda dapat mengirim pesan ke layanan darurat"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Coba demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Saat Anda terhubung dengan layanan darurat melalui satelit, nama, email, nomor telepon, lokasi, informasi perangkat (IMEI, bahasa, model, level baterai), dan informasi kontak darurat Anda akan dibagikan ke layanan darurat dan penyedia layanan satelit. \n\nUntuk menggunakan SOS via Satelit, Google Message harus menjadi aplikasi SMS default Anda. \n\nJika pemilihan jaringan otomatis dinonaktifkan, pilihan ini akan diaktifkan dan perangkat Anda akan otomatis terhubung ke jaringan apa pun."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Preferensi berbagi"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kontak darurat"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Akun Google Anda"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Tinjau atau perbarui info yang akan dibagikan ke layanan darurat"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nama Titik Akses"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia saat terhubung ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Anda berada dalam mode 16 KB dari mode yang tidak terikat ukuran halaman. Integritas software tidak dapat dijamin dalam mode ini, dan data apa pun yang disimpan di ponsel saat bootloader dibuka kuncinya dapat berpotensi terkena bahaya. Beberapa fitur akan dinonaktifkan dalam mode ini, sehingga beberapa aplikasi mungkin tidak berfungsi. Agar dapat kembali masuk ke mode produksi, Anda harus beralih kembali ke mode 4 KB dan kemudian mengunci bootloader perangkat. Tindakan ini akan mereset perangkat ke setelan pabrik dan memulihkannya ke setelan produksi. Setelah perangkat berhasil melakukan booting ke Android, nonaktifkan pembukaan kunci OEM di Opsi developer. Jika perangkat gagal melakukan booting ke Android atau tidak stabil, flash ulang perangkat dengan setelan pabrik terbaru dari &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; atau gunakan &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; dan pilih \'Hapus Total Perangkat\', \'Kunci Bootloader\', dan \'Paksa Flash semua partisi\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Mode Agnostik halaman 16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Baca selengkapnya"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Jalankan aplikasi dengan mode kompatibilitas ukuran halaman"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Pengendali laporan bug"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Menentukan aplikasi mana yang menangani pintasan Laporan Bug di perangkat."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Pribadi"</string>
@@ -5161,7 +5284,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB tidak tersedia di lokasi saat ini"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Gunakan Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread membantu menghubungkan perangkat smart home Anda, meningkatkan efisiensi, dan performa.\n\nJika diaktifkan, perangkat ini memenuhi syarat untuk bergabung dengan jaringan Thread sehingga memungkinkan kontrol atas perangkat yang didukung Matter melalui ponsel ini."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread membantu menghubungkan perangkat smart home Anda, meningkatkan efisiensi, dan performa.\n\nJika diaktifkan, perangkat ini memenuhi syarat untuk bergabung dalam jaringan Thread sehingga perangkat yang didukung Matter dapat dikontrol melalui ponsel ini."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Pelajari lebih lanjut Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Akses kamera"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Akses mikrofon"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Dengarkan streaming"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Pindai kode QR streaming audio agar dapat mendengarkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Tidak dapat mengedit sandi saat sedang membagikan audio. Untuk mengubah sandi, nonaktifkan berbagi audio terlebih dahulu."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Sandi Anda harus berisi 4-16 karakter dan hanya menggunakan huruf, angka, serta simbol"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Pemindai kode QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Perlu bantuan?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Telusuri Setelan"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontak, penyimpanan, akun"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Penyimpanan kontak"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Perangkat saja"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kontak baru tidak akan disinkronkan dengan akun"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontak akan disimpan ke perangkat dan disinkronkan ke akun Anda secara default"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Terjadi error saat menetapkan akun default"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Tidak ada default yang disetel"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Perangkat saja"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Perangkat dan %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akun untuk memulai"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Tempat untuk menyimpan kontak"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Lingkari untuk Menelusuri"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Sentuh lama tombol Layar utama atau tuas navigasi untuk menelusuri menggunakan konten di layar."</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index eacf4062cbe..bbc7b6f0d4b 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snjókorn"</item>
     <item msgid="7952183800501346803">"Sólhlíf"</item>
     <item msgid="799139025758265891">"Verkfæri"</item>
-    <item msgid="1330084588359129896">"Tjald"</item>
+    <item msgid="8112685757657659269">"Píanó"</item>
     <item msgid="3861584909935022342">"Gamaldags filma"</item>
     <item msgid="5827426100157335512">"Bók"</item>
     <item msgid="8585828346253128384">"Lótusblóm"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index bd93ad358df..51346f3c6d4 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Para nýtt tæki"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Kveikja sjálfkrafa á morgun"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ef þú slekkur á Bluetooth þá kviknar aftur á því næsta dag"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Para hægra eyra"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Para vinstra eyra"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Para hitt eyrað"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Slökkva á Bluetooth LE-hljóði"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Slekkur á Bluetooth LE-hljóðeiginleika ef tækið styður vélbúnaðareiginleika LE-hljóðs."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE-hljóðstilling"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Virkja forskoðun á notendaviðmóti fyrir útsendingu Bluetooth LE-hljóðs"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Virkjar forskoðun á notendaviðmóti LE-hljóðdeilingar, þ.m.t. persónulegrar hljóðdeilingar og lokaðrar útsendingar"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Sýna rofa LE-hljóðs í tækjaupplýsingum"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Sneiða hjá hvítum lista Bluetooth LE-hljóðs"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Nota LE-hljóð sjálfkrafa jafnvel þótt jaðartæki LE-hljóðs hafi ekki verið staðfest með tilliti til skilyrða hvíta listans."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Tungumál forrits"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Tillögur að tungumálum"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Öll tungumál"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Tillögur"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Öll tungumál"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Öll svæði"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Öll númerakerfi"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Tungumál kerfis"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sjálfgildi kerfis"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Ekki er hægt að velja tungumál fyrir þetta forrit í stillingum."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Breyta"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ekki í boði"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Ekki er hægt að nota þetta tungumál sem kerfistungumál en þú hefur látið forrit og vefsvæði vita að þetta sé kjörtungumálið þitt."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Leita"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Bæta tungumáli við"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Svæðisval"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Sláðu inn heiti tungumáls"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Fleiri tungumálastillingar"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Kjörstillingar svæðis"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Stilla mælieininga- og númeraval"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Veittu forritum aðgang að kjörstillingum svæðisins svo þau geti sérsniðið upplifun þína."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Forrit munu nota kjörstillingar svæðisins þar sem það er í boði."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Staðsetningarstillingar"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Hitastig"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Fyrsti dagur vikunnar"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Kjörstillingar númera"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Tengjast gagnaþjónustu í reiki"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Tengjast gagnaþjónustu í reiki"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Reikigjöld kunna að eiga við."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Stilla tíma sjálfkrafa"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Stilla sjálfkrafa"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Þegar kveikt er á rofanum verður staðsetning notuð til að stilla tímabelti"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Sjálfvirk dagsetning og tími"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Stilla sjálfvirkt með því að nota merki netkerfis og þráðlaus merki"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Sjálfvirkt tímabelti"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Stilla sjálfvirkt samkvæmt farsímakerfum nálægt þér"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Sjálfvirk stilling út frá staðsetningu tækis, ef tiltæk"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Nota sjálfgefið snið staðar"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Nota 24 tíma snið"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tími"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lyftu fingrinum og snertu svo skynjarann aftur"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Ekki er hægt að nota fingrafaralesara"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Þú verður að fara á verkstæði."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Slökkt á skjá, fingrafarskenni"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Notaðu Fingrafarskenni, jafnvel þótt slökkt sé á skjánum"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Slökkt á skjá, opna"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Fleiri öryggisstillingar"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Lás vinnusniðs, dulkóðun og fleira"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Dulkóðun, skilríki og fleira"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Stilltu mynstur fyrir einkarýmið þitt"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Læsa"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Fela"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Staðfestu mynstur leynirýmisins"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Sláðu inn PIN-númer leynirýmisins aftur"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Sláðu inn aðgangsorð leynirýmisins aftur"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> fingraförum"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Þú hefur bætt við hámarksfjölda fingrafara"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ekki er hægt að bæta fleiri fingraförum við"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Kveikt"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Slökkt"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ytri skjár"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Innbyggður skjár"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Nota ytri skjá"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Skjáupplausn"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ytri skjár er ekki tengdur"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Breytingar á snúningi eða upplausn geta stöðvað forrit sem verið er að keyra"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Til að spegla skjá þarf tækið þitt að vera tengt við ytri skjá"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Fleiri valkostir"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Halda inni og draga til að endurraða skjábirtingu."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Útsending"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegla"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Leyfa þráðlausan skjá"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Athugaðu aðgangsorðið og reyndu aftur"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Hafðu samband við framleiðanda tækisins"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Athugaðu tenginguna og reyndu aftur"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Þetta WiFi-net er ekki tiltækt í augnablikinu"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Vandamál kom upp í tengslum við þennan QR-kóða. Reyndu að tengjast með öðrum hætti."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Velja net"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Veldu net til að tengja tækið þitt"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Bæta þessu tæki við „<xliff:g id="SSID">%1$s</xliff:g>“?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Nánar um sjálfvirkan snúning"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Skjáupplausn"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Há upplausn"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full upplausn"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full upplausn gengur hraðar á rafhlöðuna. Hugsanlega eru einhver forrit endurræst þegar skipt er um upplausn."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Hámarksupplausn"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Hámarksupplausn gengur meira á rafhlöðuna. Hugsanlega munu einhver forrit endurræsast ef upplausn er breytt."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Valið"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Litir"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Náttúrulegir"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Breytilegir"</string>
     <string name="brightness" msgid="6216871641021779698">"Birtustig"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Aðlögun birtustigs"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Um aðlögun birtustigs"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Birtustigi skjásins verður breytt sjálfkrafa í samræmi við umhverfið og hvað þú ert að gera. Þú getur fært sleðann til að hjálpa aðlögun birtustigs að læra inn á hvernig þú vilt hafa birtuna."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Kveikt"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Slökkt"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Valkostir háttatímastillingar"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Stillingar geta einnig virkjað dökkt þema}=1{{mode_1} virkjar einnig dökkt þema}=2{{mode_1} og {mode_2} virkja einnig dökkt þema}=3{{mode_1}, {mode_2} og {mode_3} virkja einnig dökkt þema}one{{mode_1}, {mode_2} og # til viðbótar virkja einnig dökkt þema}other{{mode_1}, {mode_2} og # til viðbótar virkja einnig dökkt þema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Stillingar"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Enn dimmara"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Mjög dökkt"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Heimila tæki að verða dimmara en venjulega"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tími þar til skjár slekkur á sér"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Staðsetningar­þjónustur"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Staðsetningar­þjónus­tur"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Nota staðsetningu"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Nota staðsetningu fyrir tímabelti"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Ekki er hægt að stilla tímabelti sjálfvirkt"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Slökkt er á staðsetningu eða staðsetningarþjónustum"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Staðsetningarstillingar"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Laga þetta"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Hætta við"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Slökkt er á sjálfvirku tímabelti"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ekki í boði þegar slökkt er á sjálfvirku tímabelti"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Hægt er að nota staðsetningu til að stilla tímabelti"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ef staðsetning tækis er tiltæk þá kann hún að vera notuð til að stilla tímabeltið þitt"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Skoða lagalegar upplýsingar, stöðu, útgáfu hugbúnaðar"</string>
     <string name="legal_information" msgid="7509900979811934843">"Lagalegar upplýsingar"</string>
     <string name="manual" msgid="3651593989906084868">"Handbók"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Valkostir"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Aðgengi"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Vélbúnaðarlyklaborð"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Endurkastslyklar"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Lyklaborðið hunsar snöggan endurtekinn innslátt á sama lykilinn innan <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Lyklaborðið hunsar þegar þú ýtir snöggt og endurtekið á sama lykilinn"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Mörk endurkastslykils"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Veldu tímann sem lyklaborðið þitt hunsar lykil í þegar þú ýtir endurtekið á hann"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sek."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sek."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sek."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Sérsniðið"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"sérsniðið gildi"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hægir lyklar"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Stillir tímann sem það tekur lyklainnslátt að virka í <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Breyttu tímanum sem það tekur fyrir lykil að virkjast eftir að þú ýtir á hann"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Festilyklar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Ýttu á einn lykil í einu fyrir flýtilykla í staðinn fyrir að halda lyklum saman niðri"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Músarhnappar"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Notaðu sjálft lyklaborðið til að stjórna músinni."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Notar músarlykla"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Notaðu lyklaborðið til að stjórna bendlinum"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Öfug fletting músar"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Flettu upp til að færa síðuna niður"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Víxla hægri og vinstri hnappi"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Notaðu vinstri músarhnappinn sem hægri hnapp"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Músarlykar fyrir <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Notaðu lyklana <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> til að færa músarbendilinn"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Notaðu lykilinn <xliff:g id="CLICK_LABEL">%s</xliff:g> til að smella á aðalmúsarhnappinn"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Notaðu lykilinn <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> til að halda aðalmúsarhnappinum niðri"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Notaðu lykilinn <xliff:g id="RELEASE_LABEL">%s</xliff:g> til að sleppa aðalmúsarhnappinum"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Notaðu lykilinn <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> til að breyta flettistillingu. Þetta lætur lyklana <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> fletta síðunni upp, niður, til vinstri eða hægri."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Notaðu lykilinn <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> til að smella á aukamúsarhnappinn"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Flýtilyklar"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Sýna lista yfir flýtileiðir"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Lyklaborð og verkfæri vinnusniðs"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Sjálfgefið"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Snertiflötur"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Snertiflötur og mús"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mús"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Hraði bendils, bendingar"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Ýttu til að smella"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Draga með snertingu"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Smellur neðst til hægri"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Smelltu neðst í hægra hornið á snertifletinum til að sjá fleiri valkosti"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Hraði bendils"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Ýta með þremur fingrum"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Litur bendils"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Breyta stíl bendilfyllingar í svartan"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Breyta stíl bendilfyllingar í grænan"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Nánar um bendingar á snertifleti"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"snertiflötur, hljóðrásarhnappur, mús, bendill, fletta, strjúka, hægrismella, smella, bendill"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"hægrismella, ýta"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Miðjusmellur"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Ræsa Hjálpara"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Fara á upphafssíðu"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Til baka"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Sjá nýleg forrit"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Fara á upphafssíðu"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Strjúktu upp með þremur fingrum hvar sem er á snertifletinum"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Til baka"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Veldu nýjan lykil fyrir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Aðgengi vélbúnaðarlyklaborðs"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Festilyklar, endurkastslyklar, músarhnappar"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Takkar fyrir endurtekningu"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Töf á undan endurtekningu"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Hraði endurtekninga"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Haltu takka niðri til að endurtaka stafi og slepptu til að hætta"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Útlit: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Sjálfgefið"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Sjálfvirkt: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forskoða"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Hefðbundnir valkostir"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Tungumál"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Leturstærð"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Stærð skjátextaleturs"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stíll texta"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Sérsniðnir valkostir"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrunnslitur"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Stilla orkunotkun"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Innifaldir pakkar"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Forrit virka eðlilega"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Mælt er með því að skipta um rafhlöðu."</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Rafhlöðurýmd og hleðsluafköst eru takmörkuð og mælt er með því að skipta um rafhlöðu."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Lítil hleðsla á rafhlöðu"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Kveiktu á rafhlöðusparnaði til að auka endingu rafhlöðunnar"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Bæta rafhlöðuendingu"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Aftengja þessa VPN-tengingu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Aftengja"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Útgáfa"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Útgáfa <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Gleyma VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Skipta út núverandi VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Velja VPN sem alltaf er kveikt á?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„9:00 – 17:00 á virkum dögum“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Dagatalsviðburðir"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} er virk}=2{{mode_1} og {mode_2} eru virkar}=3{{mode_1}, {mode_2} og {mode_3} eru virkar}one{{mode_1}, {mode_2} og # í viðbót eru virkar}other{{mode_1}, {mode_2} og # í viðbót eru virkar}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Ein stilling getur kveikt sjálfkrafa á sér}one{# stilling getur kveikt sjálfkrafa á sér}other{# stillingar geta kveikt sjálfkrafa á sér}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ónáðið ekki}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"KVEIKT"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ekki stillt"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Slökkt"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ég skil"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Tilkynningar"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Lengd"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Skilaboð, viðburðir og áminningar"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir það sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Lokið"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Stillingar"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Engin skilaboð á skjá eða hljóð frá tilkynningum"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ekkert hljóð frá tilkynningum"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Þú hvorki sérð né heyrir tilkynningar. Símtöl frá stjörnumerktum tengiliðum og þeim sem hringja endurtekið eru leyfð."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Núverandi stilling)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Viltu breyta stillingum tilkynninga fyrir „Ónáðið ekki“?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Hljóð vinnuprófils"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Nota hljóð úr eigin sniði"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Nota sömu hljóð og eigið snið þitt"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Fara beint á síðasta virka skjá þegar tekið er úr lás. Tilkynningar birtast ekki á lásskjá. Strjúktu niður frá efsta hluta skjásins til að sjá þær."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Læsa skjá, lásskjár, sleppa, sneiða hjá"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Þegar vinnusnið er læst"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Fækka tilkynningum á lásskjá"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Sýna færri tilkynningar á lásskjá"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Sýna aðeins nýjar tilkynningar á lásskjánum"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Fjarlægja tilkynningar sem hafa verið skoðaðar áður sjálfkrafa af lásskjánum"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Tilkynningar á lásskjá"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Birta sjálfgefin og þögul samtöl"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Birta sjálfgefin og þögul samtöl"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Sýna innihald allra vinnutilkynninga"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Fela viðkvæmt vinnutengt efni"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hvernig viltu að tilkynningar frá sniði birtist þegar tækið er læst?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Sniðtilkynningar"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Tilkynningar"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Forritatilkynningar"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Þegar þú færð margar tilkynningar á skömmum tíma mun tækið þitt lækka hljóðstyrk og fækka viðvörunum í allt að tvær mínútur. Þetta hefur ekki áhrif á símtöl, vekjara og forgangssamtöl. \n\nÞú getur fundið mótteknar tilkynningar meðan á dempun stendur með því að draga niður efst á skjánum."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Nota fyrir vinnusnið"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Nota fyrir forrit á vinnusniði"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Flokkaðar tilkynningar"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Kveikt"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Slökkt"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Nota tilkynningaflokkun"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Tilkynningar með svipuðum þemum verða þaggaðar og flokkaðar saman til að veita þér hljóðlátari upplifun. Flokkun hnekkir tilkynningastillingum forrits."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjálparþjónusta sýndarveruleika"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Engin uppsett forrit hafa óskað eftir að vera keyrð sem sýndarveruleikaþjónusta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leyfa sýndarveruleikaaðgang fyrir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"forgangssamtöl"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Stillingar samtala"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hver má trufla"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Þrátt fyrir að síma- og skilaboðaforrit geti ekki sent þér tilkynningar geta þeir aðilar sem þú velur hér haft samband við þig í gegnum þessi forrit"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Símtöl"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Stillingar Tengiliða"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Stillingar stjörnumerktra tengiliða"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Engin"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Engin"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Vekjarar"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (vinnusnið)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Reiknar út…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Stillingar forrita"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Leyfa forritum að hnekkja"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Forrit sem mega trufla"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Búðu til stillingu"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Sérsniðin stilling"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Heiti stillingar"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Heiti stillingar má ekki vera autt"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Veldu tákn"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Dagatalsviðburðir"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Háttatímarútína"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Meðan á akstri stendur"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Tilkynningar á öllum skjánum"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Leyfa tilkynningar frá þessu forriti á öllum skjánum"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Leyfa forritinu að birta tilkynningar á öllum skjánum þegar tækið er læst. Forrit kunna að nota þennan eiginleika til að leggja áherslu á vekjara, móttekin símtöl og aðrar áríðandi tilkynningar."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Skrifa kerfisstillingar"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Leyfa þessu forriti að breyta kerfisstillingum fyrir þína hönd"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Þessi heimild leyfir forriti að breyta grundvallarstillingum kerfis."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Efnisumsjónarforrit"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Leyfa forriti að stjórna efni"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ef þú leyfir þetta getur þetta forrit breytt eða eytt efnisskrám sem voru búnar til í öðrum forritum án þess að spyrja þig. Forrit verður að hafa aðgangsheimild að skrám og efni."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Bendingar"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Opna myndavélina hratt"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Til að opna myndavélina hratt skaltu ýta tvisvar á aflrofann. Þetta virkar á hvaða skjá sem er."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Snúa myndavél til að taka sjálfsmynd"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Yfirlitsstilling"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Gervihnattarskilaboð"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Sendu og taktu á móti SMS-skilaboðum um gervihnött. Hluti af reikningnum þínum."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Sendu og taktu á móti SMS-skilaboðum um gervihnött. Fylgir ekki með reikningnum þínum."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Gervihnattarskilaboð"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Um gervihnattarskilaboð"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Skilaboð í gegnum gervihnött, tengigeta við gervihnött"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Um <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Þú getur sent og tekið á móti SMS-skilaboðum um gervihnött ef þú ert með gjaldgengann reikning hjá <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Áskriftin þín hjá <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Gervihnattarskilaboð eru hluti af reikningnum þínum"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Skilaboðasendingar eru innifaldar í reikningnum þínum"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Gervihnattarskilaboð eru ekki hluti af reikningnum þínum"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Nánar"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Svona virkar þetta"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Síminn mun tengjast gervihnetti sjálfkrafa. Vertu utandyra þar sem himininn sést vel til að ná sem bestri tengingu."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Eftir að síminn tengist gervihnetti"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Þú getur sent hverjum sem er skilaboð, þ.m.t. neyðarþjónustu. Síminn mun tengjast farsímakerfi aftur þegar það er tiltækt."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Gervihnattarskilaboð gætu tekið lengri tíma og eru aðeins í boði á tilteknum svæðum. Veður og ákveðin mannvirki kunna að hafa áhrif á gervihnattartenginguna. Gervihnattarsímtöl eru ekki í boði. Neyðarsímtöl gætu náð sambandi.\n\nÞað gæti tekið smátíma fyrir breytingar á reikningnum að sjást í Stillingum. Hafðu samband við símafyrirtækið til að fá frekari upplýsingar."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Nánar um gervihnattarskilaboð"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> gætu tekið lengri tíma og eru aðeins í boði á tilteknum svæðum. Veður og ákveðin mannvirki kunna að hafa áhrif á gervihnattartenginguna. Símtöl í gegnum gervihnött eru ekki í boði. Þú getur hugsanlega hringt neyðarsímtöl samt sem áður.\n\nÞað gæti liðið smástund þar til breytingar á reikningi birtast í stillingunum. Hafðu samband við <xliff:g id="CARRIER_NAME">%1$s</xliff:g> til að fá frekari upplýsingar."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Nánar um <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Get ekki kveikt á <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Til að kveikja á <xliff:g id="FUNCTION">%1$s</xliff:g> skaltu byrja á að slökkva á gervihnattartengingunni"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Tengigeta við gervihnött"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Tengigeta við gervihnött"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"tengigeta við gervihnött"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"skilaboð í gegnum gervihnött"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Gagnanotkun er innifalin í reikningnum þínum"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Gervihnattar-SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Sendu neyðarþjónustu skilaboð, jafnvel þótt þú náir ekki að tengjast farsímakerfi eða WiFi-neti."</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"gervihnattar-sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Um gervihnattar-SOS"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Þú getur sent neyðarþjónustu skilaboð og deilt staðsetningu þinni, jafnvel þótt þú náir ekki að tengjast farsímakerfi eða WiFi-neti. Ekki er víst að þessi þjónusta sé alltaf tiltæk á öllum stöðum eða við allar aðstæður."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Hringdu í neyðarþjónustu eða sendu henni skilaboð"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Svaraðu spurningum um neyðartilfellið"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Fylgdu skrefunum til að tengjast gervihnettinum"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ef þú ert ekki með farsímakerfi muntu sjá valkost um að nota gervihnattar-SOS"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Þú sendir svör til neyðarþjónustu til að hægt sé að veita þér viðeigandi aðstoð"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Þegar tenging hefur náðst geturðu sent neyðarþjónustu skilaboð"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Prófa prufuútgáfu"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Þegar þú hefur náð sambandi við neyðarþjónustu í gegnum gervihnött verður nafninu þínu, netfangi, símanúmeri, staðsetningu, tækjaupplýsingum (IMEI, tungumáli, gerð, rafhlöðustöðu) og upplýsingum um neyðartengiliði deilt með neyðarþjónustu og þjónustuaðilum gervihnatta. \n\nTil að nota gervihnattar-SOS verður Google Messages að vera valið sem sjálfgefið SMS-forrit. \n\nEf slökkt er á sjálfvirku vali á netkerfi verður kveikt á því og tækið þitt mun tengjast því netkerfi sem er tiltækt."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Deilingarstillingar"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Neyðartengiliðir"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google-reikningurinn þinn"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Farðu yfir eða uppfærðu upplýsingar sem verður deilt með neyðarþjónustu"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Heiti aðgangsstaða"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"Aðgangsstaður"</string>
     <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>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Þú ert að nota 16 kB-stillingu óháðrar síðustillingar. Ekki er hægt að tryggja heilleika hugbúnaðarins í þessari stillingu og öll gögn símans kunna að vera í hættu á meðan ræsiforritið er ólæst. Í þessum stillingum er slökkt á tilteknum eiginleikum og því munu einhver forrit ekki virka. Til að kveikja á framleiðslustillingu tækisins á ný þarftu að skipta aftur yfir í 4 kB-stillingu og læsa ræsiforriti tækisins. Við þetta mun tækið núllstillast og kveikja á framleiðslustillingu á ný. Slökktu síðan á „Taka ræsiforrit úr lás“ í forritunarkostunum þegar tækið hefur ræst Android. Ef tækið er óstöðugt eða því tekst ekki að ræsa Android skaltu uppfæra tækið aftur með nýjustu útgáfu núllstillingarmynda af &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; eða fara á &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; og velja „Strauja tæki“, „Læsa ræsiforriti“ og „Þvinga uppfærslu allra skiptinga“."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 kB-stilling óháðrar síðustillingar"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lesa meira"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Keyra forrit með samhæfisstillingu síðustærðar"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Meðhöndlun villutilkynningar"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Ákvarðar hvaða forrit meðhöndlar flýtileiðir í villutilkynningu í tækinu þínu."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Persónulegt"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Hlusta á streymi"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skannaðu QR-kóða hljóðstreymis til að hlusta með <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Ekki hægt að breyta aðgangsorði á meðan deilt er. Til að breyta aðgangsorðinu skaltu fyrst slökkva á hljóðdeilingu."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Aðgangsorðið þitt verður að innihalda 4–16 stafi og má aðeins innihalda bókstafi, tölustafi og tákn"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kóðaskanni"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Þarftu aðstoð?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Leitarstillingar"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"tengiliðir, geymsla, reikningur"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Tengiliðageymsla"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Aðeins tæki"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nýir tengiliðir verða ekki samstilltir við reikning"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Tengiliðir verða sjálfkrafa vistaðir í tækinu þínu og samstilltir við reikninginn þinn"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Villa kom upp við að stilla sjálfgefinn reikning"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ekkert sjálfgildi stillt"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Aðeins tæki"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Tæki og %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Bættu reikningi við til að hefjast handa"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvar viltu vista tengiliði?"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Haltu heimahnappnum eða flettihandfanginu inni til að leita út frá efninu sem birtist á skjánum þínum."</string>
 </resources>
diff --git a/res/values-it-feminine/strings.xml b/res/values-it-feminine/strings.xml
new file mode 100644
index 00000000000..e316721c91d
--- /dev/null
+++ b/res/values-it-feminine/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ti manca # passaggio per diventare sviluppatrice.}other{Ti mancano # passaggi per diventare sviluppatrice.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Ora sei una sviluppatrice."</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già una sviluppatrice."</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Non sei autorizzata a modificare la lingua del dispositivo."</string>
+    <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questa utente"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Sei già connessa a una rete VPN sempre attiva. Se ti connetti a un\'altra rete, la rete VPN attuale verrà sostituita e la modalità sempre attiva verrà disattivata."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Sei già connessa a una rete VPN. Se ti connetti a un\'altra rete, la VPN attuale verrà sostituita."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Seleziona un profilo VPN a cui rimanere sempre connessa. Il traffico di rete sarà consentito solo quando sei connessa a questa VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Proprietaria"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Amministratrice"</string>
+    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eliminare te stessa?"</string>
+    <string name="user_adding_new_user" msgid="7439602720177181412">"Aggiunta nuova utente…"</string>
+    <string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Se rimuovi i privilegi amministrativi per questa utente, tu o un altro amministratore potrete concederglieli di nuovo in un secondo momento."</string>
+</resources>
diff --git a/res/values-it-masculine/strings.xml b/res/values-it-masculine/strings.xml
new file mode 100644
index 00000000000..774dd5ec5ee
--- /dev/null
+++ b/res/values-it-masculine/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ti manca # passaggio per diventare sviluppatore.}other{Ti mancano # passaggi per diventare sviluppatore.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Ora sei uno sviluppatore."</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già uno sviluppatore."</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Non sei autorizzato a modificare la lingua del dispositivo."</string>
+    <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questo utente"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Sei già connesso a una rete VPN sempre attiva. Se ti connetti a un\'altra rete, la rete VPN attuale verrà sostituita e la modalità sempre attiva verrà disattivata."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Sei già connesso a una rete VPN. Se ti connetti a un\'altra rete, la VPN attuale verrà sostituita."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Seleziona un profilo VPN a cui rimanere sempre connesso. Il traffico di rete sarà consentito solo quando sei connesso a questa VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Proprietario"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Amministratore"</string>
+    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eliminare te stesso?"</string>
+    <string name="user_adding_new_user" msgid="7439602720177181412">"Aggiunta nuovo utente…"</string>
+    <string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Se rimuovi i privilegi amministrativi per questo utente, tu o un altro amministratore potrete concederglieli di nuovo in un secondo momento."</string>
+</resources>
diff --git a/res/values-it-neuter/strings.xml b/res/values-it-neuter/strings.xml
new file mode 100644
index 00000000000..dd0f103fcce
--- /dev/null
+++ b/res/values-it-neuter/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Ti manca # passaggio per diventare sviluppatorə.}other{Ti mancano # passaggi per diventare sviluppatorə.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Ora sei unə sviluppatorə."</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già unə sviluppatorə."</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Non sei autorizzatə a modificare la lingua del dispositivo."</string>
+    <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questə utente"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Sei già connessə a una rete VPN sempre attiva. Se ti connetti a un\'altra rete, la rete VPN attuale verrà sostituita e la modalità sempre attiva verrà disattivata."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Sei già connessə a una rete VPN. Se ti connetti a un\'altra rete, la VPN attuale verrà sostituita."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Seleziona un profilo VPN a cui rimanere sempre connessə. Il traffico di rete sarà consentito solo quando sei connessə a questa VPN."</string>
+    <string name="user_owner" msgid="2079206733011361994">"Proprietariə"</string>
+    <string name="user_admin" msgid="4024553191395768119">"Amministratorə"</string>
+    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eliminare te stessə?"</string>
+    <string name="user_adding_new_user" msgid="7439602720177181412">"Aggiunta nuovə utente…"</string>
+    <string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Se rimuovi i privilegi amministrativi per questə utente, tu o un altro amministratore potrete concederglieli di nuovo in un secondo momento."</string>
+</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7c6fdf11387..8969d0e2a1a 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Fiocco di neve"</item>
     <item msgid="7952183800501346803">"Ombrellone da spiaggia"</item>
     <item msgid="799139025758265891">"Strumenti per il workshop"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Pellicola"</item>
     <item msgid="5827426100157335512">"Libro"</item>
     <item msgid="8585828346253128384">"Fiore di loto"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9e1c4aa8b23..0ece1c44a54 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Accoppia nuovo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Attiva automaticamente domani"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Se disattivi il Bluetooth, si riattiva il giorno successivo"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Accoppia orecchio dx"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Accoppia orecchio sx"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Accoppia l\'altro orecchio"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Disattiva Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Disattiva la funzionalità Bluetooth LE audio se il dispositivo supporta funzioni hardware LE audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modalità Bluetooth LE audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Attiva anteprima UI di trasmissione Bluetooth LE audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Attiva l\'anteprima della UI di condivisione LE audio, incluse la condivisione audio personale e la trasmissione privata"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Mostra comandi LE audio nei dettagli dispositivo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ignora lista consentita Bluetooth LE audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usa LE audio per impostazione predefinita anche se non è stato verificato che la periferica LE audio soddisfa i criteri della lista consentita."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Lingua dell\'app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Lingue suggerite"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Tutte le lingue"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Suggerite"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Tutte le lingue"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Tutte le regioni"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tutti i sistemi di numerazione"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Lingua di sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Predefinita di sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"La selezione della lingua per questa app non è disponibile nelle Impostazioni."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Cambia"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s non disponibile"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Non è possibile usare questa lingua come lingua di sistema, ma app e siti web sanno che preferisci questa lingua."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Cerca"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Aggiungi una lingua"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regione preferita"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Digita nome lingua"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Altre impostazioni della lingua"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferenze locali"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Imposta le preferenze per unità e numeri"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Consenti alle app di conoscere le tue preferenze locali affinché possano personalizzare la tua esperienza."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Le app useranno le tue preferenze locali quando è possibile."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferenze locali"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primo giorno della settimana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferenze per i numeri"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Connettiti a servizi di dati in roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Connettiti a servizi di dati in roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Potrebbero essere addebitati costi per il roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Imposta l\'ora automaticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Imposta automaticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Quando questa opzione è attiva viene usata la geolocalizzazione per impostare il fuso orario"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data e ora automatiche"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Imposta automaticamente la data e l\'ora utilizzando la rete e gli indicatori wireless"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuso orario automatico"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Imposta automaticamente la data e l\'ora in base alle reti mobile nelle tue vicinanze"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Imposta automaticamente la data e l\'ora utilizzando la posizione del dispositivo, se disponibile"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usa impostazioni internazionali predefinite"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usa il formato 24 ore"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Solleva il dito, quindi tocca di nuovo il sensore"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Impossibile utilizzare il sensore di impronte digitali"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Contatta un fornitore di servizi di riparazione."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Sblocco con l\'Impronta a schermo spento"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Usa lo Sblocco con l\'Impronta anche quando lo schermo è spento"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Schermo spento, Sblocco"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Altre impostazioni di sicurezza"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Blocco del profilo di lavoro, crittografia e altro"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Crittografia, credenziali e altro"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Imposta sequenza per lo spazio privato"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Blocca"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Nascondi"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Conferma la sequenza dello spazio privato"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Inserisci di nuovo il PIN dello spazio privato"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Inserisci di nuovo la password dello spazio privato"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> impronte digitali"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Hai aggiunto il numero massimo di impronte digitali"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossibile aggiungere ulteriori impronte digitali"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"On"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Display esterno"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Display incorporato"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Usa display esterno"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Risoluzione del display"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Display esterno disconnesso"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Se modifichi la rotazione o la risoluzione, le eventuali app in esecuzione potrebbero interrompersi"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Il dispositivo deve essere connesso a un display esterno per eseguire il mirroring dello schermo"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Altre opzioni"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Tieni premuto e trascina per riordinare i display."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Trasmissione"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroring"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Attiva display wireless"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Controlla la password e riprova"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contatta il produttore del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Controlla la connessione e riprova"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Al momento, questa rete Wi-Fi non è disponibile"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Si è verificato un problema con questo codice QR. Prova a connetterti in un altro modo."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Scegli rete"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Per connettere il tuo dispositivo, scegli una rete"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Aggiungere questo dispositivo alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Scopri di più sulla rotazione automatica"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Risoluzione dello schermo"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta risoluzione"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Massima risoluzione"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Se usi la massima risoluzione, viene consumata più batteria. La modifica della risoluzione potrebbe causare il riavvio di alcune app."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Risoluzione massima"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Se usi la massima risoluzione, viene consumata più batteria. La modifica della risoluzione potrebbe causare il riavvio di alcune app."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selezionata"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturali"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adattivi"</string>
     <string name="brightness" msgid="6216871641021779698">"Livello di luminosità"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Luminosità adattiva"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Informazioni sulla luminosità adattiva"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"La luminosità dello schermo verrà regolata automaticamente in base all\'ambiente e alle attività. Puoi spostare manualmente il cursore per far sì che la luminosità adattiva memorizzi le tue preferenze."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"On"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Off"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Impostazioni modalità Riposo"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Le modalità possono anche attivare il tema scuro}=1{{mode_1} attiva anche il tema scuro}=2{{mode_1} e {mode_2} attivano anche il tema scuro}=3{{mode_1}, {mode_2} e {mode_3} attivano anche il tema scuro}other{{mode_1}, {mode_2} e # altre attivano anche il tema scuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Impostazioni modalità"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ancora meno luminoso"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Attenuazione extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Consenti al dispositivo di abbassare ulteriormente la luminosità"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Spegnimento dello schermo"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Servizi di localizzazione"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Servizi di localizzazione"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usa posizione"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Utilizza la posizione per il fuso orario"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Impossibile impostare automaticamente il fuso orario"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Geolocalizzazione o Servizi di localizzazione non attivi"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Geolocalizzazione"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Risolvi questo problema"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Annulla"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Opzione Fuso orario automatico non attiva"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Non disponibile quando il fuso orario automatico non è attivo"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Potrebbe essere utilizzata la posizione per impostare il fuso orario"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Se la posizione del dispositivo è disponibile, potrebbe essere usata per impostare il fuso orario"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Visualizza informazioni legali, stato, versione del software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informazioni legali"</string>
     <string name="manual" msgid="3651593989906084868">"Manuale"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opzioni"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilità"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tastiera fisica"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Antirimbalzo dei tasti"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"La tastiera ignora pressioni ripetute velocemente dello stesso tasto entro <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"La tastiera ignora le pressioni ripetute velocemente dello stesso tasto"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Soglia antirimbalzo dei tasti"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Scegli la durata di tempo in cui la tastiera ignora le pressioni ripetute dei tasti"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizzato"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valore personalizzato"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tasti lenti"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Regola il tempo di risposta per la pressione di un tasto su <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Regola il tempo di risposta per la pressione di un tasto"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tasti permanenti"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Premi un tasto alla volta per le scorciatoie invece di tenere premuti più tasti contemporaneamente"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tasti mouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa la tastiera fisica per controllare il mouse"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usa i tasti del mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa la tastiera per controllare il puntatore"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Scorrimento invertito del mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scorri verso l\'alto per spostare la pagina in basso"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Scambia i tasti sinistro e destro"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa il tasto sinistro del mouse come il destro"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tasti del mouse per <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Usa i tasti <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> per spostare il puntatore del mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Usa il tasto <xliff:g id="CLICK_LABEL">%s</xliff:g> per fare clic sul pulsante principale del mouse"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Usa il tasto <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> per tenere premuto il pulsante principale del mouse"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Usa il tasto <xliff:g id="RELEASE_LABEL">%s</xliff:g> per rilasciare il pulsante principale del mouse"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Usa il tasto <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> per attivare/disattivare la modalità di scorrimento. In questo modo, i tasti <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> consentono di scorrere la visualizzazione verso l\'alto, il basso, sinistra o destra"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Usa il tasto <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> per fare clic sul pulsante secondario del mouse"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Scorciatoie da tastiera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra l\'elenco di scorciatoie"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastiere e strumenti del profilo di lavoro"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predefinito"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad e mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocità del puntatore, gesti"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tocco per fare clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Trascinamento al tocco"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic in basso a destra"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Per altre opzioni, fai clic sull\'angolo inferiore destro del touchpad"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocità del puntatore"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usa il tocco con tre dita"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Colore del puntatore"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Cambia riempim. puntatore in nero"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Cambia riempim. puntatore in verde"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Impara i gesti con il touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursore, scorrimento, scorrere, clic con il tasto destro del mouse, clic, puntatore"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"clic con il tasto destro del mouse, tocco"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic con tasto centrale"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Avvia l\'assistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Vai alla schermata Home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Indietro"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Visualizza app recenti"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Vai alla schermata Home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Scorri in alto con 3 dita su un punto qualsiasi del touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Vai indietro"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Scegli un nuovo tasto per <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilità della tastiera fisica"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tasti permanenti, tasti rimbalzati, tasti del mouse"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ripeti tasti"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Ritardo prima della ripetizione"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Frequenza ripetizione"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Tieni premuto un tasto per ripetere il relativo carattere finché non lo rilasci"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layout <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinito"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatico: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Anteprima"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opzioni standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Lingua"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Dimensioni testo"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Dimensioni sottotitoli codificati"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stile sottotitoli"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opzioni personalizzate"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Colore sfondo"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Regola consumo alimentazione"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pacchetti inclusi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Le app funzionano normalmente"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"È consigliata la sostituzione della batteria"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"La capacità della batteria e le prestazioni di ricarica sono ridotte ed è consigliata la sostituzione della batteria."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Livello della batteria basso"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Attiva il Risparmio energetico per prolungare la durata della batteria"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Prolunga la durata della batteria"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnettere questa VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnetti"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versione"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versione <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Rimuovi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Sostituire la rete VPN esistente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Impostare la rete VPN sempre attiva?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00-17:00, giorni feriali\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventi nel calendario"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} è attiva}=2{{mode_1} e {mode_2} sono attive}=3{{mode_1}, {mode_2} e {mode_3} sono attive}other{{mode_1}, {mode_2} e altre # sono attive}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Può essere attivata automaticamente 1 modalità}other{Possono essere attivate automaticamente # modalità}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Non disturbare}=1{{mode_1}}=2{{mode_1} e {mode_2}}other{{mode_1}, {mode_2} e {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Non impostata"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Disattivata"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ok"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifiche"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durata"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messaggi, eventi e promemoria"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi è disattivato, ad eccezione degli elementi che hai consentito sopra. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Fine"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Impostazioni"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Notifiche senza audio né elementi visivi"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Notifiche senza audio"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Non vedrai notifiche e non sentirai suonerie. Sono consentite le chiamate ripetute e dei contatti speciali."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Impostazione corrente)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Modificare le impostazioni delle notifiche Non disturbare?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Suoni profilo di lavoro"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usa i suoni del profilo personale"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usa gli stessi suoni del profilo personale"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Dopo lo sblocco, vai direttamente all\'ultima schermata usata. Le notifiche non compaiono nella schermata di blocco. Scorri verso il basso per vederle."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Schermata di blocco, Schermata blocco, Salta, Ignora"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Con profilo di lavoro bloccato"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Riduci al minimo le notifiche sulla schermata di blocco"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostra meno notifiche sulla schermata di blocco"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostra solo le nuove notifiche sulla schermata di blocco"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Rimuovi automaticamente dalla schermata di blocco le notifiche già visualizzate"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifiche sulla schermata di blocco"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostra conversazioni, notifiche predefinite e silenziose"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostra conversazioni, notifiche predefinite e silenziose"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostra tutti i contenuti delle notifiche di lavoro"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Nascondi contenuti di lavoro sensibili"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Quando il dispositivo è bloccato, come vuoi visualizzare le notifiche del profilo?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notifiche del profilo"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifiche"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notifiche app"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Quando ricevi molte notifiche in un breve periodo di tempo, il dispositivo abbasserà il volume e ridurrà al minimo gli avvisi per un massimo di 2 minuti. Non ci sono ripercussioni su chiamate, sveglie e conversazioni prioritarie. \n\nPer trovare le notifiche ricevute durante l\'attenuazione basta trascinare verso il basso la parte superiore dello schermo."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Applica ai profili di lavoro"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Applica alle app del profilo di lavoro"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notifiche raggruppate"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"On"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usa il raggruppamento delle notifiche"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Le notifiche con temi simili verranno silenziate e raggruppate per un\'esperienza più discreta. Il raggruppamento prevarrà sulle impostazioni di notifica di un\'app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizi di supporto VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nessuna app installata ha richiesto di essere eseguita come servizio di supporto VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Consentire l\'accesso a <xliff:g id="SERVICE">%1$s</xliff:g> al servizio VR?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversazioni prioritarie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nessuna"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}other{# conversazioni}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Impostazioni conversazioni"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Chi può interrompere"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Anche se le app di messaggistica o per telefonare non possono inviarti notifiche, le persone che scegli qui possono sempre contattarti tramite quelle app"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chiamate"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Impostazioni contatti"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Impostazioni contatti speciali"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nessuno"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nessuno"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Sveglie"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 # possono interrompere}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (lavoro)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calcolo in corso…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Impostazioni app"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Consenti alle app di ignorarla"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"App che possono interrompere"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea una modalità"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modalità personalizzata"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome della modalità"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Il nome della modalità non può essere vuoto"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Scegli un\'icona"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventi nel calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Buonanotte"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Durante la guida"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notifiche a schermo intero"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Consenti notifiche a schermo intero di questa app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Consenti a questa app di mostrare notifiche a schermo intero quando il dispositivo è bloccato. L\'app potrebbe usarle per mettere in evidenza sveglie, chiamate in arrivo o altre notifiche urgenti."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Scrittura delle preferenze di sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Consenti a questa app di modificare le preferenze di sistema per tuo conto"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Questa autorizzazione consente a un\'app di modificare le preferenze di sistema di base."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"App di gestione contenuti multimediali"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Consenti all\'app di gestire contenuti multimediali"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Se autorizzata, questa app può modificare o eliminare file multimediali creati con altre app senza chiederti l\'autorizzazione. L\'app deve avere l\'autorizzazione di accesso a file e contenuti multimediali."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gesti"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Apri rapidamente la fotocamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Per aprire velocemente la fotocamera, premi due volte il tasto di accensione da qualsiasi schermata."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Cambia fotocamera per selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modalità di navigazione"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Messaggistica satellitare"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Invia e ricevi messaggi via satellite. Disponibile con il tuo account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Invia e ricevi messaggi via satellite. Funzione non disponibile con il tuo account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Messaggistica satellitare"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Informazioni sulla messaggistica satellitare"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Messaggi via satellite, connettività satellitare"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Informazioni su <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Puoi scambiare messaggi via satellite come parte di un account <xliff:g id="CARRIER_NAME">%1$s</xliff:g> idoneo"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Il tuo piano di <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"La messaggistica satellitare è inclusa nel tuo account"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"I messaggi sono inclusi nel tuo account"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"La messaggistica satellitare non è inclusa nel tuo account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Scopri di più"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Come funziona"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Lo smartphone si connetterà automaticamente a un satellite. Per ottenere la migliore connessione possibile, mantieni una visuale sgombra del cielo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Dopo che lo smartphone si è connesso a un satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Puoi inviare un messaggio a chiunque, anche ai servizi di emergenza. Quando sarà disponibile, lo smartphone si riconnetterà a una rete mobile."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"La messaggistica satellitare potrebbe essere più lenta ed essere disponibile solo in alcune zone. Il meteo e determinate strutture potrebbero influire sulla connessione satellitare. Le chiamate via satellite non sono disponibili. Le chiamate di emergenza potrebbero invece ancora riuscire.\n\nPotrebbe passare del tempo prima che le modifiche al tuo account siano visibili nelle Impostazioni. Contatta il tuo operatore per avere informazioni dettagliate."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Scopri di più sulla messaggistica satellitare"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"La <xliff:g id="SUBJECT">%1$s</xliff:g> potrebbe essere più lenta ed essere disponibile solo in alcune zone. Il meteo e determinate strutture potrebbero influire sulla connessione satellitare. Le chiamate via satellite non sono disponibili. Le chiamate di emergenza potrebbero invece ancora riuscire.\n\nPotrebbe passare del tempo prima che le modifiche al tuo account siano visibili nelle Impostazioni. Contatta <xliff:g id="CARRIER_NAME">%1$s</xliff:g> per maggiori dettagli."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Ulteriori informazioni su <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Impossibile attivare la modalità <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Per attivare la funzionalità <xliff:g id="FUNCTION">%1$s</xliff:g>, devi prima terminare la connessione satellitare"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Connettività satellitare"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Connettività satellitare"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"connettività satellitare"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"messaggi via satellite"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"L\'utilizzo dei dati è incluso con il tuo account"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS satellitare"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Invia messaggi ai servizi di emergenza quando non riesci a connetterti a una rete mobile o Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos satellitare, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Informazioni su SOS satellitare"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Puoi inviare messaggi ai servizi di emergenza e condividere la tua posizione quando non riesci a connetterti a una rete mobile o Wi-Fi. Questo servizio potrebbe non essere disponibile in ogni momento e in tutte le località o circostanze."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Chiama o invia un messaggio ai servizi di emergenza"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Rispondi alle domande sull\'emergenza"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Segui i passaggi per connetterti al satellite"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Se non disponi di una rete mobile, vedrai un\'opzione per usare SOS satellitare"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Invia risposte ai servizi di emergenza per far sì che tu riceva il giusto tipo di aiuto"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Una volta effettuata la connessione, puoi inviare messaggi ai servizi di emergenza"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Prova una demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Quando ti connetti con i servizi di emergenza via satellite, dati come nome, email, numero di telefono, posizione, informazioni del dispositivo (IMEI, lingua, modello, livello batteria) e i dati dei contatti di emergenza vengono condivisi con i servizi di emergenza e i fornitori di servizi satellitari. \n\nPer usare SOS satellitare, Google Messaggi deve essere l\'app per SMS predefinita. \n\nSe la selezione automatica della rete è disattivata, verrà attivata e il dispositivo si connetterà automaticamente a qualsiasi rete."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Preferenze di condivisione"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Contatti di emergenza"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Il tuo Account Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Rivedi o aggiorna le informazioni che saranno condivise con i servizi di emergenza"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomi punti di accesso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Hai attivato l\'opzione a 16 kB della modalità page-agnostic. Non è possibile garantire l\'integrità del software in questa modalità e i dati archiviati sullo smartphone potrebbero essere a rischio finché il bootloader è sbloccato. Alcune funzionalità verranno disattivate in queste modalità, pertanto alcune applicazioni potrebbero non funzionare. Per tornare alla modalità di produzione, devi tornare alla modalità a 4 kB e bloccare il bootloader del dispositivo. Questo eseguirà nuovamente il ripristino dei dati di fabbrica del dispositivo e ripristinerà le impostazioni di produzione. Dopo che Android viene avviato correttamente sul dispositivo, disattiva lo sblocco OEM nelle Opzioni sviluppatore. Se l\'avvio di Android sul dispositivo non riesce o è instabile, esegui nuovamente il flashing del dispositivo con le immagini del produttore più recenti da &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; o usa &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e seleziona \"Cancella dati dispositivo\", \"Blocca bootloader\" e \"Esegui il flash forzato di tutte le partizioni\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modalità indipendente dalla pagina a 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Leggi tutto"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Esegui l\'app con la modalità di compatibilità con dimensioni pagina"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gestore segnalazione di bug"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Consente di stabilire quale app gestisce la scorciatoia per la segnalazione di bug sul dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personale"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ascolta lo stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scansiona il codice QR di uno stream audio da ascoltare con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Impossibile modificare la password durante la condivisione. Per modificarla, devi prima disattivare la condivisione audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"La password deve contenere 4-16 caratteri e utilizzare solo lettere, numeri e simboli"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Scanner codici QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Serve aiuto?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Cerca in Impostazioni"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatti, spazio di archiviazione, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Archiviazione contatti"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Solo dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"I nuovi contatti non verranno sincronizzati con un account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"I contatti verranno salvati sul dispositivo e sincronizzati con il tuo account per impostazione predefinita"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Errore durante l\'impostazione dell\'account predefinito"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nessun account impostato come predefinito"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aggiungi un account per iniziare"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dove salvare i contatti"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Cerchia e Cerca"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Tocca e tieni premuto il pulsante Home o la barra di navigazione per eseguire una ricerca usando i contenuti sullo schermo."</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 6d191951f8a..28db09106d5 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"פתית שלג"</item>
     <item msgid="7952183800501346803">"שמשייה"</item>
     <item msgid="799139025758265891">"כלי עבודה"</item>
-    <item msgid="1330084588359129896">"אוהל"</item>
+    <item msgid="8112685757657659269">"פסנתר"</item>
     <item msgid="3861584909935022342">"סרט צילום (פילם)"</item>
     <item msgid="5827426100157335512">"ספר"</item>
     <item msgid="8585828346253128384">"פרח לוטוס"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e88b02367c3..cab4c451013 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"התאמה של מכשיר חדש"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"הפעלה אוטומטית ביום הבא"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"‏אם מכבים את ה-Bluetooth, הוא מופעל שוב ביום הבא"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"התאמה באוזן ימין"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"התאמה באוזן שמאל"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"התאמה באוזן השנייה"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"‏השבתה של Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"‏האפשרות הזו משביתה את התכונה Bluetooth LE Audio אם המכשיר תומך ביכולות חומרה של LE audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"‏מצב Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"‏הפעלת התצוגה המקדימה של ממשק המשתמש לשידור באמצעות Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"‏הפעלת התצוגה המקדימה של ממשק המשתמש לשיתוף באמצעות LE Audio, כולל שיתוף אודיו אישי ושידור פרטי"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"‏הצגת המתג של LE audio בפרטי המכשיר"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"‏מעקף רשימת ההיתרים של Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"‏שימוש ב-LE Audio כברירת מחדל גם אם הציוד ההיקפי של ה-LE Audio לא אומת כעומד בקריטריונים של רשימת ההיתרים."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"שפת האפליקציה"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"השפות המוצעות"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"כל השפות"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"הצעות"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"כל השפות"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"כל האזורים"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"כל שיטות המספור"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"שפת המערכת"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ברירת המחדל של המערכת"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"בחירות השפה לאפליקציה הזו לא זמינה בהגדרות."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"שינוי"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"‏%s לא זמינה"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"השפה הזו לא יכולה לשמש כשפת המערכת, אבל יידעת את האפליקציות ואת האתרים שזו השפה המועדפת עליך."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"חיפוש"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"הוספת שפה"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"העדפת אזור"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"יש להקליד את שם השפה"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"עוד הגדרות שפה"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"העדפות פורמט ומידות"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"הגדרת העדפות של יחידות ומספרים"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"הרשאת גישה לאפליקציות להעדפות פורמט ומידות כדי שיתאימו אישית את חוויית המשתמש."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"אפליקציות ישתמשו בהעדפות הפורמט והמידות במידת האפשר."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"העדפות הפורמט והמידות"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"טמפרטורה"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"היום הראשון של השבוע"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"העדפות שקשורות למספרים"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"חיבור לשירותי נתונים בנדידה"</string>
     <string name="roaming_disable" msgid="729512894708689604">"חיבור לשירותי נתונים בזמן נדידה"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ייתכנו חיובי נדידה."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"הגדרת זמן באופן אוטומטי"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"הגדרה באופן אוטומטי"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"כשהמתג הזה מופעל, המיקום ישמש להגדרת אזור הזמן"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"תאריך ושעה אוטומטיים"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"הגדרה אוטומטית באמצעות הרשת והאותות האלחוטיים"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"אזור זמן אוטומטי"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"הגדרה אוטומטית לפי הרשתות הסלולריות באזור שלך"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"הגדרה אוטומטית באמצעות מיקום המכשיר, אם האפשרות זמינה"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"לפי ברירת המחדל באזור"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"פורמט 24 שעות"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"שעה"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"יש להרים את האצבע ולגעת שוב בחיישן"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"לא ניתן להשתמש בחיישן טביעות האצבע"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"צריך ליצור קשר עם ספק תיקונים."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"פתיחה בטביעת אצבע כשהמסך כבוי"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"שימוש בתכונה \'פתיחה בטביעת אצבע\' גם כשהמסך כבוי"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"המסך כבוי, פתיחה"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"הגדרות אבטחה נוספות"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"נעילת פרופיל העבודה, הצפנה ועוד"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"הצפנה, פרטי כניסה ועוד"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"הגדרת קו ביטול נעילה למרחב הפרטי"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"נעילה"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"הסתרה"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"צריך לאשר את קו ביטול הנעילה של המרחב הפרטי"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"צריך להזין שוב את קוד האימות של המרחב הפרטי"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"צריך להזין שוב את הסיסמה למרחב הפרטי"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"אפשר להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"הוספת את המספר המרבי של טביעות אצבע."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"לא ניתן להוסיף עוד טביעות אצבע"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"מצב מופעל"</string>
     <string name="external_display_off" msgid="5634413756025351374">"מצב מושבת"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"מסך חיצוני"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"שימוש במסך החיצוני"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"רזולוציית המסך"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"המסך החיצוני לא מחובר"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"שינוי של מידת הסיבוב או של הרזולוציה עלול להפסיק את כל האפליקציות שפועלות כרגע"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"כדי לשקף את המסך, המכשיר חייב להיות מחובר למסך חיצוני"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"אפשרויות נוספות"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"כדי לשנות את סדר התצוגות, לוחצים לחיצה ארוכה על תצוגה וגוררים אותה."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"‏הפעלת Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"‏העברה (csat)"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"‏הפעלת תצוגת WiFi"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"יש לבדוק את הסיסמה ולנסות שוב"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"יש ליצור קשר עם יצרן המכשיר"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"יש לבדוק את החיבור ולנסות שוב"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"‏רשת ה-Wi-Fi הזו לא זמינה כרגע"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"‏יש בעיה בקוד ה-QR הזה. אפשר לנסות להתחבר בדרך אחרת."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"בחירת רשת"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"יש לבחור רשת כדי לחבר את המכשיר"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"להוסיף את המכשיר הזה אל “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"מידע נוסף על הסיבוב האוטומטי"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"רזולוציית המסך"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"רזולוציה גבוהה"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"רזולוציה מלאה"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"רזולוציה מלאה מובילה לשימוש גבוה בסוללה. שינוי הרזולוציה עשוי לגרום להפעלה מחדש של חלק מהאפליקציות."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"נבחרה"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"צבעים"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"גוון טבעי"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"גוון ניתן להתאמה"</string>
     <string name="brightness" msgid="6216871641021779698">"רמת בהירות"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"בהירות אוטומטית"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"מידע על התאמה אוטומטית של הבהירות"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"בהירות המסך תותאם באופן אוטומטי לסביבה ולפעילויות שלך. עדיין אפשר לכוונן את הבהירות באופן ידני מפס ההזזה, ועם הזמן הבהירות האוטומטית תתבסס על ההעדפות שלך."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"פועל"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"כבויה"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"הגדרות של מצב שעת השינה"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{יכול להיות שהעיצוב הכהה יופעל במצבים באופן אוטומטי}=1{יכול להיות שהעיצוב הכהה יופעל באופן אוטומטי ב{mode_1}}=2{יכול להיות שהעיצוב הכהה יופעל באופן אוטומטי ב{mode_1} וב{mode_2}}=3{יכול להיות שהעיצוב הכהה יופעל באופן אוטומטי ב{mode_1}, ב{mode_2} וב{mode_3}}one{יכול להיות שהעיצוב הכהה יופעל באופן אוטומטי ב{mode_1}, ב{mode_2} ובעוד # מצבים}other{יכול להיות שהעיצוב הכהה יופעל באופן אוטומטי ב{mode_1}, ב{mode_2} ובעוד # מצבים}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"הגדרות של מצבים"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"מעומעם במיוחד"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"מעומעם במיוחד"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"המכשיר יכול להתעמעם יותר מהרגיל"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"זמן קצוב לכיבוי המסך"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -1540,10 +1567,10 @@
     <string name="reset_bluetooth_wifi_complete_toast" msgid="5893439291030574365">"‏חיבורי Bluetooth ו-Wi‑Fi אופסו"</string>
     <string name="reset_esim_title" msgid="4194570573425902754">"‏מחיקה של כרטיסי eSIM"</string>
     <string name="reset_esim_desc" msgid="6125192435907740751">"‏הפעולה הזו לא תבטל את חבילת השירות הסלולרי. כדי לקבל כרטיס SIM חלופי, עליך ליצור קשר עם הספק."</string>
-    <string name="reset_network_button_text" msgid="2281476496459610071">"איפוס הגדרות"</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="1129251284212847939">"‏לאפס את כל הגדרות הרשת ולמחוק את כרטיסי ה-eSIM? לא ניתן לבטל את הפעולה הזו."</string>
-    <string name="reset_network_final_button_text" msgid="2433867118414000462">"איפוס הגדרות"</string>
+    <string name="reset_network_final_button_text" msgid="2433867118414000462">"איפוס ההגדרות"</string>
     <string name="reset_network_confirm_title" msgid="913014422184481270">"האם לאפס?"</string>
     <string name="network_reset_not_available" msgid="1966334631394607829">"המשתמש הזה לא יכול לאפס את הגדרות הרשת"</string>
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"הגדרות הרשת אופסו"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‏אפליקציות ושירותים יוכלו לחפש מכשירים בקרבת מקום בכל שלב, גם כאשר ה-Bluetooth כבוי. ניתן להשתמש בכך, למשל, כדי לשפר את הביצועים של תכונות ושירותים מבוססי מיקום."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"שירותי מיקום"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"שירותי מיקום"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"שימוש במיקום"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"שימוש במיקום לקביעת אזור הזמן"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"לא ניתן לעדכן את אזור הזמן באופן אוטומטי"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"המיקום או שירותי המיקום מושבתים"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"הגדרות מיקום"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"תיקון"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ביטול"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ההגדרה \'אזור זמן אוטומטי\' כבויה"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"האפשרות לא זמינה כשאזור הזמן האוטומטי מושבת"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ייתכן שייעשה שימוש במיקום כדי להגדיר את אזור הזמן"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"אם מיקום המכשיר זמין, הוא יכול לשמש להגדרת אזור הזמן"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"הצגת מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="7509900979811934843">"מידע משפטי"</string>
     <string name="manual" msgid="3651593989906084868">"ידני"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"אפשרויות"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"נגישות"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"מקלדת פיזית"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"מקשים חוזרים"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"המקלדת מתעלמת מלחיצות מהירות חוזרות על אותו המקש שנעשות תוך <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> אלפיות השנייה"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"המערכת מתעלמת מהקשות מהירות חוזרות על אותו המקש במקלדת"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"הסף לסינון הקשות חוזרות"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"צריך לבחור את משך הזמן שבו המערכת מתעלמת מהקשות חוזרות על מקשים במקלדת"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"‫0.2 שניות"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"‫0.4 שניות"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"‫0.6 שניות"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"בהתאמה אישית"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ערך מותאם אישית"</string>
     <string name="slow_keys" msgid="2891452895499690837">"מקשים איטיים"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"הזמן שעובר מהקשה על מקש ועד להפעלה שלו ישתנה ל-<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> אלפיות השנייה"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"שינוי הזמן שעובר מהקשה על מקש ועד להפעלה שלו"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"מקשים \"דביקים\""</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"מקישים אחד-אחד על רצף של מקשי קיצור, ולא צריך ללחוץ עליהם בו-זמנית."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"מקשי העכבר"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"אפשר להשתמש במקלדת הפיזית כדי לשלוט בעכבר."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"שימוש במקשי העכבר"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"שליטה בסמן באמצעות המקלדת"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"גלילה הפוכה עם העכבר"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"גלילה למעלה להזזת הדף למטה"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"החלפה בין הלחצן השמאלי ללחצן הימני"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"שימוש בלחצן השמאלי של העכבר כלחצן הימני"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"מקשי העכבר במקלדת <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"אפשר להשתמש במקשים <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> כדי להזיז את סמן העכבר"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"אפשר להשתמש במקש <xliff:g id="CLICK_LABEL">%s</xliff:g> כדי ללחוץ על לחצן העכבר הראשי"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"אפשר להשתמש במקש <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> כדי ללחוץ לחיצה ארוכה על לחצן העכבר הראשי"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"אפשר להשתמש במקש <xliff:g id="RELEASE_LABEL">%s</xliff:g> כדי לשחרר את לחצן העכבר הראשי"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"אפשר להשתמש במקש <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> כדי להחליף בין מצבי גלילה. הפעולה הזו תגרום למקשי <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> לגלול את התצוגה למעלה, למטה, שמאלה או ימינה"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"אפשר להשתמש במקש <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> כדי ללחוץ על לחצן העכבר המשני"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"מקשי קיצור"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"הצגת רשימה של מקשי הקיצור"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"מקלדות וכלים בפרופיל העבודה"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ברירת מחדל"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"לוח מגע"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"לוח מגע ועכבר"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"עכבר"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"מהירות המצביע, תנועות"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"נוגעים נגיעה קלה"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"הקשה וגרירה"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"לחיצה ימנית למטה"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"לוחצים על הפינה הימנית התחתונה של לוח המגע לאפשרויות נוספות"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"מהירות המצביע"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"שימוש בהקשה בשלוש אצבעות"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"הצבע של סמן העכבר"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"שינוי סגנון המילוי של המצביע לשחור"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"שינוי סגנון המילוי של המצביע לירוק"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"מידע על התנועות בלוח המגע"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"משטח-מגע, משטח מגע, עכבר, סמן, גלילה, החלקה, לחיצה ימנית, לחיצה, מצביע"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"לחיצה ימנית, הקשה"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"לחיצה אמצעית"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"‏הפעלת Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"חזרה לדף הבית"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"חזרה"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"הצגת האפליקציות האחרונות"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"מעבר לדף הבית"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"מחליקים כלפי מעלה עם שלוש אצבעות על לוח המגע"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"הקודם"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"יש לבחור מפתח חדש עבור <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"תכונות נגישות שפועלות באמצעות מקלדת פיזית"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"מקשים \"דביקים\", מקשים חוזרים, לחצני העכבר"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"חזרה על מקשים"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"השהיה לפני חזרה"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"קצב החזרה"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"לוחצים לחיצה ארוכה על מקש כדי לחזור על התו שלו עד שמפסיקים ללחוץ על המקש"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"פריסה של <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ברירת מחדל"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"אוטומטי: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"תצוגה מקדימה"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"אפשרויות רגילות"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"שפה"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"גודל טקסט"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"גודל כתוביות"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"סגנון כתוביות"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"אפשרויות מותאמות אישית"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"צבע הרקע"</string>
@@ -2448,7 +2507,7 @@
     <string name="capabilities_list_title" msgid="1225853611983394386">"‏<xliff:g id="SERVICE">%1$s</xliff:g> צריך אפשרות לבצע:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
     <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"אישור"</string>
-    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"עדיף שלא"</string>
+    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"לא, תודה"</string>
     <string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"השבתה"</string>
     <string name="accessibility_dialog_button_cancel" msgid="8625997437316659966">"להמשיך"</string>
     <string name="disable_service_title" msgid="8178020230162342801">"להשבית את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"התאמת צריכת סוללה"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"חבילות כלולות"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"האפליקציות פועלות כרגיל"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"מומלץ להחליף את הסוללה"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"מומלץ להחליף את הסוללה כי הרמה של קיבולת הסוללה וביצועי הטעינה ירדה."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"הסוללה חלשה"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"יש להפעיל את האפשרות \'חיסכון בסוללה\' כדי להאריך את חיי הסוללה"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"שיפור חיי הסוללה"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏האם לנתק את ה-VPN הזה?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ניתוק"</string>
     <string name="vpn_version" msgid="6344167191984400976">"גרסה"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"גרסה <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"‏אני רוצה לשכוח את ה-VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏האם להחליף רשת VPN קיימת?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏האם להגדיר את רשת ה-VPN בחיבור תמידי?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00 - 17:00 ימי חול\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"אירועים ביומן"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{מצב {mode_1} פעיל}=2{‫{mode_1} ו{mode_2} פעילים}=3{‫{mode_1}, {mode_2}, ו{mode_3} פעילים}one{‫{mode_1}, {mode_2} ועוד # פעילים}other{‫{mode_1}, {mode_2} ועוד # פעילים}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{מצב אחד יכול לפעול באופן אוטומטי}one{‫# מצבים יכולים לפעול באופן אוטומטי}two{‫# מצבים יכולים לפעול באופן אוטומטי}other{‫# מצבים יכולים לפעול באופן אוטומטי}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{נא לא להפריע}=1{{mode_1}}=2{‏{mode_1}, ‏{mode_2}}one{{mode_1}, {mode_2} {mode_3}}other{{mode_1}, {mode_2} {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"מצב מופעל"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"לא הוגדר"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"מצב מושבת"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"הבנתי"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"התראות"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"כמה זמן"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"הודעות, אירועים ותזכורות"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"סיום"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"הגדרות"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"התראות לא יופיעו ולא יושמעו"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"התראות ללא צליל"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"התראות לא יוצגו ולא יושמעו. מותרות שיחות מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ההגדרה הנוכחית)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"האם לשנות את ההגדרות של ההתראות במצב \'נא לא להפריע\'?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"צלילי פרופיל עבודה"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"שימוש בצלילי הפרופיל האישי"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"שימוש באותם הצלילים מהפרופיל האישי"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"אחרי שמבטלים את הנעילה, עוברים ישירות למסך האחרון שהיה בשימוש. ההתראות לא יוצגו במסך הנעילה. יש להחליק למטה מהחלק העליון כדי לראות אותן."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"מסך נעילה, דילוג, מעקף"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"כשפרופיל העבודה נעול"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"צמצום של כמות ההתראות במסך הנעילה"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"הצגת פחות התראות במסך הנעילה"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"הצגת התראות חדשות בלבד במסך הנעילה"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"הסרה אוטומטית של התראות שנצפו ממסך הנעילה"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"התראות במסך הנעילה"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"הצגת שיחות, ברירת מחדל והתראות שקטות"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"הצגת שיחות, ברירת מחדל והתראות שקטות"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"הצגת כל התוכן של התראות מהעבודה"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"הסתרה של תוכן עבודה רגיש"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"איך להציג התראות פרופיל כשהמכשיר נעול?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"אם קיבלת הרבה התראות תוך זמן קצר, המכשיר ינמיך את עוצמת הקול ויצמצם את ההפרעות למשך עד 2 דקות. ההפוגה לא חלה על שיחות, שעונים מעוררים ושיחות בעדיפות גבוהה. \n\nכדי למצוא את ההתראות שהתקבלו במהלך ההפוגה, מושכים למטה מראש המסך."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"הפעלה בפרופילי העבודה"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"הפעלה באפליקציות של פרופיל העבודה"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"התראות מקובצות"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"מופעל"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"מושבת"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"שימוש בקיבוץ התראות"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"התראות בנושאים דומים יושתקו ויקובצו יחד כדי לספק חוויית שימוש שקטה יותר. קיבוץ התראות יקבל עדיפות על פני הגדרות ההתראות באפליקציה עצמה."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏שירותי סיוע של VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏לא התקבלו בקשות מאפליקציות מותקנות לפעול כשירותי סיוע של VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏האם לאפשר לשירות VR גישה אל <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"שיחות בעדיפות גבוהה"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ללא"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{אין}=1{שיחה אחת}one{# שיחות}two{# שיחות}other{# שיחות}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"הגדרות של השיחות"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"מי יכול להפריע"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"גם אם לא ניתן לקבל התראה באמצעות אפליקציות לשיחות או להעברת הודעות, האנשים שייבחרו כאן עדיין יוכלו ליצור איתך קשר באמצעות האפליקציות האלו"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"שיחות"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"כולם"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"אנשי קשר"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"אנשי קשר שסומנו בכוכב"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"הגדרות של אנשי הקשר"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"הגדרות של אנשי קשר שסומנו בכוכב"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"אף שיחה"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"אף הודעה"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"שעונים מעוררים"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"‫<xliff:g id="APP_LABEL">%s</xliff:g> (עבודה)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"מתבצע חישוב…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"הגדרות של אפליקציות"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"‎+‫<xliff:g id="NUMBER">%d</xliff:g>‎"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ניתן לאפשר לאפליקציות לבטל הגדרה זו"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"אפליקציות שיכולות להפריע"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"יצירת מצב"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"מצב מותאם אישית"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"שם המצב"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"שם המצב לא יכול להיות ריק"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"בחירת סמל"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"אירועים ביומן"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"תרחיש לפני השינה"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"בזמן נהיגה"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"התראות במסך מלא"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"מתן הרשאה להצגת התראות במסך מלא מהאפליקציה הזו"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"מתן הרשאה לאפליקציה הזו להציג התראות במסך מלא כשהמכשיר נעול. אפליקציות יכולות להשתמש בהרשאה הזו כדי להציג התראות, שיחות נכנסות או הודעות דחופות אחרות."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"כתיבה של העדפות המערכת"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"מתן הרשאה לאפליקציה הזו לשנות את העדפות המערכת בשמך"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ההרשאה הזו מאפשרת לאפליקציה לשנות את ההעדפות הבסיסיות של המערכת."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"אפליקציות לניהול מדיה"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"מתן הרשאה לניהול קובצי המדיה על ידי האפליקציה"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"אם תינתן הרשאה לאפליקציה, היא תוכל לערוך או למחוק קובצי מדיה שנוצרו באמצעות אפליקציות אחרות בלי לבקש ממך אישור. לאפליקציה דרושה הרשאת גישה לקבצים ולמדיה."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"תנועות לביצוע פעולות"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"פתיחה מהירה של המצלמה"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"כדי לפתוח את המצלמה במהירות, לוחצים פעמיים על לחצן ההפעלה. ניתן לבצע את הפעולה הזו מכל מסך."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"היפוך המצלמה לתמונת סלפי"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"מעבר בין מסכים"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"העברת הודעות באמצעות לוויין"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"שליחה וקבלה של הודעות טקסט באמצעות לוויין. השירות נכלל בחשבון שלך."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"שליחה וקבלה של הודעות טקסט באמצעות לוויין. השירות לא נכלל בחשבון שלך."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"העברת הודעות באמצעות לוויין"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"מידע על העברת הודעות באמצעות לוויין"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"אפשר לשלוח ולקבל הודעות טקסט באמצעות לוויין כחלק מחשבון שעומד בתנאים אצל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"חבילת הגלישה אצל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"העברת הודעות באמצעות לוויין כלולה בחשבון"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"העברת הודעות באמצעות לוויין לא כלולה בחשבון"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"מידע נוסף"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"איך זה עובד"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"הטלפון יתחבר אוטומטית ללוויין. כדי להתחבר בצורה הטובה ביותר צריך להיות בחוץ, מתחת לכיפת השמיים."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"אחרי שהטלפון מתחבר ללוויין"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"אפשר לשלוח הודעות טקסט לכל אחד, כולל לשירותי החירום. הטלפון יתחבר מחדש לרשת סלולרית כשהיא תהיה זמינה."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"העברת הודעות באמצעות לוויין אורכת זמן רב יותר וזמינה רק בחלק מהאזורים. מזג אוויר ומבנים מסוימים עשויים להשפיע על חיבור הלוויין. אי אפשר להתקשר באמצעות לוויין. יכול להיות שאפשר לבצע שיחות חירום.\n\nיכול להיות שהשינויים בחשבון יופיעו ב\'הגדרות\' לאחר זמן מה. למידע נוסף, ניתן לפנות לספק הסלולרי."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"מידע נוסף על העברת הודעות באמצעות לוויין"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"אי אפשר להפעיל <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"כדי להפעיל <xliff:g id="FUNCTION">%1$s</xliff:g>, צריך להשבית קודם את חיבור הלוויין"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"קישוריות ללוויין"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"‏שמות של נקודות גישה (APN)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"לא זמין כשהמכשיר מחובר ל-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"‏המכשיר נמצא במצב שמסתגל לגודל הדף, והגודל הנוכחי הוא 16KB. במצב הזה, תקינות התוכנה לא מובטחת. כל הנתונים שמאוחסנים בטלפון נמצאים בסיכון בזמן שתוכנת האתחול לא נעולה. חלק מהתכונות מושבתות במצב כזה, ולכן יש אפליקציות שלא יעבדו. כדי לחזור למצב ייצור, צריך לחזור למצב 4KB לנעול את תוכנת האתחול של המכשיר. הפעולה הזו תחזיר את המכשיר למצב מאופס, עם ההגדרות הייצור המקוריות. אחרי שהמכשיר יאותחל ומערכת Android תיטען כראוי, עליך להשבית את האפשרות \'ביטול נעילה של OEM\' בדף \'אפשרויות למפתחים\'. אם אתחול המכשיר נכשל ומערכת Android לא נטענת כראוי, או שהמכשיר לא מתפקד ביציבות, צריך לבצע התקנת ROM של קובצי האימג\' העדכניים של הקושחה המקורית. כדי לעשות את זה, עוברים לכתובת &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers .google.com/android/images&lt;/a&gt; או משתמשים ב-&lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ובוחרים באפשרות \'איפוס נתונים במכשיר\' > \'נעילת תוכנת האתחול\' > \'כפיית עדכון על כל המחיצות\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"‏מצב לא מותאם לדף של 16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"עוד פרטים"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"הפעלת האפליקציה במצב של תאימות לגודל הדף"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"טיפול בדוחות על באגים"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"הגדרה זו קובעת איזו אפליקציה מטפלת במקש הקיצור של הדוח על הבאג במכשיר."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"אישי"</string>
@@ -5434,7 +5586,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"האזנה לשידור"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"‏צריך לסרוק קוד QR של שידור אודיו כדי להאזין עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"אי אפשר לערוך את הסיסמה בזמן השיתוף. כדי לשנות את הסיסמה, קודם צריך להשבית את שיתוף האודיו."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"הסיסמה חייבת להכיל 4-16 תווים של אותיות, מספרים וסמלים בלבד"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"‏סורק קודי QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"רוצה עזרה?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"חיפוש בהגדרות"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"אנשי קשר, אחסון, חשבון"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"אחסון אנשי הקשר"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"מכשיר בלבד"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"אנשי קשר חדשים לא יסונכרנו עם חשבון כלשהו"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"אנשי הקשר יישמרו במכשיר ויוסנכרנו עם החשבון שלך כברירת מחדל"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"אירעה שגיאה בהגדרה של חשבון ברירת המחדל"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"לא הוגדרה ברירת מחדל"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"מכשיר בלבד"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏במכשיר וב-%1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"כדי להתחיל, צריך להוסיף חשבון"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"איפה לשמור אנשי קשר"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"מקיפים ומחפשים"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"לוחצים לחיצה ארוכה על לחצן דף הבית או על נקודת האחיזה לניווט כדי להפעיל חיפוש של התוכן שמופיע על המסך."</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index e5ac9e5f63a..82c1342d65e 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"雪の結晶"</item>
     <item msgid="7952183800501346803">"ビーチパラソル"</item>
     <item msgid="799139025758265891">"工具セット"</item>
-    <item msgid="1330084588359129896">"テント"</item>
+    <item msgid="8112685757657659269">"ピアノ"</item>
     <item msgid="3861584909935022342">"フィルムリール"</item>
     <item msgid="5827426100157335512">"書籍"</item>
     <item msgid="8585828346253128384">"ハスの花"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 826d0bf101a..3b44c8982fb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"新しいデバイスとペア設定"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"日付が変わったら自動的に ON にする"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth を OFF にしても、翌日に再び ON になります"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"右耳をペア設定"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"左耳をペア設定"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"もう一方の耳をペア設定"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio を無効にする"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"デバイスが LE オーディオ ハードウェア機能に対応している場合に、Bluetooth LE Audio 機能を無効にします。"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio モード"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio ブロードキャスト UI のプレビューを有効にする"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"個人の音声の共有やプライベート ブロードキャストなど、LE Audio 共有 UI のプレビューを有効にします"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE Audio の切替をデバイスの詳細に表示"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio の許可リストを回避する"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio の周辺機器が許可リストの基準を満たしていない場合でも、デフォルトで LE Audio を使用します。"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"アプリの言語"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"言語の候補"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"すべての言語"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"候補"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"すべての言語"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"すべての地域"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"すべての番号方式"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"システムの言語"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"システムのデフォルト"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"このアプリの言語は [設定] から選択できません。"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"変更"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%sは使用できません"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"この言語はシステムの言語としては使用できませんが、アプリやウェブサイトの優先言語として認識されています。"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"検索"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"言語の追加"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"地域設定"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"言語名を入力"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"その他の言語設定"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"地域別の設定"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"使用する単位と数字を指定します"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"地域別の設定を行えば、アプリが機能をパーソナライズします。"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"地域別の設定があればそちらが使用されます。"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"地域別の設定"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"温度"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"週最初の曜日"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Numbers の設定"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ローミング中にデータサービスに接続します"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ローミング中にデータサービスに接続します"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ローミング料金が発生する場合があります。"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"日時を自動的に設定"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"自動設定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"この切り替えが ON の場合、タイムゾーンの設定に位置情報が使用されます"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"日時の自動設定"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ネットワークとワイヤレス通信を使用して自動的に設定します"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"タイムゾーンの自動設定"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"付近のモバイル ネットワークに基づいて自動的に設定します"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"可能であればデバイスの位置情報で自動設定します"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"言語 / 地域で一般的な形式を使用する"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24時間表示"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時刻"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"指を離してから、もう一度センサーに触れてください。"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"指紋認証センサーを使用できません"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"修理業者に調整を依頼してください。"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"画面オフ時の指紋認証"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"画面がオフの状態でも指紋認証を使用"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"画面オフ、ロック解除"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"セキュリティの詳細設定"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"仕事用プロファイルのロック、暗号化など"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"暗号化、認証情報など"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"プライベート スペースのパターンを設定"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ロック"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"非表示"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"プライベート スペースのパターンを確認してください"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"プライベート スペースの PIN を再入力してください"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"プライベート スペースのパスワードを再入力してください"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"最大で <xliff:g id="COUNT">%d</xliff:g> 件の指紋を追加できます"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"追加された指紋の数が上限に達しました"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"これ以上、指紋を追加できません"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ON"</string>
     <string name="external_display_off" msgid="5634413756025351374">"OFF"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"外部ディスプレイ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"内蔵ディスプレイ"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"外部ディスプレイを使用する"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ディスプレイ解像度"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"外部ディスプレイに接続されていません"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"回転や解像度を変更すると、現在実行中のアプリが停止する可能性があります"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"画面をミラーリングするには、デバイスを外部ディスプレイに接続する必要があります"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"その他のオプション"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ディスプレイを並べ替えるには長押ししてドラッグします。"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"キャスト"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ミラー"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ワイヤレス ディスプレイの有効化"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"パスワードをご確認のうえ、もう一度お試しください"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"デバイスのメーカーにお問い合わせください"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"接続を確認し、もう一度お試しください"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"この Wi-Fi ネットワークは現在利用できません"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"この QR コードには問題があります。別の方法で接続してみてください。"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ネットワークの選択"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"デバイスを接続するには、ネットワークを選択してください"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"「<xliff:g id="SSID">%1$s</xliff:g>」にこのデバイスを追加しますか？"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"自動回転の詳細"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"画面解像度"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"高解像度"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"最大解像度"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"最大解像度ではバッテリー消費量が多くなります。解像度を切り替えると、一部のアプリが再起動することがあります。"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"最大解像度"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"最大解像度ではバッテリー消費量が多くなります。解像度を切り替えると、一部のアプリが再起動することがあります。"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"選択中"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"カラー"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ナチュラル"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"自動調整"</string>
     <string name="brightness" msgid="6216871641021779698">"明るさのレベル"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"明るさの自動調節"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"明るさの自動調節について"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"環境やアクティビティに応じて画面の明るさが自動的に調整されます。スライダーを手動で動かして、明るさの自動調節機能に設定を学習させることもできます。"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ON"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"OFF"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"おやすみ時間モードの設定"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{モードの設定により、ダークモードも有効になります}=1{{mode_1} に設定すると、ダークモードも有効になります}=2{{mode_1} と {mode_2} に設定すると、ダークモードも有効になります}=3{{mode_1}、{mode_2}、{mode_3} に設定すると、ダークモードも有効になります}other{{mode_1}、{mode_2}、他 # 個のモードに設定すると、ダークモードも有効になります}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"モードの設定"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"さらに暗くする"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"さらに輝度を下げる"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"デバイスを通常より暗くできます"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"画面消灯"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"操作が行われない状態で <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。位置情報を使用する機能やサービスで利便性が向上するなどの効果があります。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"位置情報サービス"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"位置情報サービス"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"位置情報を使用する"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"タイムゾーンの設定に位置情報を使用"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"タイムゾーンを自動的に設定できません"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"位置情報または位置情報サービスが OFF です"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"位置情報の設定"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"修正する"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"キャンセル"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"タイムゾーンの自動設定は OFF です"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"タイムゾーンの自動設定が OFF になっている場合は利用できません"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"タイムゾーンの設定に位置情報が使用されることがあります"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"デバイスの位置情報が使用可能な場合、タイムゾーンの設定に使用されることがあります"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"規約、ステータス、ソフトウェアバージョン"</string>
     <string name="legal_information" msgid="7509900979811934843">"法的情報"</string>
     <string name="manual" msgid="3651593989906084868">"マニュアル"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"オプション"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ユーザー補助"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"物理キーボード"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"物理キーボードのレイアウト選択"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"バウンスキー"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ミリ秒以内にキーボードの同じキーが連続で押された場合は、その操作を無視します"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"キーボードの同じキーが連続で押された場合は、その操作を無視します"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"バウンスキーのしきい値"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"キーボードのキーが連続で押されても無視する時間を選択します"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"カスタム"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"カスタム値"</string>
     <string name="slow_keys" msgid="2891452895499690837">"スローキー"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"押されたキーが有効になるまでの時間を <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ミリ秒に設定します"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"押されたキーが有効になるまでの時間を設定します"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"固定キー"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ショートカットで複数のキーを同時に押すのではなく 1 つずつ押します"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"マウスキー"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"物理キーボードを使用してマウスを操作します"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"マウスキーを使用する"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"キーボードを使用してポインタを操作します"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"マウスの逆スクロール"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"上にスクロールすると、ページ下部に移動します"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"左右のボタンを入れ替える"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"左のマウスボタンを右のマウスボタンとして使用します"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> のマウスキー"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"<xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> キーを使用してマウスポインタを移動します"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"<xliff:g id="CLICK_LABEL">%s</xliff:g> キーを使用してマウスのメインボタンをクリックします"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> キーを使用して、マウスのメインボタンを長押しします"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"<xliff:g id="RELEASE_LABEL">%s</xliff:g> キーを使用してマウスのメインボタンを離します"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"<xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> キーを使用してスクロール モードを切り替えます。<xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> キーでビューを上、下、左、右にスクロールします"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> キーを使用して、マウスの 2 番目のボタンをクリックします"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"キーボード ショートカット"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ショートカットのリストを表示"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"仕事用プロファイルのキーボードとツール"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"デフォルト"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"タッチパッド"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"タッチパッドとマウス"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"マウス"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ポインタの速度、操作"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"タップしてクリック"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"タップによるドラッグ"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"右下をクリック"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"タッチパッドの右下をクリックするとオプションが表示されます"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ポインタの速度"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"3 本の指でタップ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ポインタの色"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ポインターの塗りつぶしを黒色に変更"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ポインターの塗りつぶしを緑色に変更"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"タッチパッド ジェスチャーを学ぶ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"トラックパッド, マウス, カーソル, スクロール, スワイプ, 右クリック, クリック, ポインタ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"右クリック, タップ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ミドルクリック"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"アシスタントを起動"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ホームに移動"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"戻る"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"最近使ったアプリを表示"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ホームに移動"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"タッチパッドを 3 本の指で上にスワイプします"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"戻る"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> の新しいキーを選択してください"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"物理キーボードのユーザー補助"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"固定キー、バウンスキー、マウスキー"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"キーの繰り返し"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"リピートまでの時間"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"リピート速度"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"キーを長押しすると、キーを離すまでその文字が繰り返されます"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"レイアウト: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"デフォルト"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"自動: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"プレビュー"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"標準オプション"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"言語"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"文字サイズ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕のサイズ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕スタイル"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"カスタマイズオプション"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景色"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"消費電力の調整"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"含まれているパッケージ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"アプリは正常に実行されています"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"バッテリーの交換をおすすめします"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"バッテリー容量と充電性能が低下しているため、バッテリーの交換をおすすめします。"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"バッテリー残量が少なくなっています"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"バッテリー セーバーを ON にしてバッテリーを長持ちさせます"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"バッテリー寿命の改善"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"この VPN の接続を解除しますか？"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"接続を解除"</string>
     <string name="vpn_version" msgid="6344167191984400976">"バージョン"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"バージョン <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN を削除"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"既存の VPN を置き換えますか？"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"常時接続 VPN を設定しますか？"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"「平日の午前 9 時から午後 5 時」"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"カレンダーの予定"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} がアクティブです}=2{{mode_1} と {mode_2} がアクティブです}=3{{mode_1}、{mode_2}、{mode_3} がアクティブです}other{{mode_1}、{mode_2}、他 # 個がアクティブです}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 個のモードを自動的に ON にできます}other{# 個のモードを自動的に ON にできます}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{サイレント モード}=1{{mode_1}}=2{{mode_1}、{mode_2}}other{{mode_1}、{mode_2}、{mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"未設定"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"無効"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"通知"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"期間"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"メッセージ、予定、リマインダー"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"サイレント モードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定の通知はミュートされます。ただしメッセージの設定を調整することで、友だち、家族などの連絡先からの着信をブロックせず通知できます。"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"完了"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"設定"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"通知を非表示＆通知音なし"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"通知音なし"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"通知は表示されず、通知音も鳴りません。スター付きの連絡先からの発信や同一発信者による再発信は許可されます。"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"（現在の設定）"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"サイレント モードの通知設定を変更しますか？"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"仕事用プロファイルの音"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"個人用プロファイルの音を使用"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"個人用プロファイルと同じ音を使用する"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ロック解除後、最後に使用していた画面に直接移動します。ロック画面に通知は表示されません。通知を表示するには、画面上端から下にスワイプしてください。"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ロック 画面, ロック画面, スキップ, バイパス"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"仕事用プロファイルのロック時"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ロック画面上の通知を最小限にする"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ロック画面上の通知を減らす"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ロック画面に新着の通知のみを表示する"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"以前表示された通知をロック画面から自動的に削除します"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ロック画面上の通知"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"会話、デフォルト、サイレントを表示する"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"デフォルト モードとサイレント モードの会話と通知を表示する"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"仕事用のすべての通知の内容を表示する"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"機密性の高い仕事の内容を非表示"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"デバイスがロックされている場合、プロファイル通知をどのように表示しますか？"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"短時間の間に通知が多く届いた場合に、最長 2 分間、デバイスが音量を下げて通知を最小限に抑えます。通話、アラーム、優先度の高い会話には影響しません。\n\nクールダウンの間に受信した通知は、画面上部から下にスワイプすると確認できます。"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"仕事用プロファイルに適用する"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"仕事用プロファイルのアプリに適用する"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"通知を一括表示"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ON"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"OFF"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"通知の一括表示を使用"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"静かな場所でも利用できるよう、似たテーマの通知はサイレントになり、まとめて表示されるようになります。この一括表示の設定はアプリ独自の通知設定より優先されます。"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ヘルパー サービス"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ヘルパー サービスとしての実行権限をリクエストしたインストール済みアプリはありません。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR サービスから <xliff:g id="SERVICE">%1$s</xliff:g> へのアクセスの許可"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"優先度の高い会話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"なし"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{なし}=1{1 件の会話}other{# 件の会話}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"会話の設定"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"割り込み可能な相手"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"サイレントにしているためアプリから通知されない状態でも、ここで選んだ人からのメッセージや着信は通知されます。"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"全員"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"連絡先"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"スター付きの連絡先"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"連絡先の設定"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"スター付きの連絡先の設定"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"なし"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"なし"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"アラーム"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g>（仕事用）"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"計算中…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"アプリの設定"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"アプリのオーバーライドを許可"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"割り込み可能なアプリ"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"モードの作成"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"カスタムモード"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"モード名"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"モード名を指定してください"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"アイコンを選択してください"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"カレンダーの予定"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"「おやすみ」のルーティン"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"車の運転中"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"全画面通知"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"このアプリからの全画面通知を許可する"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"デバイスがロックされているときに通知を全画面に表示することを、このアプリに許可します。アプリは全画面表示を、アラーム、着信、緊急通知などを目立たせるために使用することがあります。"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"システム環境設定の書き込み"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"このアプリにシステム設定の変更を許可する"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"この権限により、アプリはコアシステムの設定を変更できます。"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"メディア管理アプリ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"メディアの管理をアプリに許可する"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"許可した場合、このアプリは確認を求めずに、別のアプリが作成したメディア ファイルを変更、削除できるようになります。アプリにはファイルやメディアにアクセスする権限が必要です。"</string>
@@ -4396,12 +4477,19 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ジェスチャー"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"カメラをすばやく起動"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"電源ボタンを 2 回押して、カメラをすばやく起動できます。どの画面からでも操作できます。"</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"電源ボタンのダブルタップ"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"ダブルタップを使用する"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"電源ボタンのダブルタップ"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"カメラを起動する"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"カメラを開きます"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"ウォレットを開く"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"ウォレットを開きます"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ひねる動作で前後のカメラを切り替え"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ナビゲーション モード"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"2 ボタン ナビゲーション"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"アプリを切り替えるには、ホームボタンを上にスワイプします。すべてのアプリを表示するには、もう一度上にスワイプします。戻るには、[戻る] ボタンをタップします。"</string>
-    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"緊急情報と緊急通報"</string>
+    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"安全性と緊急情報"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"緊急 SOS、医療情報、アラート"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"ジェスチャー ナビゲーション"</string>
     <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"ホームに移動するには、画面の下部から上にスワイプします。アプリを切り替えるには、下から上にスワイプして長押ししてから離します。戻るには、左端または右端からスワイプします。"</string>
@@ -4793,11 +4881,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"衛星通信メッセージ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"衛星通信によりテキスト メッセージを送受信します。お客様のアカウントに含まれています。"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"衛星通信によりテキスト メッセージを送受信します。お客様のアカウントではご利用になれません。"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"衛星通信メッセージ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"衛星通信メッセージについて"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"衛星通信メッセージ, 衛星接続"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> について"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"対象の <xliff:g id="CARRIER_NAME">%1$s</xliff:g> アカウントの一部として、衛星通信によるテキスト メッセージの送受信を行えます"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> のプラン"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"衛星通信メッセージはお客様のアカウントに含まれています"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"お客様のアカウントはメッセージの送信が可能です"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"衛星通信メッセージはお客様のアカウントに含まれていません"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"詳細"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"仕組み"</string>
@@ -4805,10 +4893,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"お使いのスマートフォンを衛星通信に自動接続します。接続を最大限良好にするには、外に出て、空がよく見える場所に移動してください"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"スマートフォンが衛星通信に接続された後"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"テキスト メッセージは、緊急サービスを含め誰にでも送信できます。モバイル ネットワークが利用できる状態になると再接続されます。"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"衛星通信メッセージは、利用できるエリアが制限され、通常より時間がかかることがあります。天候やなんらかの構造物が、衛星通信の接続に影響することがあります。衛星通信による通話はご利用いただけませんが、緊急通報はつながる場合があります。\n\n変更内容がアカウントの [設定] に反映されるまでに時間がかかることがあります。詳しくは携帯通信会社にお問い合わせください。"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"衛星通信メッセージの詳細"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>は、利用できるエリアが制限され、通常より時間がかかることがあります。天候やなんらかの構造物が、衛星通信の接続に影響することがあります。衛星通信による通話はご利用いただけませんが、緊急通報はつながる場合があります。\n\n変更内容がアカウントの [設定] に反映されるまでに時間がかかることがあります。詳細については、<xliff:g id="CARRIER_NAME">%1$s</xliff:g> にお問い合わせください。"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> の詳細"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> を有効にできません"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> を有効にするには、衛星通信との接続を解除してください"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"衛星接続"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"衛星接続"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"衛星接続"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"衛星通信メッセージ"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"お客様のアカウントはデータの送信が可能です"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"衛星 SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"モバイル ネットワークや Wi-Fi ネットワークに接続できなくても、緊急サービスにメッセージを送信できます"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"衛星 SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"衛星 SOS について"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"モバイル ネットワークや Wi-Fi ネットワークに接続できなくても、緊急サービスにメッセージを送信して位置情報を共有できます。この機能は、常にあらゆる場所や状況で利用できるとは限りません。"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"緊急サービスに電話またはテキスト メッセージで通報します"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"緊急事態についての質問に回答します"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"手順に沿って衛星に接続します"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"モバイル ネットワークを利用できない場合、衛星 SOS を使用するためのオプションが表示されます"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"適切な支援を受けられるよう緊急サービスに回答が送信されます"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"つながったら、緊急サービスにメッセージを送信できます"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"デモを試す"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"衛星を介して緊急サービスにつながると、あなたの名前、メールアドレス、電話番号、位置情報、デバイス情報（IMEI、言語、モデル、バッテリー残量）、緊急連絡先情報が、緊急サービスおよび衛星サービス プロバイダと共有されます。\n\n衛星 SOS を使用するには、Google メッセージがデフォルトの SMS アプリに設定されている必要があります。\n\nネットワークの自動選択が無効になっている場合は有効になり、デバイスは自動的にネットワークに接続されます。"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"共有の設定"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"緊急連絡先"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google アカウント"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"緊急サービスと共有する情報を確認、更新します"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"アクセス ポイント名"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> への接続時は利用できません"</string>
@@ -4995,6 +5106,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"16KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、4KB モードに戻してから、デバイスのブートローダーをロックする必要があります。この操作で、デバイスは再び出荷時の設定にリセットされ、製品版の設定に復元されます。デバイスが Android で起動したら、開発者向けオプションで [OEM のロック解除] を無効にします。デバイスが Android で起動しなかった場合や不安定な場合は、&lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; の最新のファクトリー イメージでデバイスの再書き込みを行うか、&lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; を使用し、[Wipe Device]、[Lock Bootloader]、[Force Flash all partitions] を選択してください。"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB のページ非依存モード"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"詳細"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ページサイズ互換モードでアプリを実行する"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"バグレポート ハンドラ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"デバイスでバグレポートのショートカットを処理するアプリを選択します。"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"個人用"</string>
@@ -5160,8 +5274,8 @@
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB を使用するには機内モードを OFF にしてください"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"現在の場所では UWB は利用できません"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
-    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread を使用"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread を使用すると、スマートホーム デバイスを接続して、効率とパフォーマンスを高めることができます。\n\nこのデバイスを有効にすると、Thread ネットワークに接続して、このスマートフォンから Matter 対応デバイスを管理できるようになります。"</string>
+    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread を使用する"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread を使用すると、スマートホーム デバイスを接続して、効率とパフォーマンスを高めることができます。\n\nこの設定を有効にすると、Thread ネットワークに接続して、このスマートフォンから Matter 対応デバイスを管理できるようになります。"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread の詳細"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"カメラへのアクセス"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"マイクへのアクセス"</string>
@@ -5433,7 +5547,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ストリームを聴く"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>で聴くには、音声ストリームの QR コードをスキャンします"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"共有中はパスワードを編集できません。パスワードを変更するには、まず音声の共有を OFF にしてください。"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"パスワードは英字、数字、記号のみを使用し、4～16 文字で指定してください"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR コードスキャナ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ご不明な点がある場合"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"設定を検索"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"連絡先, ストレージ, アカウント"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"連絡先アプリのストレージ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"デバイスのみ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新しい連絡先はアカウントと同期されません"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"デフォルトでは、連絡先はデバイスに保存されて、アカウントと同期されます"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"デフォルトのアカウントの設定中にエラーが発生しました"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"デフォルトは設定されていません"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"デバイスのみ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"デバイスと %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"開始するにはアカウントを追加してください"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"連絡先の保存先"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"かこって検索"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ホームボタンまたはナビゲーション ハンドルを長押しすると、画面上のコンテンツを使って検索できます。"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index cd428c12807..ba848ad26b6 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ფიფქი"</item>
     <item msgid="7952183800501346803">"სანაპიროს ქოლგა"</item>
     <item msgid="799139025758265891">"სახელოსნოს ხელსაწყოები"</item>
-    <item msgid="1330084588359129896">"კარავი"</item>
+    <item msgid="8112685757657659269">"პიანინო"</item>
     <item msgid="3861584909935022342">"კინოკადრი"</item>
     <item msgid="5827426100157335512">"დაჯავშნა"</item>
     <item msgid="8585828346253128384">"ლოტოსის ყვავილი"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 7c16fa82a5f..2212cb7865d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ხვალ ავტომატურად ჩართვა"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"თუ Bluetooth-ს გამორთავთ, ის მეორე დღეს ხელახლა ჩაირთვება"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"დააწყვილეთ მარჯვენა დინამიკი"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"მარცხენა დინამიკის დაკავშირება"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"დააწყვილეთ სხვა დინამიკი"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE-აუდიოს გათიშვა"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Bluetooth LE AUDIO-ს ფუნქცია ითიშება, თუ მოწყობილობას აქვს LE AUDIO-ს აპარატურული გარჩევადობები."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE-აუდიო რეჟიმი"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE-აუდიო ტრანსლაციის ინტერფეისის გადახედვის ჩართვა"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"რთავს LE-აუდიოს გაზიარების ინტერფეისის გადახედვას, მათ შორის, პერსონალურ აუდიოს გაზიარებასა და პირად ტრანსლაციას"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE-აუდიო გადართვის ჩვენება მოწყობილობის დეტალებში"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE-აუდიოს დაშვებულთა სიისთვის გვერდის ავლა"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"გამოიყენეთ LE-აუდიო ნაგულისხმევი სახით, თუნდაც LE-აუდიო პერიფერიული მოწყობილობა არ შეესაბამებოდეს დაშვებულთა სიის კრიტერიუმს."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"აპის ენა"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"შემოთავაზებული ენები"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ყველა ენა"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"შემოთავაზებული"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ყველა ენა"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ყველა რეგიონი"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ნუმერაციის ყველა სისტემა"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"სისტემის ენა"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"სისტემის ნაგულისხმევი"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ამ აპისთვის ენის არჩევა პარამეტრებიდან მიუწვდომელია."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"შეცვლა"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s მიუწვდომელია"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ამ ენის სისტემური ენის სახით გამოყენება შეუძლებელია, მაგრამ აპებს და ვებსაიტებს საშუალება მიეცით, იცოდნენ, რომ ამ ენას ანიჭებთ უპირატესობას."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ძიება"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ენის დამატება"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"რეგიონის პარამეტრები"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"აკრიფეთ ენის სახელი"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ენის დამატებითი პარამეტრები"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"რეგიონული პარამეტრები"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"რაოდენობის და საზომი ერთეულების პარამეტრების დაყენება"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"აცნობეთ აპებს თქვენი რეგიონული პარამეტრების შესახებ, რათა მათ თქვენი გამოცდილების პერსონალიზება შეძლოს."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"აპები საჭიროებისამებრ გამოიყენებს თქვენს რეგიონულ პარამეტრებს."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"რეგიონული პარამეტრები"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ტემპერატურა"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"კვირის პირველი დღე"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ნომრების უპირატესობები"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"როუმინგის დროს მონაცემთა სერვისებთან დაკავშირება"</string>
     <string name="roaming_disable" msgid="729512894708689604">"როუმინგის დროს ინტერნეტ სერვისებთან დაკავშირება"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"შეიძლება მოგიწიოთ როუმინგის საფასურის გადახდა."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"დროის ავტომატურად დაყენება"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ავტომატურად დაყენება"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"როცა ეს გადამრთველი ჩართულია, მდებარეობა გამოიყენება სასაათო სარტყლის დაყენებისთვის"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ავტომატური თარიღი და დრო"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ავტომატურად დაყენება თქვენი ქსელის და უსადენო სიგნალების გამოყენებით"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ავტომატური სასაათო სარტყელი"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ავტომატურად დაყენება თქვენთან ახლომდებარე მობილურ ქსელებზე დაყრდნობით"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ავტომატურად დაყენება მოწყობილობის მდებარეობით, თუ ხელმისაწვდომია"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ლოკალის ნაგულისხმევი პარამეტრის გამოყენება"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-საათიანი ფორმატი"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"დრო"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"თითი აიღეთ და შემდეგ ხელახლა შეეხეთ სენსორს"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"თითის ანაბეჭდის სენსორის გამოყენება შეუძლებელია"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ეწვიეთ შეკეთების სერვისის პროვაიდერს."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"გამორთული ეკრანის ანაბეჭდით განბლოკვა"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"გამოიყენეთ ანაბეჭდით განბლოკვა მაშინაც კი, როდესაც ეკრანი გამორთულია"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"გამორთული ეკრანი, განბლოკვა"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"უსაფრთხოების მეტი პარამეტრი"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"სამსახურის პროფილის დაბლოკვა, დაშიფვრა და სხვა"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"დაშიფვრა, ავტორიზაციის მონაცემები და სხვა"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"დააყენეთ ნიმუში თქვენი კერძო სივრცისთვის"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ჩაკეტვა"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"დამალვა"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"დაადასტურეთ თქვენი კერძო სივრცის ნიმუში"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ხელახლა შეიყვანეთ თქვენი კერძო სივრცის PIN-კოდი"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ხელახლა შეიყვანეთ თქვენი კერძო სივრცის პაროლი"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> თითის ანაბეჭდი"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"თქვენ უკვე დაამატეთ თითის ანაბეჭდების მაქსიმალური რაოდენობა"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"მეტი თითის ანაბეჭდის დამატება ვერ ხერხდება"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ჩართული"</string>
     <string name="external_display_off" msgid="5634413756025351374">"გამორთული"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"გარე ეკრანი"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"ჩაშენებული ეკრანი"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"გარე ეკრანის გამოყენება"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ეკრანის გარჩევადობა"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"გარე ეკრანთან კავშირი გაწყვეტილია"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"შეტრიალების ან გარჩევადობის შეცვლამ შეიძლება შეწყვიტოს მიმდინარე აპების მუშაობა"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"თქვენი მოწყობილობა დაკავშირებული უნდა იყოს გარე ეკრანთან, რათა თქვენი ეკრანის გამოსახულების ასლი შეიქმნას"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"სხვა ვარიანტები"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ჩავლებით გადაიტანეთ ეკრანების თანმიმდევრობის გადასაწყობად."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ტრანსლირება"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"გამოსახულების ასლი"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"უსადენო ეკრანის ჩართვა"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"გადაამოწმეთ პაროლი და ცადეთ ხელახლა"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"დაუკავშირდით მოწყობილობის მწარმოებელს"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"შეამოწმეთ კავშირი და ცადეთ ხელახლა"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ეს Wi-Fi ქსელი ამჟამად მიუწვდომელია"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ამ QR კოდს პრობლემა აქვს. ცადეთ დაკავშირება სხვა გზით."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"აირჩიეთ ქსელი"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"თქვენი მოწყობილობის დასაკავშირებლად აირჩიეთ ქსელი"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"გსურთ, დაამატოთ ეს მოწყობილობა „<xliff:g id="SSID">%1$s</xliff:g>“-ს?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"შეიტყვეთ მეტი ავტომატური შეტრიალების შესახებ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ეკრანის გარჩევადობა"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"მაღალი გარჩევადობა"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"სრული გარჩევადობა"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"სრული გარჩევადობა მეტად მოიხმარს ბატარეას. თქვენი გარჩევადობის გადართვამ შეიძლება გამოიწვიოს ზოგიერთი აპის გადატვირთვა."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"მაქსიმალური გარჩევადობა"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"მაქსიმალური გარჩევადობა მეტად მოიხმარს ბატარეას. გარჩევადობის გადართვამ შეიძლება გამოიწვიოს ზოგიერთი აპის გადატვირთვა."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"არჩეულია"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ფერები"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ბუნებრივი"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ადაპტაციური"</string>
     <string name="brightness" msgid="6216871641021779698">"სიკაშკაშის დონე"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"მორგებადი სიკაშკაშე"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"მორგებადი სიკაშკაშის შესახებ"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"თქვენი ეკრანის სიკაშკაშე ავტომატურად დარეგულირდება თქვენი გარემოსა და აქტივობების გათვალისწინებით. ამ სლაიდერის ამოძრავებას ხელითაც შეძლებთ, რითაც დაეხმარებით მორგებადი სიკაშკაშის პარამეტრს, შეიტყოს, თუ რას ანიჭებთ უპირატესობას."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ჩართული"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"გამორთული"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ძილის დროის რეჟიმის პარამეტრები"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{რეჟიმებმა შეიძლება მუქი თემაც გაააქტიუროს}=1{{mode_1} ასევე ააქტიურებს მუქ თემას}=2{{mode_1} და {mode_2} ასევე ააქტიურებს მუქ თემას}=3{{mode_1}, {mode_2} და {mode_3} ასევე ააქტიურებს მუქ თემას}other{{mode_1}, {mode_2} და # სხვა ასევე ააქტიურებს მუქ თემას}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"რეჟიმების პარამეტრები"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"უფრო მეტად დაბნელება"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"დამატებითი დაბინდვა"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ჩვეულებრივზე უფრო მეტად დააბნელეთ მოწყობილობა"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ეკრანის დროის ლიმიტი"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> უმოქმედობის შემდეგ"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"აპებისა და სერვისებისთვის სკანირების ნებართვის მინიჭება ახლომდებარე მოწყობილობების ნებისმიერ დროს აღმოსაჩენად, მაშინაც კი, როცა Bluetooth გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"მდებარეობის სერვისები"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"მდებარეობის სერვისები"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"მდებარეობის გამოყენება"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"მდებარეობის გამოყენება სასაათო სარტყელისთვის"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"სასაათო სარტყლის ავტომატურად დაყენება შეუძლებელია"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"მდებარეობა ან მდებარეობის სერვისები გამორთულია"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"მდებარეობის პარამეტრები"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"გაასწორეთ ეს"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"გაუქმება"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ავტომატური სასაათო სარტყელი გამორთულია"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"არ არის ხელმისაწვდომი, როცა ავტომატური სასაათო სარტყელი გამორთულია"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"სასაათო სარტყლის დასაყენებლად მდებარეობა გამოიყენება"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"თუ თქვენი მოწყობილობის მდებარეობა ხელმისაწვდომია, ის შეიძლება გამოყენებულ იქნას თქვენი სასაათო სარტყელის დაყენებისთვის"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"იხილეთ სამართლებრივი ინფორმაცია, სტატუსი, პროგრამული უზრუნველყოფის ვერსია"</string>
     <string name="legal_information" msgid="7509900979811934843">"იურიდიული ინფორმაცია"</string>
     <string name="manual" msgid="3651593989906084868">"სახელმძღვანელო"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ვარიანტები"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"წვდომა"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ფიზიკური კლავიატურა"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"კლავიშების ასხლეტა"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"კლავიატურა აიგნორებს <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> მილიწამის განმავლობაში ერთსა და იმავე კლავიშზე სწრაფ, განმეორებით დაჭერებს"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"კლავიატურა აიგნორებს ერთსა და იმავე კლავიშზე სწრაფ, განმეორებით დაჭერებს"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"კლავიშების ასხლეტის ზღურბლი"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"აირჩიეთ დროის ხანგრძლივობა, რომლის განმავლობაშიც თქვენი კლავიატურა აიგნორებს კლავიშის განმეორებით დაჭერას"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 წმ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 წმ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 წმ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"მორგებული"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"მორგებული მნიშვნელობა"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ნელი კლავიშები"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"არეგულირებს დროს, რომელიც სჭირდება კლავიშის დაჭერას <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> მილიწამამდე აქტივაციისთვის"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"არეგულირებს დროს, რომელიც სჭირდება კლავიშის დაჭერას აქტივაციისთვის"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"კლავიშების ფიქსაცია"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"მალსახმობებისთვის დააჭირეთ კლავიშებს ცალ-ცალკე და არა ერთდროულად"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"მაუსის კლავიშები"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"მაუსის სამართავად გამოიყენეთ ფიზიკური კლავიატურა"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"მაუსის კლავიშების გამოყენება"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"თქვენი კლავიატურის გამოყენება კურსორის სამართავად"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"მაუსით უკუგადაადგილება"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ზემოთ გადაადგილება გვერდის ჩამოსაწევად"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"მარცხენა და მარჯვენა ღილაკების ფუნქციის გაცვლა"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"გამოიყენეთ მაუსის მარცხენა ღილაკი მარჯვენის ფუნქციით"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>-ის მაუსის კლავიშები"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"გამოიყენეთ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> კლავიშები მაუსის კურსორის გადასაადგილებლად"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"გამოიყენეთ <xliff:g id="CLICK_LABEL">%s</xliff:g> კლავიში მაუსის ძირითად ღილაკზე დასაწკაპუნებლად"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> კლავიშის გამოყენება მაუსის ძირითად ღილაკზე ხანგრძლივად დასაჭერად"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"<xliff:g id="RELEASE_LABEL">%s</xliff:g> კლავიშის გამოყენება მაუსის ძირითადი ღილაკის ასაშვებად"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"<xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> კლავიშის გამოყენება გადაადგილების რეჟიმის გადასართავად. ეს საშუალებას მისცემს <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> კლავიშებს გადააადგილოს ხედი ზემოთ, ქვემოთ, მარცხნივ ან მარჯვნივ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> კლავიშის გამოყენება მაუსის მეორეულ ღიკალზე დასაწკაპუნებლად"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"კლავიატურის მალსახმობები"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"მალსახმობების სიის ჩვენება"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"სამსახურის პროფილის კლავიატურა და ხელსაწყოები"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ნაგულისხმევი"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"სენსორული პანელი"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"სენსორული პანელი და მაუსი"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"მაუსი"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"კურსორის სიჩქარე, ჟესტები"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"შეხებით დაწკაპუნება"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"შეხებით გადატანა"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ქვედა მარჯვენა დაწკაპუნება"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"დამატებითი ვარიანტებისთვის დააწკაპუნეთ სენსორული პანელის ქვედა მარჯვენა კუთხეში"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"მანიშნებლის სიჩქარე"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"სამი თითის შეხების გამოყენება"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"კურსორის ფერი"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"კურსორის სტილის შეცვლა შავად"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"კურსორის სტილის შეცვლა მწვანედ"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"გაეცანით სენსორული ეკრანის ჟესტებს"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ტრეკპედი, ტრეკ პედი, მაუსი, კურსორი, გადაადგილება, გადაფურცვლა, მარჯვენა დაწკაპუნება, დაწკაპუნება, მანიშნებელი"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"მარჯვენა დაწკაპუნება, შეხება"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"შუა დაწკაპუნება"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"ასისტენტის გაშვება"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"მთავარზე გადასვლა"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"უკან დაბრუნება"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ბოლო აპების ნახვა"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"მთავარზე გადასვლა"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"სენსორ. პანელზე სამი თითით გადაფურცლეთ ნებისმ. მიმართულებით"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"უკან დაბრუნება"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"აირჩიეთ ახალი კლავიში <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-ისთვის:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ფიზიკური კლავიატურის მისაწვდომობა"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"კლავიშების ფიქსაცია, მრავალჯერადი დაჭერის შეზღუდვა კლავიშებზე, მაუსის კლავიშები"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"განმეორებადი კლავიშები"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"დაყოვნება განმეორებამდე"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"გამეორების სიხშირე"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ხანგრძლივად დააჭირეთ კლავიშზე, რათა განმეორებით აიკრიფოს სიმბოლო, სანამ კლავიშიდან თითს აიღებთ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> განლაგება"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ნაგულისხმევი"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ავტომატური: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"წინასწარ ნახვა"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"სტანდარტული პარამეტრები"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ენა"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ტექსტის ზომა"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"სუბტიტრების ზომა"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ტიტრის სტილი"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"მორგებული პარამეტრები"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ფონის ფერი"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ენერგიის მოხმარების მორგება"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"შესული პაკეტები"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"აპები გაშვებულია ჩვეულებრივად"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"რეკომენდებულია ბატარეის გამოცვლა"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ბატარეის ტევადობა და დატენის ეფექტურობა შემცირებულია და რეკომენდებულია ბატარეის გამოცვლა."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ბატარეა იცლება"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ჩართეთ ბატარეის დამზოგი ბატარეის მუშაობის გასახანგრძლივებლად"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ბატარეის მუშაობის ხანგრძლივობის გაუმჯობესება"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"გსურთ ამ VPN-თან კავშირის გაწყვეტა?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"კავშირის გაწყვეტა"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ვერსია"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ვერსია <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN-ის დავიწყება"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"გსურთ არსებული VPN-ის ჩანაცვლება?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"გსურთ ყოველთვის ჩართული VPN-ის დაყენება?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„09:00 —17:00, კვირის დღეები“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"კალენდრის მოვლენები"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} აქტიურია}=2{{mode_1} და {mode_2} აქტიურია}=3{{mode_1}, {mode_2} და {mode_3} აქტიურია}other{{mode_1}, {mode_2} და # სხვა აქტიურია}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 რეჟიმი შესაძლოა ჩაირთოს ავტომატურად}other{# რეჟიმი შესაძლოა ჩაირთოს ავტომატურად}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{არ შემაწუხოთ}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2} და {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ჩართული"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"არ არის დაყენებული"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"გათიშულია"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"გასაგებია"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"შეტყობინებები"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ხანგრძლივობა"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"შეტყობინებები, მოვლენები და შეხსენებები"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"მზადაა"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"პარამეტრები"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"უხილავი და უხმო შეტყობინებები"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"შეტყობინებები ხმის გარეშე"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"შეტყობინებები იქნება უხილავი და უხმო. ვარსკვლავით მონიშნული კონტაქტები და აბონენტებისგან განმეორებითი ზარები დაშვებულია."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(მიმდინარე პარამეტრი)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"გსურთ, შეცვალოთ „არ შემაწუხოთ“ რეჟიმის შეტყობინებათა პარამეტრები?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"სამსახურის პროფილის ხმები"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"პირადი პროფილის ხმების გამოყენება"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"გამოიყენეთ იგივე ხმები, რომლებსაც თქვენს პირად პროფილზე იყენებთ"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"განბლოკვის შემდეგ პირდაპირ გადადით ბოლოს გამოყენებულ ეკრანზე. ჩაკეტილ ეკრანზე შეტყობინებები არ გამოჩნდება. გადაფურცლეთ ზემოდან ქვემოთ მათ სანახავად."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ჩაკეტილი ეკრანი, დაბლოკილი ეკრანი, გამოტოვება, გვერდის ავლა"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"დაბლოკილი სამს.პროფილისას"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ჩაკეტილი ეკრანის შეტყობინების მინიმალიზაცია"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ნაკლები შეტყობინების ჩვენება ჩაკეტილ ეკრანზე"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ჩაკეტილ ეკრანზე მხოლოდ ახალი შეტყობინებების ჩვენება"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"წინათ ნანახი შეტყობინებების ჩაკეტილი ეკრანიდან ავტომატურად ამოშლა"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"შეტყობინებები ჩაკეტილ ეკრანზე"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"მიმოწერების, ნაგულისხმევისა და ჩუმის ჩვენება"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"მიმოწერების, ნაგულისხმევისა და ჩუმის ჩვენება"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"სამსახურის შეტყობინებების მთელი კონტენტის ჩვენება"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"სამსახურის სენსიტიური კონტენტის დამალვა"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"აირჩიეთ ჩაკეტილ მოწყობილობაზე პროფილის შეტყობინებების ჩვენების რეჟიმი."</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"როცა მცირე დროის განმავლობაში ბევრ შეტყობინებას იღებთ, თქვენი მოწყობილობა ხმას დაუწევს და მინიმალურამდე შეამცირებს ეკრანზე ამომხტარ გაფრთხილებებს ორ წუთამდე დროის განმავლობაში. თქვენი მოწყობილობის ხმა და გაფრთხილებები ავტომატურად მცირდება 2 წუთამდე, როცა ძალიან ბევრ შეტყობინებას მიიღებთ ერთდროულად. ზარებზე, მაღვიძარებსა და პრიორიტეტულ საუბრებზე ეს გავლენას არ ახდენს. \n\nგანტვირთვის პერიოდის განმავლობაში მიღებული შეტყობინებების ნახვა შესაძლებელია ეკრანის ზემოდან ქვემოთ ჩამოწევით."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"გავრცელდეს სამსახურის პროფილზე"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"სამსახურის პროფილის აპებზე გავრცელება"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"დაჯგუფებული შეტყობინებები"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ჩართული"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"გამორთული"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"შეტყობინებების დაჯგუფების გამოყენება"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"მსგავსი თემატიკის შეტყობინებები დადუმდება და დაჯგუფდება, რათა ნაკლებად შეწუხდეთ. დაჯგუფება უგულებელყოფს უშუალოდ აპის შეტყობინების პარამეტრებს."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ვირტ. რეალობის დამხმარე სერვისები"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ვირტუალური რეალობის დამხმარე სერვისად გაშვება არცერთ დაინსტალირებულ აპს არ მოუთხოვია."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"გსურთ ვირტუალური რეალობის სერვისისთვის <xliff:g id="SERVICE">%1$s</xliff:g>-ზე წვდომის დაშვება?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"პრიორიტეტული საუბრები"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"არცერთი"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{არცერთი}=1{1 მიმოწერა}other{# მიმოწერა}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"საუბრების პარამეტრები"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ვის შეუძლია შეწყვეტა"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"თუ შეტყობინებებისა და ზარების მიმოცვლის აპებისგან ვერ მიიღებთ შეტყობინებებს, თქვენ მიერ აქ არჩეული ადამიანები მაინც მოახერხებენ თქვენთან დაკავშირებას ამ აპების მეშვეობით"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ზარები"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ნებისმიერი"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"კონტაქტები"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ვარსკვლავით მონიშნული კონტაქტები"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"კონტაქტების პარამეტრები"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ვარსკვლავით მონიშნული კონტაქტების პარამეტრები"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"არცერთი"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"არცერთი"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"მაღვიძარები"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (სამუშაო)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"მიმდინარეობს გამოთვლა…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"აპების პარამეტრები"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"აპებისთვის უგულებელყოფის დაშვება"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"აპები, რომლებსაც შეწყვეტა შეუძლია"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"რეჟიმის შექმნა"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"მორგებული რეჟიმი"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"რეჟიმის სახელი"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"რეჟიმის სახელი ვერ იქნება ცარიელი"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"აირჩიეთ ხატულა"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"კალენდრის მოვლენები"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ძილისწინა რუტინა"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"მანქანის მართვისას"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"სრული ეკრანის შეტყობინებები"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ამ აპიდან შეტყობინებების დაშვება სრულ ეკრანზე"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ნება დართეთ ამ აპს, აჩვენოს შეტყობინებები, რომლებიც სრულ ეკრანს იკავებს, როდესაც მოწყობილობა ჩაკეტილია. აპმა ისინი შეიძლება გამოიყენოს გამაფრთხილებელი სიგნალების და შემომავალი ზარების გამოყოფისთვის ან სხვა გადაუდებელი შეტყობინებებისთვის."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"სისტემის პარამეტრების დაწერა"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ამ აპისთვის სისტემის პარამეტრების თქვენი სახელით შეცვლის უფლების მიცემა"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ეს ნებართვა აპს სისტემის ძირითადი პარამეტრების შეცვლის საშუალებას აძლევს."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"მედიის მართვის აპები"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"აპისთვის მედიის მართვის ნების დართვა"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"თუ დაუშვებთ, ამ აპს თქვენთვის უკითხავად შეუძლია სხვა აპებით შექმნილი მედიაფაილების შეცვლა ან წაშლა. აპს ფაილებზე და მედიაზე წვდომისთვის ნებართვა უნდა ჰქონდეს."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ჟესტები"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"კამერის სწრაფად გახსნა"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"კამერის სწრაფად გასახსნელად, დააჭირეთ ელკვების ღილაკს ორჯერ. მუშაობს ნებისმიერი ეკრანიდან."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"კამერის ამობრუნება სელფისთვის"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ნავიგაციის რეჟიმი"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"შეტყობინებების სატელიტური მიმოცვლა"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"მიიღეთ და გაგზავნეთ ტექსტური შეტყობინებები სატელიტის მეშვეობით. არ შედის თქვენს ანგარიშში."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"მიიღეთ და გაგზავნეთ ტექსტური შეტყობინებები სატელიტის მეშვეობით. არ შედის თქვენს ანგარიშში."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"შეტყობინებების სატელიტური მიმოცვლა"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"სატელიტური შეტყობინებების მიმოცვლის შესახებ"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"შეტყობინებების სატელიტური მიმოცვლა, სატელიტური კავშირი"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g>-ის შესახებ"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"თქვენ, როგორც მოთხოვნის შესაბამისი <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ის ანგარიშის წევრს, შეგიძლიათ სატელიტის მეშვეობით გააგზავნოთ და მიიღოთ ტექსტური შეტყობინებები."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"თქვენი <xliff:g id="CARRIER_NAME">%1$s</xliff:g> გეგმა"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"შეტყობინებების სატელიტური მიმოცვლის ფუნქცია შედის თქვენს ანგარიშში"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"თქვენი ანგარიში მოიცავს შეტყობინებების მიმოცვლას"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"შეტყობინებების სატელიტური მიმოცვლის ფუნქცია არ შედის თქვენს ანგარიშში"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"შეიტყვეთ მეტი"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"მუშაობის პრინციპი"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"თქვენი ტელეფონი ავტომატურად დაუკავშირდება სატელიტს. საუკეთესო კავშირისთვის იყავთ ისეთ ადგილას, სადაც ცის ნათელი ხედია."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"თქვენი ტელეფონის სატელიტთან დაკავშირების შემდეგ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"შეტყობინების ყველგან გაგზავნა შეგიძლიათ, მათ შორის გადაუდებელი დახმარების სამსახურებში. თქვენი ტელეფონი დაუკავშირდება მობილური ქსელს, მისი ხელმისაწვდომობის შემთხვევაში."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"შეტყობინებების სატელიტურ მიმოცვლას შეიძლება უფრო მეტი დრო დასჭირდეს და ხელმისაწვდომია მხოლოდ გარკვეულ ტერიტორიაზე. ამინდმა და გარკვეულმა კონსტრუქციებმა შეიძლება გავლენა მოახდინოს თქვენს კავშირზე სატელიტთან. სატელიტით დარეკვა მიუწვდომელია. გადაუდებელი ზარის განხორციელება მიანც შესაძლებელია.\n\nშესაძლოა გარკვეული დრო დასჭირდეს ანგარიშის პარამეტრების ცვლილებების ასახვას. დეტალური ინფორმაციისთვის მიმართეთ ოპერატორს."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"მეტი ინფორმაცია შეტყობინებების სატელიტური მიმოცვლის შესახებ"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>-ს შეიძლება უფრო მეტი დრო დასჭირდეს და ხელმისაწვდომია მხოლოდ გარკვეულ ადგილებში. ამინდმა და გარკვეულმა კონსტრუქციებმა შეიძლება გავლენა მოახდინოს თქვენს კავშირზე სატელიტთან. სატელიტით დარეკვა მიუწვდომელია. გადაუდებელი ზარის განხორციელება მიანც შესაძლებელია.\n\nშესაძლოა გარკვეული დრო დასჭირდეს ანგარიშის პარამეტრების ცვლილებების ასახვას. დეტალებისთვის დაუკავშირდით: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"მეტი <xliff:g id="SUBJECT">%1$s</xliff:g>-ის შესახებ"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g>-ის ჩართვა ვერ ხერხდება"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g>-ის ჩასართავად ჯერ დაასრულეთ სატელიტური კავშირი"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"სატელიტური კავშირი"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"სატელიტური კავშირი"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"სატელიტური კავშირი"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"შეტყობინებების სატელიტური მიმოცვლა"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"თქვენი ანგარიში მოიცავს მონაცემების გამოყენებას"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"სატელიტური SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"გაუგზავნეთ შეტყობინება გადაუდებელი დახმარების სამსახურებს, როცა ვერ უკავშირდებით მობილურ ან Wi-Fi ქსელს"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"სატელიტური SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"სატელიტური SOS ფუნქციის შესახებ"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"გადაუდებელი დახმარების სამსახურებთან შეტყობინების გაგზავნა და თქვენი მდებარეობის გაზიარება შეგიძლიათ, როცა ვერ უკავშირდებით მობილურ ან Wi-Fi ქსელს. ეს სერვისი შეიძლება ყოველთვის არ იყოს ხელმისაწვდომი ყველა მდებარეობასა და შემთხვევაში."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"გადაუდებელი დახმარების სამსახურებთან დარეკვა ან შეტყობინების გაგზავნა"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"უპასუხეთ შეკითხვებს საგანგებო სიტუაციასთან დაკავშირებით"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"სატელიტთან დასაკავშირებლად მიჰყევით ნაბიჯებს"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"თუ მობილური ქსელით არ სარგებლობთ, დაინახავთ სატელიტური SOS ფუნქციის გამოყენების ვარიანტს"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"გაუგზავნეთ პასუხები გადაუდებელი დახმარების სამსახურებს, რათა მიიღოთ შესაბამისი დახმარება"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"გადაუდებელი დახმარების სამსახურებთან შეტყობინების გაგზავნას შეძლებთ დაკავშირების შემდეგ"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"დემოს ცდა"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"როდესაც გადაუდებელი დახმარების სამსახურებს სატელიტის მეშვეობით უკავშირდებით, გადაუდებელი დახმარების სამსახურებთან და სატელიტური სერვისის პროვაიდერებთან გაზიარდება თქვენი ელფოსტა, ტელეფონის ნომერი, მდებარეობა, მოწყობილობის ინფორმაცია (IMEI, ენა, მოდელი, ბატარეის დონე) და საგანგებო ვითარებაში საკონტაქტო პირის საკონტაქტო ინფორმაცია. \n\nსატელიტური SOS ფუნქციის გამოსაყენებლად საჭიროა, რომ Google Messages იყოს თქვენი ნაგულისხმევი SMS აპი. \n\nთუ ქსელის ავტომატური არჩევა გამორთულია, ჩაირთვება და თქვენი მოწყობილობა ავტომატურად დაუკავშირდება ნებისმიერ ქსელს."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"გაზიარების პარამეტრები"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"საგანგებო ვითარებაში საკონტაქტო პირები"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"თქვენი Google ანგარიში"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"გადაუდებელი დახმარების სამსახურებთან გასაზიარებელი ინფორმაციის მიმოხილვა და განახლება"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"წვდომის წერტილების სახელები"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"მიუწვდომელია, როცა დაკავშირებულია <xliff:g id="CARRIER">%1$s</xliff:g>-თან"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 16-კილობაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში ხელახლა შესასვლელად უნდა გადაერთოთ 4-კილობაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ მოწყობილობის ჩამტვირთავი. ეს მოწყობილობას კვლავ ქარხნულ პარამეტრებზე დააბრუნებს და შესაბამისად, აღადგენს მისი წარმოების პარამეტრებს. მოწყობილობის Android-ში წარმატებით ჩატვირთვის შემდეგ, დეველოპერთა პარამეტრებში გათიშეთ OEM-ის მხრიდან განბლოკვა. თუ მოწყობილობა ვერ იტვირთება Android-ში ან არასტაბილურია, განაახლეთ ჩაშენებული პროგრამული უზრუნველყოფა უახლესი ქარხნული იმიჯებით შემდეგი ბმულიდან: &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; და აირჩიეთ „მოწყობილობის წაშლა“, „ჩამტვირთავის ჩაკეტვა“ და „ყველა დანაყოფზე იძულებითი ჩატვირთვა“."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16-კბაიტიანი გვერდ-აგნოსტიკური რეჟიმი"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ვრცლად"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ამუშავეთ აპი გვერდის ზომის თავსებადობის რეჟიმში"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"სისტემის ხარვეზის ანგარიშის დამმუშავებელი"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"განსაზღვრავს, რომელი აპი მართავს სისტემის ხარვეზის ანგარიშის მალსახმობს თქვენს მოწყობილობაზე."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"პირადი"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ნაკადის მოსმენა"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"დაასკანირეთ აუდიო ნაკადის QR კოდი<xliff:g id="DEVICE_NAME">%1$s</xliff:g> მოწყობილობასთან ერთად მოსასმენად"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"გაზიარების დროს შეუძლებელია პაროლის რედაქტირება. პაროლის შესაცვლელად, პირველ რიგში, გამორთეთ აუდიოს გაზიარება."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"თქვენი პაროლი უნდა შეიცავდეს 4-16 სიმბოლოს და გამოყენებული იყოს მხოლოდ ასოები, ციფრები და სიმბოლოები"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR კოდის სკანერი"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"დახმარება გჭირდებათ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ძიების პარამეტრები"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"კონტაქტები, მეხსიერება, ანგარიში"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"კონტაქტების მეხსიერება"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"მხოლოდ მოწყობილობა"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ახალი კონტაქტები არ სინქრონიზდება ანგარიშთან"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"კონტაქტები შეინახება თქვენს მოწყობილობაში და სინქრონიზდება თქვენს ანგარიშთან ნაგულისხმევად"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ნაგულისხმევი ანგარიშის დაყენებისას წარმოიშვა შეცდომა"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ნაგულისხმევი ანგარიში დაყენებული არ არის"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"მხოლოდ მოწყობილობა"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"მოწყობილობა და %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"დასაწყებად დაამატეთ ანგარიში"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"სად მოხდეს კონტაქტების შენახვა"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ძიება წრის მოხაზვით"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ეკრანზე არსებული კონტენტის გამოყენებით ძიებისთვის ხანგრძლივად შეეხეთ მთავარი ეკრანის ღილაკს ან ნავიგაციის ზოლს."</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 4e7f4d00b52..5efc68b846c 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Ұлпа қар"</item>
     <item msgid="7952183800501346803">"Жағажай қолшатыры"</item>
     <item msgid="799139025758265891">"Шеберхана құралдары"</item>
-    <item msgid="1330084588359129896">"Шатыр"</item>
+    <item msgid="8112685757657659269">"Пианино"</item>
     <item msgid="3861584909935022342">"Кинопленка"</item>
     <item msgid="5827426100157335512">"Кітап"</item>
     <item msgid="8585828346253128384">"Лотос гүлі"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 94cd859e968..8c2acc168f9 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Жаңа құрылғымен жұптастыру"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ертең автоматты түрде қосу"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth-ты өшірсеңіз, ол келесі күні қайта қосылады."</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Оң құлақты жұптау"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Сол құлақты жұптау"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Екінші құлақты жұптау"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio функциясын өшіру"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Құрылғы LE Audio жабдық мүмкіндіктерін қолдайтын болса, Bluetooth LE Audio функциясы өшіріледі."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio режимі"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE аудио тарату пайдаланушы интерфейсінің алғы нұсқасын қосу"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"LE аудио бөлісу пайдаланушы интерфейсінің алғы нұсқасын, соның ішінде жеке аудио бөлісу және жеке тарату опцияларын қосады."</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE Audio ауыстырғышын \"Құрылғы туралы мәлімет\" бөлімінде көрсету"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bypass Bluetooth LE Audio рұқсат тізімін айналып өту"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio перифериялық құрылғысының рұқсат тізімі шарттарына сәйкес келуі расталмаса да, LE Audio әдепкісінше пайдаланылады."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Қолданба тілі"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Ұсынылған тілдер"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Барлық тіл"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Ұсынылған"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Барлық тіл"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Барлық аймақ"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Барлық нөмірлеу жүйесі"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Жүйе тілі"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Жүйенің әдепкі параметрі"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Бұл қолданба үшін \"Параметрлер\" бөлімінен тіл таңдау мүмкіндігі қолжетімсіз."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Ауыстыру"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s тілін пайдалану мүмкін емес"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Бұл тілді жүйе тілі ретінде пайдалану мүмкін емес, дегенмен қолданбалар мен веб-сайттарға осы тілді қалайтыныңыз туралы хабарладыңыз."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Іздеу"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Тіл қосу"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Аймақ параметрі"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Тіл атауын теріңіз"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Басқа да тіл параметрлері"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Аймақтық параметрлер"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Бірліктер мен сан параметрлерін орнату"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Қолданбалар сізге арнайы бейімделуі үшін, оларға аймақтық параметрлер туралы ақпарат алуға мүмкіндік беріңіз."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Мүмкіндік болғанда, қолданбалар аймақтық параметрлеріңізді пайдаланады."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Аймақтық параметрлер"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Аптаның бірінші күні"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Сан параметрлері"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Роуминг кезінде дерек тасымалдау қызметтеріне қосылу"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Роуминг кезінде дерек тасымалдау қызметтеріне қосылу"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Роуминг үшін ақы алынуы мүмкін."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Уақытты автоматты түрде орнату"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Автоматты түрде орнату"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Осы ауыстырғыш қосулы кезде, уақыт белдеуін орнату үшін локация пайдаланылады."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Күн мен уақытты автоматты түрде анықтау"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Желі мен сымсыз сигналдар арқылы автоматты түрде орнатылады."</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Aвтоматты уақыт белдеуі"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Маңайдағы мобильдік желілер бойынша автоматты түрде орнату"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Құрылғы локациясы (қолжетімді болса) арқылы автоматты түрде орнатылады."</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Жергілікті әдепкі формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сағаттық формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Уақыт"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Саусақты көтеріп, содан кейін сканерді қайтадан түртіңіз."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Саусақ ізін оқу сканерін пайдалану мүмкін емес"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Жөндеу қызметіне барыңыз."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Экран өшірулі кезде саусақ ізімен ашу"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Саусақ ізімен ашу функциясын экран өшіп тұрса да пайдалану"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Экран өшірулі кезде құлыпты ашу"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Басқа қауіпсіздік параметрлері"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Жұмыс профилін құлыптау, шифрлау және т. б."</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрлау, тіркелу деректері және т. б."</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Жеке кеңістік үшін өрнек орнату"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Құлыптау"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Жасыру"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Құпия кеңістігіңіздің өрнегін растаңыз"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Құпия кеңістігіңіздің PIN кодын қайта енгізіңіз"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Құпия кеңістігіңіздің құпия сөзін қайта енгізіңіз"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> саусақ ізіне дейін қосуға болады"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Саусақ іздерінің максималды саны енгізілді"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Қосымша саусақ іздері енгізілмейді"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Қосулы"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Өшірулі"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Сыртқы дисплей"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ендірілген дисплей"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Сыртқы дисплейді пайдалану"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Дисплей ажыратымдылығы"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Сыртқы дисплей ажыратылған."</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Бұру шамасын немесе ажыратымдылықты өзгертсе, қазір жұмыс істеп тұрған қолданбалар тоқтауы мүмкін"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Экран көшірмесін көрсету үшін құрылғы сыртқы дисплейге қосылуы керек."</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Басқа опциялар"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Дисплейлердің ретін өзгерту үшін басып тұрып, сүйреңіз."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"айна"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Сымсыз дисплейді қосу"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Құпия сөзді тексеріп, әрекетті қайталаңыз."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Құрылғы өндірушісіне хабарласыңыз."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Байланысты тексеріп, әрекетті қайталаңыз."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Бұл Wi-Fi желісі қазіргі уақытта қолжетімді емес."</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"QR кодына қатысты мәселе пайда болды. Басқа жолмен қосып көріңіз."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Желіні таңдау"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Құрылғыны жалғау үшін желіні таңдаңыз"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Құрылғы “<xliff:g id="SSID">%1$s</xliff:g>” желісіне қосылсын ба?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Автоматты бұру туралы толық ақпарат"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Экран ажыратымдылығы"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Жоғары ажыратымдылық"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Толық ажыратымдылық"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Толық ажыратымдылық батарея зарядын көбірек пайдаланады. Ажыратымдылықты ауыстырсаңыз, кейбір қолданбалар өшіп қосылады."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Ең жоғары ажыратымдылық"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Ең жоғары ажыратымдылық батарея зарядын көбірек пайдаланады. Ажыратымдылықты ауыстырсаңыз, кейбір қолданбалар өшіп қосылады."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Таңдалды."</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстер"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табиғи"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Бейімделеді"</string>
     <string name="brightness" msgid="6216871641021779698">"Жарықтық деңгейі"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Жарықтықты бейімдеу"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Жарықтықты бейімдеу туралы"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Экран жарықтығы қоршаған ортаға және әрекеттерге автоматты түрде бейімделеді. Жүгірткіні қолмен жылжытсаңыз, функция қалауыңызды ескеретін болады."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Қосулы"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Өшірулі"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"\"Ұйқы\" режимі параметрлері"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Қараңғы режим басқа режимдердің ықпалынан да қосылуы мүмкін.}=1{Қараңғы режим {mode_1} режимінің ықпалынан да қосылуы мүмкін.}=2{Қараңғы режим {mode_1} және {mode_2} режимдерінің ықпалынан да қосылуы мүмкін.}=3{Қараңғы режим {mode_1}, {mode_2} және {mode_3} режимдерінің ықпалынан да қосылуы мүмкін.}other{Қараңғы режим {mode_1}, {mode_2} және тағы # режимнің ықпалынан да қосылуы мүмкін.}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Режим параметрлері"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Жарықтығын бұрынғыдан азайту"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Экранды қарайту"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Құрылғы жарықтығын әдеттегіден азайтып пайдалану"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Экранның өшуі"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өшірулі болса да, қолданбалар мен қызметтерге маңайдағы құрылғыларды іздеуге рұқсат беріледі. Бұл параметрді, мысалы, локация функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Локация қызметтері"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Локация қызметтері"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Локацияны пайдалану"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Уақыт белдеуін орнату үшін локацияны пайдалану"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Уақыт белдеуі автоматты түрде орнатылмады"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Локация функциялары өшірулі."</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Локация параметрлері"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Жөндеу"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Бас тарту"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматты уақыт белдеуі өшірулі."</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Автоматты уақыт белдеуі өшірулі болғанда, қолжетімсіз."</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Уақыт белдеуін орнату үшін локация пайдаланылуы мүмкін."</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Құрылғы локациясы қолжетімді болса, ол уақыт белдеуін орнату үшін пайдаланылуы мүмкін."</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Заңнамалық ақпарат, күйін, бағдарлама нұсқасын қарау"</string>
     <string name="legal_information" msgid="7509900979811934843">"Құқықтық ақпарат"</string>
     <string name="manual" msgid="3651593989906084868">"Қолмен"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Опциялар"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Арнайы мүмкіндіктер"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физикалық пернетақта"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Физик. пернетақта схемасын таңдау"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Қайтару пернелері"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Пернетақта перненің <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мс ішінде жылдам қайталап басылғанын елемейді."</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Пернетақта бір перненің тез арада қайталап басылуын елемейді."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Пернелердің байқаусызда басылуын елемеу шегі"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Пернетақта пернелердің қайталап басылуын елемейтін уақыт ұзақтығын таңдаңыз."</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 с"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 с"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 с"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Арнаулы"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"арнаулы мән"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Баяу пернелер"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Перненің <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мс ішінде іске қосылуына қажетті уақытты реттейді."</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Басқаннан кейін перненің іске қосылу уақытын реттейді."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Бекітілген пернелер"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Жылдам пәрмендерді пайдалану үшін пернелерді бірге баспай-ақ, бір пернені бір рет бассаңыз болады."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Тінтуір пернелері"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Тінтуірді басқару үшін физикалық пернетақтаны пайдаланыңыз."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Тінтуір пернелерін пайдалану"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Меңзерді басқару үшін пернетақтаны пайдаланыңыз."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Тінтуірмен кері айналдыру"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Бетті төмен жылжыту үшін жоғары қарай айналдырыңыз."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Сол және оң жақ түймелердің орындарын ауыстырыңыз"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Тінтуірдің сол жақ түймесін оң жақ түйме ретінде пайдаланыңыз."</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"\"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>\" пернетақтасына арналған тінтуір пернелері"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Тінтуір меңзерін жылжыту үшін <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> пернелерін пайдаланыңыз."</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Негізгі тінтуір түймесін басу үшін <xliff:g id="CLICK_LABEL">%s</xliff:g> пернесін пайдаланыңыз."</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Негізгі тінтуір түймесін ұстап тұру үшін <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> пернесін пайдаланыңыз."</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Негізгі тінтуір түймесін жіберу үшін <xliff:g id="RELEASE_LABEL">%s</xliff:g> пернесін пайдаланыңыз."</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Айналдыру режимін қосу/өшіру үшін <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> пернесін пайдаланыңыз. Сол кезде <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> пернелері көріністі жоғары, төмен, солға немесе оңға айналдырады."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Қосымша тінтуір түймесін басу үшін <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> пернесін пайдаланыңыз."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Перне тіркесімдері"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Перне тіркесімдерінің тізімін көрсету"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Жұмыс профилі пернетақталары және құралдары"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Әдепкі"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сенсорлық тақта"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сенсорлық тақта мен тінтуір"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Тінтуір"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Меңзер жылдамдығы, қимылдар"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Басу үшін түрту"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Түртіп сүйреу"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Төменгі оң жақты басу"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Қосымша опцияларды көру үшін сенсорлық тақтаның төменгі оң жақ бұрышын басыңыз."</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Меңзер жылдамдығы"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Үш саусақпен түрту параметрін пайдалану"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Меңзер түсі"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Меңзердің бояу стилін қара түске өзгертеді."</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Меңзердің бояу стилін жасыл түске өзгертеді."</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Сенсорлық тақта қимылдарын үйрену"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"сенсорлық тақта, тінтуір, курсор, айналдыру, сырғыту, тінтуірдің оң жақ түймесін басу, басу, клик, меңзер"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"тінтуірдің оң жақ түймесін басу, түрту"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Ортасын басу"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant-ті іске қосу"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Негізгі бетке өту"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Артқа"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Соңғы қолданбаларды көру"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Негізгі экранға өту"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Үш саусақпен сенсорлық тақта бетінің кез келген жерінен жоғары сырғытыңыз."</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Артқа"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> жаңа пернесін таңдау:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Физикалық пернетақтаның арнайы мүмкіндіктері"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Бекітілген пернелер, серпімді пернелер, тінтуір пернелері"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Пернелерді қайталау"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Қайталау алдындағы кідіріс"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Қайталау жиілігі"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Пернені басып тұру арқылы таңбаны қайталап жазу"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> форматы"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Әдепкі"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматты: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Алғы көрініс"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартты опциялар"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Тіл"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Мәтін өлшемі"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Жазу өлшемі"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Субтитр стилі"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Реттеу опциялары"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Артқы фон түсі"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Қуат қолданысын бейімдеу"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Қамтылған орамдар"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Батареяны ауыстырған дұрыс"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Батарея сыйымдылығы мен зарядтау өнімділігі азайды, сондай-ақ батареяны ауыстырған жөн."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Батарея деңгейі төмен"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Батарея жұмысын ұзарту үшін батареяны үнемдеу режимін қосыңыз."</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Батарея жұмысын ұзартыңыз"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Осы VPN желісі ажыратылсын ба?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ажырату"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Нұсқа"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> нұсқасы"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ұмыту"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Бар VPN қолданбасын ауыстыру керек пе?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Әрқашан қосулы VPN режимін орнату"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00–17:00 жұмыс күндері\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Күнтізбедегі іс-шаралар"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} қосулы}=2{{mode_1} және {mode_2} қосулы}=3{{mode_1}, {mode_2} және {mode_3} қосулы}other{{mode_1}, {mode_2} және тағы # режим қосулы}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режимді автоматты түрде қосуға болады.}other{# режимді автоматты түрде қосуға болады.}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Мазаламау}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ҚОСУЛЫ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Орнатылмаған"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Өшірілді"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Түсінікті"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Хабарландырулар"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Ұзақтығы"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Хабарлар, іс-шаралар және еске салғыштар"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Мазаламау режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Дайын"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Параметрлер"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Хабарландырулар дыбыссыз беріледі"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Хабарландырулар көрсетілмейді не естілмейді. Жұлдызшалы және тұрақты контактілерден келетін қоңырауларға рұқсат етілген."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ағымдағы параметр)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Мазаламау режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Жұмыс профилінің дыбыстары"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Жеке профиль дыбыстарын пайдалану"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Жеке профильдегідей дыбыстарды пайдалану"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Құлыпты ашқан соң, бірден соңғы ашылған экранға өтесіз. Құлыптаулы экранда хабарландырулар көрсетілмейді. Оларды көру үшін жоғарыдан төмен сырғытыңыз."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Құлып экраны, құлыптаулы экран, өткізіп жіберу, өткізу"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Жұмыс профилі құлыпталғанда"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Құлып экранындағы хабарландыру минимализмі"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Құлып экранында хабарландыруларды аз көрсету"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Құлып экранында тек жаңа хабарландыруларды көрсету"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Құлыптаулы экраннан бұрын көрген хабарландыруларды автоматты түрде өшіру"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Құлып экранындағы хабарландыру"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Әңгімелерді (әдепкі және үнсіз) көрсету"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Барлық хабарландыруды көрсету"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Жұмыс хабарландыруын толық көрсету"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Маңызды жұмыс контентін жасыру"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Құрылғы бекітілген болса, профиль хабарландырулары қалай көрсетілуі керек?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Қысқа уақыт ішінде көп хабарландыру алған кезде, құрылғының дыбыс деңгейі азайтылып, хабарландырулар 2 минутқа дейін кідіртіледі. Бұл параметр қоңырауларға, оятқыштарға және маңызды әңгімелерге әсер етпейді. \n\nДыбысын азайту кезінде алынған хабарландыруларды экранның жоғарғы жағынан төмен тарту арқылы табуға болады."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Жұмыс профильдеріне қолдану"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Жұмыс профиліндегі қолданбаларға қолдану"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Топталған хабарландырулар"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Қосу"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Өшіру"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Хабарландыруларды топтау параметрін пайдалану"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Тыныш жұмыс істеу үшін тақырыптары ұқсас хабарландырулардың дыбысы өшіріліп, олар топталады. Топтау параметрі қолданбаның жеке хабарландыру параметрлерінің орнын басады."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Көмекші VR қызметтері"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнатылған қолданбалар көмекші VR қызметі ретінде қосылуға рұқсат сұраған жоқ."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR қызметіне <xliff:g id="SERVICE">%1$s</xliff:g> пайдалануға рұқсат берілсін бе?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"маңызды әңгімелер"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Жоқ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жоқ}=1{1 әңгіме}other{# әңгіме}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Әңгіме параметрлері"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Тоқтата алатындар"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Хабар алмасу немесе қоңырау шалу қолданбаларының хабарландырулары өшіп тұрса да, осында таңдаған адамдарыңыз сол қолданбалар арқылы сізге хабарласа алады."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Қоңыраулар"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Кез келген адам"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контактілер"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Жұлдызшалы контактілер"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Контакт параметрлері"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Жұлдызшалы контакт параметрлері"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ешқандай қоңырауға рұқсат жоқ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Жоқ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Оятқыштар"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (жұмыс)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Есептеліп жатыр…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Қолданба параметрлері"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Қолданбаларға қайта анықтауға рұқсат беру"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Тоқтата алатын қолданбалар"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Режим жасау"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Арнаулы режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Режим аты"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Режим атауы бос болмауы керек."</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Белгішені таңдау"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Күнтізбедегі іс-шаралар"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"\"Ұйқы\" режимі"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Көлік жүргізгенде"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Толық экран хабарландырулары"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Осы қолданбада хабарландыруларды толық экранда көрсетуге рұқсат беру"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Құрылғы құлыптаулы тұрғанда, осы қолданбаға хабарландыруларды толық экранда көрсетуге рұқсат беріледі. Соның арқасында қолданбалар оятқыштарды, кіріс қоңырауларын немесе шұғыл хабарландыруларды ерекшелей алады."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Жүйе параметрлерін жазу"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Бұл қолданбаға сіздің атыңыздан жүйе параметрлерін өзгертуге рұқсат беріңіз"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Бұл рұқсат қолданбаға негізгі жүйе параметрлерін өзгертуге мүмкіндік береді."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Мультимедианы басқару қолданбалары"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Қолданбаға мультимедианы басқаруға рұқсат ету"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Рұқсат берілсе, бұл қолданба осы құрылғыдағы басқа қолданбалар жасаған медиафайлдарды сізден сұрамай өзгерте немесе жоя алады. Файлдар мен медиафайлдарды пайдалану үшін қолданбаның рұқсаты болуы керек."</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Қимылдар"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Камераны жылдам ашу"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Камераны жылдам ашу үшін қуат түймесін екі рет басыңыз. Кез келген экраннан жұмыс істейді."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Алдыңғы камераға ауысу"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Навигация режимі"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Жерсерік қызметі арқылы хабар алмасу"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Жерсерік көмегімен мәтіндік хабарлар жіберуге және алуға болады. Бұл мүмкіндік аккаунтыңызда бар."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Жерсерік көмегімен мәтіндік хабарлар жіберуге және алуға болады. Аккаунтыңызға енгізілмеген."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Жерсерік қызметі арқылы хабар алмасу"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Жерсерік қызметі арқылы хабар алмасу туралы"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Жерсерік арқылы хабар алмасу, жерсерікке қосылу мүмкіндігі"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> туралы ақпарат"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> аккаунтыңыз жерсерік арқылы мәтіндік хабарларды жіберуге және алуға мүмкіндік береді."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> тарифтік жоспарыңыз"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Аккаунтыңызда жерсерік қызметі арқылы хабар алмасу мүмкіндігі бар"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Хабар алмасу аккаунтыңызға қосылған"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Аккаунтыңызда жерсерік қызметі арқылы хабар алмасу мүмкіндігі жоқ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Толық ақпарат"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Бұл қалай жұмыс істейді?"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Телефоныңыз автоматты түрде жерсерікке қосылады. Қосылу сапасы жоғары болуы үшін, аспан анық көрінетін жерде болыңыз."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Телефон жерсерікке қосылған соң"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Кез келген адамға, соның ішінде құтқару қызметтеріне мәтіндік хабар жібере аласыз. Мобильдік желі болған кезде, телефоныңыз оған қайта қосылады."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Жерсерік қызметі арқылы хабар алмасу көп уақытты алуы мүмкін және кейбір аймақтарда ғана істейді. Жерсерік байланысына ауа райы мен кейбір құрылыс объектілері әсер етуі мүмкін. Жерсерік арқылы қоңырау шалу мүмкін емес. Құтқару қызметіне бұрынғыша қоңырау шалуға болады.\n\nАккаунтқа енгізілген өзгерістердің параметрлерде шығуына біраз уақыт кетуі мүмкін. Мәлімет алу үшін операторға хабарласыңыз."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Жерсерік қызметі арқылы хабар алмасу туралы толық ақпарат"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> көп уақытты алуы мүмкін және кейбір аймақтарда ғана істейді. Жерсерік байланысына ауа райы мен кейбір құрылыс объектілері әсер етуі мүмкін. Жерсерік арқылы қоңырау шалу мүмкін емес. Құтқару қызметіне бұрынғыша қоңырау шалуға болады.\n\nАккаунтқа енгізілген өзгерістердің параметрлерде шығуына біраз уақыт кетуі мүмкін. \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" операторына хабарласып, толық мәлімет алыңыз."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> туралы толық ақпарат"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> функциясын өшіру мүмкін емес"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> функциясын қосу үшін алдымен жерсерік байланысын тоқтатыңыз."</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Жерсерікке қосылу мүмкіндігі"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Жерсерікке қосылу мүмкіндігі"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"жерсерікке қосылу мүмкіндігі"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"жерсерік арқылы хабар алмасу"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Деректерді пайдалану аккаунтыңызға қосылған"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satellite SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Мобильдік немесе Wi-Fi желісіне қосыла алмасаңыз, құтқару қызметтерімен хабар алмасуға болады."</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"Satellite SOS, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Satellite SOS туралы ақпарат"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Мобильдік немесе Wi-Fi желісіне қосыла алмасаңыз, құтқару қызметтерімен хабар алмасуға және локацияңызды бөлісуге болады. Бұл қызмет кез келген уақытта, кез келген локацияда немесе жағдайда қолжетімді бола бермейді."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Құтқару қызметтеріне қоңырау шалыңыз немесе мәтіндік хабар жіберіңіз."</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Төтенше жағдай туралы сұрақтарға жауап беріңіз."</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Жерсерікке қосылу үшін нұсқауларды орындаңыз."</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Егер сізде мобильдік желі болмаса, Satellite SOS қолдану опциясын көресіз."</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Қажетті көмек түрін алу үшін жауаптарыңызды құтқару қызметтеріне жіберіңіз."</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Құтқару қызметтерімен байланыс орнатқаннан кейін, хабар жіберуге болады."</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Демо нұсқаны пайдаланып көру"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Жерсерік арқылы құтқару қызметтеріне хабарласқан кезде атыңыз, электрондық мекенжайыңыз, телефон нөміріңіз, локацияңыз, құрылғы ақпараты (IMEI, тілі, моделі, батарея зарядының деңгейі) және төтенше жағдай контактісі туралы ақпарат осы құтқару қызметтеріне және жерсеріктік қызмет көрсетушілерге жіберіледі. \n\nSatellite SOS функциясын пайдалану үшін Google Messages-ді әдепкі SMS қолданбасы ретінде орнатыңыз. \n\nЕгер желіні автоматты түрде таңдау өшірулі болса, ол қосылады және құрылғыңыз кез келген желіге автоматты түрде қосылады."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Бөлісу параметрлері"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Төтенше жағдай контактілері"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google аккаунтыңыз"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Құтқару қызметтеріне жіберілетін ақпаратты қарап шығыңыз немесе жаңартыңыз."</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Кіру нүктесінің атауы"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторына қосылып тұрғанда қолжетімді емес"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Бет өлшеміне тәуелсіз режимдегі 16 КБ режимінде жұмыс істеп отырсыз. Бұл режимде бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашық кезде телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Бұл режимдерде кейбір функциялар өшірілетіндіктен, белгілі бір қолданбалар жұмыс істемеуі мүмкін. Жұмыс күйіне қайта оралу үшін 4 КБ режиміне қайта ауысып, құрылғының жүктегішін құлыптау керек. Мұндайда құрылғы қайтадан зауыттық параметрлерге қайтарылып, жұмыс параметрлері қалпына келтіріледі. Құрылғы Android жүйесіне жүктелгенде, \"Әзірлеуші опциялары\" параметрлерінен жүктегіш құлпын ашу параметрін өшіріңіз. Құрылғы Android жүйесіне жүктелмесе немесе дұрыс жұмыс істемесе, құрылғыны &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; немесе &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; сілтемесіндегі зауыттық образдармен қайта бағдарламалап, \"Құрылғыны тазарту\", \"Жүктегішті құлыптау\" және \"Барлық бөлікті бағдарламау\" опцияларын таңдаңыз."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Бетке тәуелсіз 16 КБ режимі"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Толық ақпарат"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Қолданбаны бет көлеміне сәйкес үйлесімді режимде іске қосу"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Қате туралы есеп өңдеу құралы"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Құрылғыдағы қате туралы есепті жіберу үшін жылдам әрекетпен қандай қолданба ашылатынын анықтайды."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Жеке"</string>
@@ -5159,10 +5280,10 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"UWB технологиясын пайдаланатын маңайдағы құрылғылардың қатысты орнын анықтауға көмектеседі."</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB технологиясын пайдалану үшін ұшақ режимі өшіріледі."</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Қазіргі локацияда кеңжолақты байланыс жоқ."</string>
-    <string name="thread_network_settings_title" msgid="4212301030523859220">"Тізбек"</string>
-    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Тізбекті пайдалану"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Тізбек желісі тиімділік мен өнімділік деңгейін арттырып, смарт үй құрылғыларын жалғауға көмектеседі.\n\nЕгер қосулы болса, бұл құрылғы Тізбек желісіне қосыла алады. Осылайша Matter стандартына қолдау көрсететін құрылғыларды осы телефон арқылы басқару мүмкін болады."</string>
-    <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Тізбек туралы толық ақпарат"</string>
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
+    <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread желісін пайдалану"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread смарт үй құрылғыларын өзара жалғап, тиімділік мен өнімділік деңгейін арттырады.\n\nЕгер қосулы болса, бұл құрылғы Thread желісіне қосыла алады. Осылайша Matter стандартына қолдау көрсететін құрылғыларды осы телефон арқылы басқаруға болады."</string>
+    <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread туралы толық ақпарат"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Камераны пайдалану"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Микрофонды пайдалану"</string>
     <string name="perm_toggle_description" msgid="5754629581767319022">"Қолданбалар мен қызметтерге арналған."</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Трансляцияны тыңдау"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Аудио трансляцияның QR кодын сканерлеп, құрылғымен (<xliff:g id="DEVICE_NAME">%1$s</xliff:g>) тыңдаңыз."</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Бөлісу кезінде құпия сөзді өзгертуге болмайды. Өзгерту үшін алдымен аудио бөлісу функциясын өшіріңіз."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Құпия сөзіңізде 4-16 таңба болуы керек және тек әріптерден, сандардан және символдардан тұруы керек."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR кодының сканері"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Көмек керек пе?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Параметрлерден  іздеу"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контактілер, жад, аккаунт"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Контактілер жады"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Тек құрылғы"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Жаңа контактілер аккаунтпен синхрондалмайды."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контактілер әдепкісінше аккаунтыңызбен синхрондалады және құрылғыңызға сақталады."</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Әдепкі аккаунт орнату кезінде қате шықты."</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Әдепкі аккаунт таңдалмаған."</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Құрылғы ғана"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Құрылғы және %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Бастау үшін аккаунт қосыңыз."</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Контактілерді сақтау орны"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Қоршау арқылы іздеу"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Экрандағы контенттің көмегімен іздеу үшін негізгі экран түймесін немесе навигация тетігін басып тұрыңыз."</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 5d97701d676..e0d7b356822 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ផ្កាព្រិល"</item>
     <item msgid="7952183800501346803">"ឆត្រនៅតាមឆ្នេរ"</item>
     <item msgid="799139025758265891">"ឧបករណ៍រោងជាង"</item>
-    <item msgid="1330084588359129896">"តង់"</item>
+    <item msgid="8112685757657659269">"ព្យាណូ"</item>
     <item msgid="3861584909935022342">"ដុំហ្វីលភាពយន្ត"</item>
     <item msgid="5827426100157335512">"សៀវភៅ"</item>
     <item msgid="8585828346253128384">"ផ្កា​ឈូក"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b55665c4c59..ef395aa942c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ប៊្លូធូស"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"បើកនៅថ្ងៃស្អែកដោយស្វ័យប្រវត្តិ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ប្រសិនបើអ្នកបិទប៊្លូធូស នោះវានឹងបើកម្ដងទៀតនៅថ្ងៃបន្ទាប់"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ផ្គូផ្គងឧបករណ៍ជំនួយការស្ដាប់ខាងស្ដាំ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ផ្គូផ្គងឧបករណ៍ជំនួយការស្ដាប់ខាងឆ្វេង"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ផ្គូផ្គងឧបករណ៍ជំនួយការស្ដាប់ម្ខាងទៀតរបស់អ្នក"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"បិទប៊្លូធូស LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"បិទមុខងារប៊្លូធូស LE Audio ប្រសិនបើ​ឧបករណ៍​អាចប្រើសមត្ថភាព​ហាតវែរ LE Audio បាន។"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"មុខងារប៊្លូធូស LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"បើកការមើល UI ការផ្សាយប៊្លូធូស LE Audio សាកល្បង​​"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"បើកការមើល UI នៃការស្ដាប់ LE Audio រួមគ្នាសាកល្បង​​ រួមទាំងការស្ដាប់សំឡេងរួមគ្នាផ្ទាល់ខ្លួន និងការផ្សាយឯកជន"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"បង្ហាញប៊ូតុងបិទ/បើក LE Audio ក្នុងព័ត៌មានលម្អិតអំពីឧបករណ៍"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"រំលងបញ្ជីអនុញ្ញាតប៊្លូធូស LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ប្រើ LE Audio តាមលំនាំដើម ទោះបីជាមិនបានផ្ទៀងផ្ទាត់ឧបករណ៍ខាងក្រៅ LE Audio ដើម្បីឱ្យបំពេញតាមលក្ខខណ្ឌបញ្ជីអនុញ្ញាតក៏ដោយ។"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ភាសា​កម្មវិធី"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ភាសា​ដែល​បាន​ណែ​នាំ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ភាសាទាំងអស់"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"បាន​ណែនាំ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ភាសាទាំងអស់"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"តំបន់ទាំងអស់"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ប្រព័ន្ធកំណត់លេខទាំងអស់"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ភាសាប្រព័ន្ធ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"លំនាំ​ដើម​ប្រព័ន្ធ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"មិនអាចជ្រើសរើសភាសាសម្រាប់កម្មវិធីនេះពីការកំណត់បានទេ។"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ផ្លាស់ប្ដូរ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"មិនអាចប្រើភាសា %s បានទេ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"មិនអាចប្រើ​ភាសានេះ​ជាភាសាប្រព័ន្ធ​បានទេ ប៉ុន្តែអ្នកបាន​អនុញ្ញាតឱ្យកម្មវិធី និងគេហទំព័រ​ដឹងថា អ្នកចូលចិត្ត​ភាសានេះ។"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ស្វែងរក"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"បញ្ចូលភាសា"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ចំណូលចិត្តតំបន់"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"វាយបញ្ចូលឈ្មោះភាសា"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ការកំណត់ភាសាច្រើន​ទៀត"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ចំណូលចិត្តតាមតំបន់"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"កំណត់​ចំណូលចិត្តលេខ និងខ្នាត"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"អនុញ្ញាតឱ្យ​កម្មវិធីដឹងពី​ចំណូលចិត្តតាមតំបន់​របស់អ្នក ដើម្បីឱ្យកម្មវិធីទាំងនោះ​អាចកំណត់​បទពិសោធន៍ប្រើប្រាស់របស់អ្នក​ឱ្យមានលក្ខណៈផ្ទាល់ខ្លួន។"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"កម្មវិធីនឹងប្រើ​ចំណូលចិត្តតាមតំបន់​របស់អ្នក ប្រសិនបើអាច។"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ចំណូលចិត្តតាមតំបន់"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"សីតុណ្ហភាព"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ថ្ងៃដំបូងនៃសប្ដាហ៍"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ចំណូលចិត្តលេខ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"តភ្ជាប់​សេវាកម្ម​ទិន្នន័យ​ ពេល​រ៉ូមីង"</string>
     <string name="roaming_disable" msgid="729512894708689604">"តភ្ជាប់​សេវាកម្ម​ទិន្នន័យ​ ពេលរ៉ូមីង"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"អាច​មាន​ការគិត​ថ្លៃ​រ៉ូមីង។"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"កំណត់ម៉ោង​ដោយស្វ័យប្រវត្តិ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"កំណត់ដោយស្វ័យប្រវត្តិ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ទីតាំងនឹងត្រូវបានប្រើ​សម្រាប់​ការកំណត់ល្វែងម៉ោង នៅពេលបើក​ប៊ូតុងបិទ/បើកនេះ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"កាលបរិច្ឆេទ និង​ម៉ោង​ស្វ័យប្រវត្តិ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"កំណត់​ដោយស្វ័យប្រវត្តិ​ដោយប្រើ​បណ្ដាញ និង​សញ្ញា​ឥតខ្សែ​របស់អ្នក"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ល្វែង​ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"កំណត់​ដោយ​ស្វ័យប្រវត្តិ​ដោយ​ផ្អែកលើ​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ដែលនៅជិតអ្នក"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"កំណត់ដោយស្វ័យប្រវត្តិដោយប្រើទីតាំងឧបករណ៍អ្នក ប្រសិនបើមាន"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ប្រើ​តាមតំបន់"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ម៉ោង"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"លើកម្រាមដៃ ហើយបន្ទាប់មកប៉ះឧបករណ៍ចាប់សញ្ញាម្តងទៀត"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"មិនអាចប្រើសេនស័រចាប់ស្នាមម្រាមដៃបានទេ"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ទាក់ទងក្រុមហ៊ុន​ផ្ដល់ការជួសជុល។"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ការដោះសោ​ដោយស្កេន​ស្នាមម្រាមដៃពេលអេក្រង់បិទ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ប្រើការដោះសោ​ដោយស្កេន​ស្នាមម្រាមដៃ សូម្បីនៅពេលអេក្រង់ត្រូវបានបិទ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"អេក្រង់​ត្រូវបានបិទ សូមដោះសោ"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ការកំណត់សុវត្ថិភាពច្រើនទៀត"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ការចាក់សោកម្រងព័ត៌មានការងារ ការអ៊ីនគ្រីប និងអ្វីៗជាច្រើនទៀត"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ការអ៊ីនគ្រីប ព័ត៌មានផ្ទៀងផ្ទាត់ និងអ្វីៗជាច្រើនទៀត"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"កំណត់លំនាំសម្រាប់លំហឯកជនរបស់អ្នក"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ចាក់សោ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"លាក់"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"បញ្ជាក់លំនាំលំហឯកជនរបស់អ្នក"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"បញ្ចូលកូដ PIN លំហឯកជនរបស់អ្នកម្ដងទៀត"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"បញ្ចូលពាក្យសម្ងាត់លំហឯកជនរបស់អ្នកម្ដងទៀត"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"អ្នកអាចបញ្ចូលស្នាមម្រាមដៃបានត្រឹម <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"អ្នក​បាន​បញ្ចូល​ស្នាម​ម្រាមដៃ​ដល់​ចំនួន​អតិបរមា​ហើយ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"មិន​អាច​បញ្ចូល​ស្នាម​ម្រាមដៃ​បាន​ទៀត​ទេ"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"បើក"</string>
     <string name="external_display_off" msgid="5634413756025351374">"បិទ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ផ្ទាំង​អេក្រង់​ខាង​ក្រៅ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"ផ្ទាំង​អេក្រង់ដែលភ្ជាប់មក​ជាមួយ​ស្រាប់"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ប្រើផ្ទាំងអេក្រង់ខាងក្រៅ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"កម្រិតគុណភាពផ្ទាំងអេក្រង់"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ផ្ទាំងអេក្រង់ខាងក្រៅត្រូវបានផ្ដាច់"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ការប្ដូរការ​បង្វិល ឬកម្រិតគុណភាពអាចបញ្ឈប់កម្មវិធីទាំងឡាយដែលកំពុងដំណើរការនាពេលបច្ចុប្បន្ន"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ត្រូវតែភ្ជាប់ឧបករណ៍របស់អ្នកជាមួយផ្ទាំងអេក្រង់ខាងក្រៅ ដើម្បីបញ្ចាំងអេក្រង់របស់អ្នក"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ជម្រើស​ច្រើនទៀត"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"សង្កត់ឱ្យជាប់ រួចអូស ដើម្បីរៀបចំផ្ទាំងអេក្រង់ឡើងវិញ។"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ភ្ជាប់"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"កញ្ចក់"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"បើក​ការ​បង្ហាញ​ឥត​ខ្សែ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ពិនិត្យមើល​ពាក្យសម្ងាត់ រួច​ព្យាយាម​ម្តងទៀត"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ទាក់ទង​ក្រុមហ៊ុនផលិត​ឧបករណ៍"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"សូម​ពិនិត្យមើល​ការតភ្ជាប់ រួចព្យាយាម​ម្ដងទៀត"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"មិនអាចប្រើបណ្ដាញ Wi‑Fi នេះនៅពេលនេះបានទេ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"មានបញ្ហាទាក់ទងនឹងកូដ QR នេះ។ សូមសាកល្បងភ្ជាប់តាមវិធីផ្សេង។"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ជ្រើសរើស​បណ្តាញ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ដើម្បីភ្ជាប់​ឧបករណ៍របស់អ្នក សូមជ្រើសរើសបណ្ដាញ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"បញ្ចូលឧបករណ៍នេះ​ទៅ “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ស្វែងយល់បន្ថែម​អំពីការបង្វិល​ស្វ័យប្រវត្តិ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"កម្រិតច្បាស់នៃអេក្រង់"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"កម្រិតច្បាស់ខ្ពស់"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"កម្រិតគុណភាព​ពេញលេញ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"កម្រិតច្បាស់​ពេញលេញប្រើថ្មរបស់អ្នកច្រើនជាង។ ការប្ដូរកម្រិតគុណភាពរបស់អ្នកអាចបណ្តាលឱ្យកម្មវិធីមួយចំនួនចាប់ផ្តើមឡើងវិញ។"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"កម្រិតគុណភាពខ្ពស់បំផុត"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"កម្រិតគុណភាពខ្ពស់បំផុតប្រើថ្មរបស់អ្នកច្រើនជាង។ ការប្ដូរកម្រិតគុណភាពរបស់អ្នកអាចបណ្ដាលឱ្យកម្មវិធីមួយចំនួនចាប់ផ្ដើមឡើងវិញ។"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"បានជ្រើសរើស"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ពណ៌"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ធម្មជាតិ"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"បត់បែន"</string>
     <string name="brightness" msgid="6216871641021779698">"កម្រិត​ពន្លឺ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ពន្លឺ​មានភាពបត់បែន"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"អំពីពន្លឺ​មានភាពបត់បែន"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"កម្រិតពន្លឺ​នៅ​លើ​អេក្រង់​របស់អ្នក​នឹង​​កែតម្រូវ​ដោយស្វ័យប្រវត្តិ​ឱ្យ​ស្រប​នឹង​បរិយាកាសជុំវិញ និង​សកម្មភាព​របស់អ្នក។ អ្នក​អាច​ផ្លាស់ទី​របាររំកិល​ដោយដៃ ដើម្បី​ជួយ​ឱ្យ​កម្រិតពន្លឺ​​ដែល​មាន​ភាពបត់បែន​ស្គាល់​ចំណង់ចំណូលចិត្ត​របស់អ្នក។"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"បើក"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"បិទ"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ការកំណត់​មុខងារ​ម៉ោង​គេង"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{មុខងារក៏អាចបើកដំណើរការទម្រង់រចនាងងឹតបានផងដែរ}=1{{mode_1} ក៏បើកដំណើរការទម្រង់រចនាងងឹតផងដែរ}=2{{mode_1} និង {mode_2} ក៏បើកដំណើរការទម្រង់រចនាងងឹតផងដែរ}=3{{mode_1}, {mode_2} និង {mode_3} ក៏បើកដំណើរការទម្រង់រចនាងងឹតផងដែរ}other{{mode_1}, {mode_2} និង # ទៀតក៏បើកដំណើរការទម្រង់រចនាងងឹតផងដែរ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ការកំណត់មុខងារ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"កាន់តែងងឹត"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ងងឹតខ្លាំង"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"អនុញ្ញាតឱ្យឧបករណ៍មានពន្លឺងងឹតជាងធម្មតា"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"រយៈពេលទម្រាំអេក្រង់បិទ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបី​ប៊្លូធូសបិទ​ក៏ដោយ។ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំងជាដើម។"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"សេវាកម្ម​ទីតាំង"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"សេវាកម្ម​ទីតាំង"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ប្រើទីតាំង"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ប្រើទីតាំង​សម្រាប់​ល្វែងម៉ោង"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"មិនអាចកំណត់​ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិបានទេ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ទីតាំង ឬសេវាកម្មទីតាំង​ត្រូវបានបិទ"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ការកំណត់ទីតាំង"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ជួលជុល"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"បោះបង់"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ល្វែងម៉ោង​ស្វ័យប្រវត្តិ​ត្រូវបានបិទ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"មិនអាច​ប្រើបានទេ នៅពេល​បិទល្វែងម៉ោង​ស្វ័យប្រវត្តិ"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ទីតាំងអាចនឹងត្រូវបានប្រើដើម្បីកំណត់ល្វែងម៉ោង"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ប្រសិនបើ​អាចប្រើ​ទីតាំង​ឧបករណ៍​របស់អ្នកបាន វាអាច​ត្រូវបានប្រើ ដើម្បី​កំណត់​ល្វែងម៉ោង​របស់អ្នក"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"មើល​ព័ត៌មាន​ផ្លូវច្បាប់, ស្ថានភាព, កំណែ​កម្មវិធី"</string>
     <string name="legal_information" msgid="7509900979811934843">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
     <string name="manual" msgid="3651593989906084868">"ឯកសារណែនាំ"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ជម្រើស"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ភាពងាយស្រួល"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ក្ដារចុច​រូបវ័ន្ត"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"ផ្ទាំងជ្រើសរើសប្លង់​ក្ដារចុចរូបវន្ត"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"គ្រាប់ចុចឡង"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"ក្ដារចុចមិនអើពើនឹងការចុចដដែលៗយ៉ាងរហ័សនៃគ្រាប់ចុចដដែលក្នុងរយៈពេល <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> មិល្លីវិនាទី"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ក្ដារចុចមិនអើពើនឹងការចុចដដែលៗយ៉ាងរហ័សនៃគ្រាប់ចុចដដែល"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"កម្រិតកំណត់គ្រាប់ចុចឡង"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ជ្រើសរើសរយៈពេលដែលក្តារចុចរបស់អ្នកមិនអើពើនឹងការចុចគ្រាប់ចុចដដែលៗ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 វិ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 វិ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 វិ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ផ្ទាល់ខ្លួន"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"តម្លៃផ្ទាល់ខ្លួន"</string>
     <string name="slow_keys" msgid="2891452895499690837">"គ្រាប់ចុចយឺត"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"កែតម្រូវរយៈពេលនៃការចុចគ្រាប់ចុចដើម្បីបើកដំណើរការទៅ <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> មិល្លីវិនាទី"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"កែតម្រូវរយៈពេលនៃការចុចគ្រាប់ចុចដើម្បីបើកដំណើរការ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"គ្រាប់ចុចស្អិត"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ចុចគ្រាប់ចុចមួយក្នុងមួយលើកសម្រាប់ផ្លូវកាត់ជំនួសឱ្យការចុចគ្រាប់ចុចឱ្យជាប់រួមគ្នា"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"គ្រាប់ចុច​ម៉ៅស៍"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ប្រើក្ដារចុចរូបវន្ត ដើម្បីគ្រប់គ្រងម៉ៅស៍។"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ប្រើគ្រាប់ចុចម៉ៅស៍"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ប្រើក្តារចុចរបស់អ្នកដើម្បីគ្រប់គ្រងសញ្ញាព្រួញ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ការរំកិល​ម៉ៅស៍​បញ្រ្ចាស"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"រំកិល​ឡើងលើ ដើម្បីផ្លាស់ទី​ទំព័រចុះក្រោម"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ដោះដូររវាងប៊ូតុងឆ្វេង និងប៊ូតុងស្ដាំ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ប្រើប៊ូតុងម៉ៅស៍ខាងឆ្វេងជាប៊ូតុងម៉ៅស៍ខាងស្ដាំរបស់អ្នក"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"គ្រាប់ចុច​ម៉ៅស៍សម្រាប់ <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ប្រើគ្រាប់ចុច <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ដើម្បីផ្លាស់ទីព្រួញម៉ៅស៍"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ប្រើគ្រាប់ចុច <xliff:g id="CLICK_LABEL">%s</xliff:g> ដើម្បីចុចប៊ូតុងម៉ៅស៍ចម្បង"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ប្រើគ្រាប់ចុច <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ដើម្បីចុចឱ្យជាប់លើប៊ូតុងម៉ៅស៍ចម្បង"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ប្រើគ្រាប់ចុច <xliff:g id="RELEASE_LABEL">%s</xliff:g> ដើម្បីលែងប៊ូតុងម៉ៅស៍ចម្បង"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ប្រើគ្រាប់ចុច <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ដើម្បីបិទ/បើកមុខងាររំកិល។ សកម្មភាពនេះនឹងធ្វើឱ្យគ្រាប់ចុច <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> រំកិលទៅទិដ្ឋភាពខាងលើ ខាងក្រោម ខាងឆ្វេង ឬខាងស្ដាំ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ប្រើគ្រាប់ចុច <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ដើម្បីចុចប៊ូតុងម៉ៅស៍បន្ទាប់បន្សំ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ផ្លូវកាត់ក្តារចុច"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"បង្ហាញបញ្ជីផ្លូវកាត់"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ឧបករណ៍ និងក្ដារចុច​កម្រងព័ត៌មាន​ការងារ"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"លំនាំដើម"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ផ្ទាំង​ប៉ះ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ផ្ទាំងប៉ះ និងម៉ៅស៍"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ម៉ៅស៍"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ល្បឿនទស្សន៍ទ្រនិច ចលនា"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ប៉ះដើម្បីចុច"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ចុចអូស"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ចុចខាងក្រោមផ្នែកខាងស្ដាំ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ចុចជ្រុងខាងស្ដាំផ្នែកខាងក្រោមនៃផ្ទាំងប៉ះសម្រាប់ជម្រើសបន្ថែម"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ល្បឿន​ទស្សន៍ទ្រនិច"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ប្រើការចុចដោយប្រើម្រាមដៃបី"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ពណ៌​សញ្ញាព្រួញ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ប្ដូរស្តាយល៍បំពេញរបស់ព្រួញទៅខ្មៅ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ប្ដូរស្តាយល៍បំពេញរបស់ព្រួញទៅបៃតង"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ស្វែងយល់អំពីចលនាផ្ទាំងប៉ះ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ផ្ទាំងប៉ះ, ផ្ទាំងសម្រាប់ប៉ះ, ម៉ៅស៍, ទស្សន៍ទ្រនិច, រំកិល, អូស, ចុចម៉ៅស៍ខាងស្ដាំ, ចុច, ទ្រនិចរំកិល"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ចុចម៉ៅស៍ខាងស្ដាំ, ចុច"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ចុចកណ្ដុរកណ្ដាល"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"បើកដំណើរការ Google Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ទៅទំព័រដើម"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ថយ​ក្រោយ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"មើលកម្មវិធីថ្មីៗ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ទៅអេក្រង់ដើម"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"អូសឡើងលើដោយប្រើម្រាមដៃបី​នៅកន្លែងណាមួយ​នៅលើផ្ទាំងប៉ះរបស់អ្នក"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ថយ​ក្រោយ"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ជ្រើសរើសប៊ូតុងថ្មីសម្រាប់ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>៖"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ភាពងាយស្រួលប្រើប្រាស់ក្ដារចុចរូបវន្ត"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"គ្រាប់ចុចស្អិត គ្រាប់ចុចលោត គ្រាប់ចុចម៉ៅស៍"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"គ្រាប់ចុចដែលចុចឡើងវិញ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ពន្យារពេលមុនការចុចឡើងវិញ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"អត្រា​ចុច​ឡើងវិញ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ចុចឱ្យជាប់លើគ្រាប់ចុចណាមួយ ដើម្បីចុចតួអក្សររបស់វាឡើងវិញ រហូតទាល់តែគ្រាប់ចុចត្រូវបានលែង"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"ប្លង់ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"លំនាំដើម"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ស្វ័យប្រវត្តិ៖ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"មើលសាកល្បង"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ភាសា"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ទំហំ​អក្សរ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ទំហំអក្សររត់"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"រចនាបថអក្សររត់"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ជម្រើស​តាម​តម្រូវ​ការ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ពណ៌​ផ្ទៃ​ខាងក្រោយ"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"កែ​ការ​ប្រើ​ថាមពល"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"កញ្ចប់​រួម​បញ្ចូល"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"កម្មវិធី​កំពុង​ដំណើរការ​ជា​ធម្មតា"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ការប្ដូរថ្មត្រូវបានណែនាំ"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"កាប៉ាស៊ីតេបន្ទុករបស់ថ្ម និងប្រសិទ្ធភាពនៃការសាកថ្មថយចុះ ហើយការប្ដូរថ្មត្រូវបានណែនាំ។"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"កម្រិតថ្មជិតអស់ហើយ"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"បើកមុខងារ​សន្សំ​ថ្ម ដើម្បីបង្កើនកម្រិតថាមពលថ្ម"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"បង្កើនកម្រិតថាមពលថ្ម"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ផ្តាច់ VPN នេះ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ផ្ដាច់"</string>
     <string name="vpn_version" msgid="6344167191984400976">"កំណែ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"កំណែ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"បំភ្លេច VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ជំនួស VPN ដែលមានស្រាប់ឬ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"កំណត់ VPN ឲ្យបើកជានិច្ចឬ?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 ព្រឹក - 5 ល្ងាចនៃថ្ងៃធ្វើការ\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ព្រឹត្តិការណ៍ក្នុង​ប្រតិទិន"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} កំពុង​ដំណើរការ}=2{{mode_1} និង {mode_2} កំពុង​ដំណើរការ}=3{{mode_1}, {mode_2} និង {mode_3} កំពុង​ដំណើរការ}other{{mode_1}, {mode_2}​និង # ទៀតកំពុង​ដំណើរការ}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{មុខងារ 1 អាច​បើកដោយស្វ័យប្រវត្តិ}other{មុខងារ # អាច​បើកដោយស្វ័យប្រវត្តិ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{កុំ​រំខាន}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"បើក"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"មិនបានកំណត់"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"បាន​បិទ"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"យល់ហើយ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ការជូនដំណឹង"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"រយៈពេល"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"សារ ព្រឹត្តិការណ៍ និងការរំលឹក"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នានានឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ គ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"រួចរាល់"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ការកំណត់"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"គ្មានសំឡេង​ពីការជូន​ដំណឹង"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"អ្នកនឹង​មិនឃើញ ឬមិន​​ឮការជូន​ដំណឹងទេ។ ការហៅ​ទូរសព្ទ​ពីទំនាក់​ទំនងមានផ្កាយ និង​អ្នកហៅ​ទូរសព្ទ​ដដែលៗ​ត្រូវបាន​អនុញ្ញាត។"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ការកំណត់​បច្ចុប្បន្ន)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ប្ដូរ​ការកំណត់​ការជូនដំណឹង​នៃមុខងារ​កុំរំខាន?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"សំឡេងកម្រងព័ត៌មានការងារ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ប្រើសំឡេងកម្រងព័ត៌មានផ្ទាល់ខ្លួន"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ប្រើសំឡេង​ដូចគ្នានឹង​កម្រងព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នក"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ចូលទៅអេក្រង់ដែលបានប្រើចុងក្រោយតែម្ដង បន្ទាប់ពីដោះសោ។ ការជូនដំណឹងនឹងមិនបង្ហាញនៅលើអេក្រង់ចាក់សោទេ។ សូមអូសពីលើចុះក្រោម ដើម្បីមើលការជូនដំណឹងទាំងនេះ។"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ចាក់សោ​អេក្រង់ អេក្រង់​ចាក់សោ រំលង ការរំលង"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"នៅពេល​កម្រង​ព័ត៌មាន​ការងារ​ចាក់សោ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ការបន្ថយការជូនដំណឹងលើអេក្រង់ចាក់សោ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"បង្ហាញការជូនដំណឹងតិចជាងនេះលើអេក្រង់ចាក់សោ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"បង្ហាញតែការជូនដំណឹងថ្មីៗប៉ុណ្ណោះនៅលើអេក្រង់ចាក់សោ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ដកការជូនដំណឹងដែលបានមើលពីមុនចេញពីអេក្រង់ចាក់សោដោយស្វ័យប្រវត្តិ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ការជូនដំណឹង​នៅលើ​អេក្រង់ចាក់សោ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"បង្ហាញការសន្ទនា លំនាំដើម និងស្ងាត់"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"បង្ហាញការសន្ទនា លំនាំដើម និងស្ងាត់"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"បង្ហាញខ្លឹមសារនៃការជូនដំណឹងការងារទាំងអស់"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"លាក់​ខ្លឹមសារ​ការងារ​រសើប"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"នៅពេលដែលឧបករណ៍របស់អ្នកជាប់សោ តើអ្នកចង់ឲ្យការជូនដំណឹងប្រវត្តិរូបបង្ហាញដោយរបៀបណា?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"នៅពេលអ្នកទទួលបានការជូនដំណឹងច្រើនក្នុងរយៈពេលខ្លីមួយ ឧបករណ៍របស់អ្នកនឹងបន្ថយកម្រិតសំឡេង និងការជូនដំណឹងរហូតដល់ 2 នាទី។ ការហៅទូរសព្ទ សំឡេងរោទិ៍ និងការសន្ទនាអាទិភាពមិនរងប៉ះពាល់ទេ។ \n\nអ្នកអាចស្វែងរកការជូនដំណឹងដែលបានទទួលក្នុងអំឡុងពេលបន្ថយសំឡេង ដោយទាញពីផ្នែកខាងលើនៃអេក្រង់ចុះក្រោម។"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ដាក់ប្រើលើកម្រងព័ត៌មានការងារ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ដាក់ប្រើលើកម្មវិធីកម្រងព័ត៌មានការងារ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ការ​ជូនដំណឹងដែលបានដាក់ជាក្រុម"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"បើក"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"បិទ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ប្រើការដាក់ការ​ជូនដំណឹងជា​ក្រុម"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ការ​ជូនដំណឹងដែលមានប្រធានបទស្រដៀងគ្នានឹងត្រូវបានបិទ​សំឡេង និងដាក់ជាក្រុមជាមួយគ្នា ដើម្បីទទួលបានបទពិសោធដែលកាន់តែស្ងាត់។ ការដាក់ជា​ក្រុមនឹងលុបពីលើការកំណត់ការជូនដំណឹងរបស់កម្មវិធីផ្ទាល់។"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"សេវាកម្មជំនួយ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"មិនមានកម្មវិធីដែលបានដំឡើងត្រូវបានស្នើឲ្យដំណើរការជាសេវាកម្មជំនួយ VR នោះទេ។"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"អនុញ្ញាតឲ្យសេវាកម្ម VR ចូលដំណើរការ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ការសន្ទនា​អាទិភាព"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"គ្មាន"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{គ្មាន}=1{ការ​សន្ទនា 1}other{ការសន្ទនា #}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"ការកំណត់ការសន្ទនា"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"អ្នកដែល​អាច​ផ្អាកបាន"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ទោះបីជា​កម្មវិធីផ្ញើសារ ឬហៅទូរសព្ទមិនអាច​ជូនដំណឹងអ្នក​ក៏ដោយ ក៏មនុស្សដែលអ្នក​ជ្រើសរើស​នៅទីនេះ​នៅតែអាច​ទាក់ទង​អ្នកតាមរយៈ​កម្មវិធីទាំងនោះ​បានដដែល"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ការហៅ​ទូរសព្ទ"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"គ្រប់គ្នា"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ទំនាក់ទំនង"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ទំនាក់ទំនង​មាន​ផ្កាយ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"ការកំណត់ទំនាក់ទំនង"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ការកំណត់ទំនាក់ទំនងដែលមានផ្កាយ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"គ្មាន"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"គ្មាន"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ម៉ោងរោទ៍"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ការងារ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"កំពុងគណនា…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ការកំណត់កម្មវិធី"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"អនុញ្ញាតឱ្យកម្មវិធី​លុបពីលើ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"កម្មវិធី​ដែលអាច​ផ្អាកបាន"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"បង្កើតមុខងារ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"មុខងារផ្ទាល់ខ្លួន"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ឈ្មោះមុខងារ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ឈ្មោះមុខងារមិនអាចទទេបានឡើយ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ជ្រើសរើស​រូបតំណាង"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ព្រឹត្តិការណ៍ក្នុង​ប្រតិទិន"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ទម្លាប់​នៅម៉ោងគេង"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ពេលកំពុងបើកបរ"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ការជូនដំណឹងពេញអេក្រង់"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"អនុញ្ញាតការជូនដំណឹងពេញអេក្រង់ពីកម្មវិធីនេះ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"អនុញ្ញាតឱ្យកម្មវិធីនេះបង្ហាញការជូនដំណឹងពេញអេក្រង់ នៅពេលឧបករណ៍ត្រូវបានចាក់សោ។ កម្មវិធីអាចប្រើការជូនដំណឹងទាំងនេះ ដើម្បីរំលេចម៉ោងរោទ៍ ការហៅចូល ឬការជូនដំណឹងបន្ទាន់ផ្សេងទៀត។"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"សរសេរចំណូលចិត្តប្រព័ន្ធ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"អនុញ្ញាតឱ្យកម្មវិធីនេះកែប្រែចំណូលចិត្តប្រព័ន្ធជំនួសឱ្យអ្នក"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ការអនុញ្ញាតនេះអាចឱ្យកម្មវិធីកែប្រែចំណូលចិត្តប្រព័ន្ធស្នូល។"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"កម្មវិធី​គ្រប់គ្រងមេឌៀ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"អនុញ្ញាតឱ្យ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ប្រសិនបើ​អនុញ្ញាត កម្មវិធីនេះ​អាចកែប្រែ ឬលុបឯកសារ​មេឌៀ​ដែលបង្កើត​ដោយប្រើ​កម្មវិធីផ្សេងទៀត​ដោយមិនបាច់​សួរអ្នក។ កម្មវិធីត្រូវតែ​មានការអនុញ្ញាត ដើម្បីចូលប្រើឯកសារ និងមេឌៀ។"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ចលនា"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"បើក​កាមេរ៉ា​យ៉ាងរហ័ស"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ដើម្បីបើកកាមេរ៉ាបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើ​អេក្រង់ទាំងអស់។"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ត្រឡប់​កាមេរ៉ា​ដើម្បីថត​សែលហ្វី"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"មុខងារ​រុករក"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ការ​ផ្ញើ​សារតាមផ្កាយរណប"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ផ្ញើ និងទទួលសារជាអក្សរតាមផ្កាយរណប។ រួមបញ្ចូលជាមួយគណនីរបស់អ្នក។"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ផ្ញើ និងទទួលសារជាអក្សរតាមផ្កាយរណប។ មិនរួមបញ្ចូលជាមួយគណនីរបស់អ្នកទេ។"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ការ​ផ្ញើ​សារតាមផ្កាយរណប"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"អំពីការ​ផ្ញើ​សារតាមផ្កាយរណប"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"ការ​ផ្ញើ​សារតាមផ្កាយរណប ការតភ្ជាប់ផ្កាយរណប"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"អំពី <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"អ្នកអាចផ្ញើ និងទទួលសារជាអក្សរតាមផ្កាយរណបជាផ្នែកនៃគណនី <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ដែលមានសិទ្ធិ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"គម្រោង <xliff:g id="CARRIER_NAME">%1$s</xliff:g> របស់អ្នក"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ការ​ផ្ញើ​សារតាមផ្កាយរណបត្រូវបានរួមបញ្ចូលជាមួយគណនីរបស់អ្នក"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"ការ​ផ្ញើ​សារត្រូវបានរួមបញ្ចូលជាមួយគណនីរបស់អ្នក"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ការ​ផ្ញើ​សារតាមផ្កាយរណបមិនត្រូវបានរួមបញ្ចូលជាមួយគណនីរបស់អ្នកទេ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ស្វែងយល់បន្ថែម"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"របៀបដែលវាដំណើរការ"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ទូរសព្ទរបស់អ្នកនឹងភ្ជាប់ទៅផ្កាយរណបដោយស្វ័យប្រវត្តិ។ ដើម្បីទទួលបានការតភ្ជាប់ល្អបំផុត សូមស្ថិតនៅក្រោមផ្ទៃមេឃស្រឡះ។"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"បន្ទាប់ពីទូរសព្ទរបស់អ្នកភ្ជាប់ទៅផ្កាយរណប"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"អ្នកអាចផ្ញើសារជាអក្សរទៅអ្នកណាក៏បាន រួមទាំងសេវាសង្គ្រោះបន្ទាន់។ ទូរសព្ទរបស់អ្នកនឹងភ្ជាប់ឡើងវិញ នៅពេលមានបណ្ដាញ​ទូរសព្ទ​ចល័ត។"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ការ​ផ្ញើ​សារតាមផ្កាយរណបអាចចំណាយពេលកាន់តែយូរ និងអាចប្រើបាននៅក្នុងតំបន់មួយចំនួនតែប៉ុណ្ណោះ។ អាកាសធាតុ និងរចនាសម្ព័ន្ធមួយចំនួនអាចប៉ះពាល់ដល់ការតភ្ជាប់ផ្កាយរណបរបស់អ្នក។ មិនអាចធ្វើការហៅទូរសព្ទតាមផ្កាយរណបបានទេ។ ការហៅទៅលេខសង្គ្រោះបន្ទាន់នៅតែអាចភ្ជាប់បាន។\n\nការផ្លាស់ប្ដូរចំពោះគណនីអាចចំណាយពេលបន្តិច ដើម្បីបង្ហាញនៅក្នុង \"ការកំណត់\"។ សូមទាក់ទងទៅក្រុមហ៊ុន​សេវាទូរសព្ទ​របស់អ្នក ដើម្បីទទួលបាន​ព័ត៌មានលម្អិត។"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ព័ត៌មានបន្ថែមអំពីការ​ផ្ញើ​សារតាមផ្កាយរណប"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> អាចចំណាយពេលកាន់តែយូរ និងអាចប្រើបាននៅក្នុងតំបន់មួយចំនួនតែប៉ុណ្ណោះ។ អាកាសធាតុ និងរចនាសម្ព័ន្ធមួយចំនួនអាចប៉ះពាល់ដល់ការតភ្ជាប់ផ្កាយរណបរបស់អ្នក។ មិនអាចធ្វើការហៅទូរសព្ទតាមផ្កាយរណបបានទេ។ ការហៅទៅលេខសង្គ្រោះបន្ទាន់នៅតែអាចភ្ជាប់បាន។\n\nការផ្លាស់ប្ដូរចំពោះគណនីអាចចំណាយពេលបន្តិច ដើម្បីបង្ហាញនៅក្នុង \"ការកំណត់\"។ សូម​ទាក់ទង <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ដើម្បី​ទទួលបានព័ត៌មានលម្អិត។"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"ព័ត៌មាន​បន្ថែម​អំពី <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"មិនអាចបើក <xliff:g id="FUNCTION">%1$s</xliff:g> បានទេ"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"ដើម្បីបើក <xliff:g id="FUNCTION">%1$s</xliff:g> សូមបញ្ចប់ការ​តភ្ជាប់ផ្កាយរណបជាមុនសិន"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ការតភ្ជាប់ផ្កាយរណប"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"ការតភ្ជាប់ផ្កាយរណប"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"ការតភ្ជាប់ផ្កាយរណប"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"ការ​ផ្ញើ​សារតាមផ្កាយរណប"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ការប្រើប្រាស់ទិន្នន័យត្រូវបានរួមបញ្ចូលជាមួយគណនីរបស់អ្នក"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"ការប្រកាសអាសន្នតាមផ្កាយរណប"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"ផ្ញើសារដោយប្រើសេវាសង្គ្រោះបន្ទាន់ នៅពេលអ្នកមិនអាចភ្ជាប់ទៅកាន់បណ្ដាញ Wi-Fi ឬឧបករណ៍​ចល័ត"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"ការប្រកាសអាសន្នតាមផ្កាយរណប ការប្រកាសអាសន្ន"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"អំពីការប្រកាសអាសន្នតាមផ្កាយរណប"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"អ្នកអាចផ្ញើសារដោយប្រើសេវាសង្គ្រោះបន្ទាន់ និងចែករំលែកទីតាំងរបស់អ្នក នៅពេលអ្នកមិនអាចភ្ជាប់បណ្ដាញ Wi-Fi ឬឧបករណ៍​ចល័ត។ សេវាកម្មនេះប្រហែលជាមិនអាចប្រើបានគ្រប់ពេលវេលានៅគ្រប់ទីតាំង ឬគ្រប់កាលៈទេសៈនោះទេ។"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ហៅទូរសព្ទ ឬផ្ញើសារជាអក្សរទៅសេវាសង្គ្រោះបន្ទាន់"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ឆ្លើយសំណួរទាក់ទងនឹង​ពេលមានអាសន្ន"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"អនុវត្តតាមជំហាន ដើម្បីភ្ជាប់ជាមួយផ្កាយរណប"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"ប្រសិនបើអ្នកមិនមានបណ្ដាញ​ទូរសព្ទ​ចល័តទេ អ្នកនឹងមើលឃើញជម្រើស ដើម្បីប្រើប្រាស់ការប្រកាសអាសន្នតាមផ្កាយរណប"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ផ្ញើចម្លើយទៅសេវាសង្គ្រោះបន្ទាន់ ដើម្បីឱ្យអ្នកទទួលបានជំនួយដែលស័ក្ដិសម"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"នៅពេលអ្នកត្រូវបានភ្ជាប់ អ្នកអាចផ្ញើសារដោយប្រើសេវាសង្គ្រោះបន្ទាន់បាន"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"សាកល្បងប្រើគំរូបង្ហាញ"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"នៅពេលអ្នកភ្ជាប់សេវាសង្គ្រោះបន្ទាន់តាមរយៈផ្កាយរណប ឈ្មោះ អ៊ីមែល លេខទូរសព្ទ ទីតាំង ព័ត៌មានឧបករណ៍ (IMEI, ភាសា, ម៉ូដែល, កម្រិតថ្ម) ព្រមទាំងព័ត៌មានទំនាក់ទំនង​ពេលមានអាសន្នរបស់អ្នក ត្រូវបានចែករំលែកជាមួយសេវាសង្គ្រោះបន្ទាន់ និងក្រុមហ៊ុនផ្ដល់សេវាផ្កាយរណប។ \n\nដើម្បីប្រើការប្រកាសអាសន្នតាមផ្កាយរណប Google Messages ត្រូវតែជា​កម្មវិធី​សារ SMS លំនាំដើមរបស់អ្នក។ \n\nប្រសិនបើការជ្រើសរើសបណ្ដាញដោយស្វ័យប្រវត្តិត្រូវបានបិទ វានឹងបើក ហើយឧបករណ៍របស់អ្នកនឹងភ្ជាប់ដោយស្វ័យប្រវត្តិទៅបណ្ដាញណាមួយ។"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"ការចែករំលែកចំណូលចិត្ត"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ទំនាក់ទំនងពេលមានអាសន្ន"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"គណនី Google របស់អ្នក"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ពិនិត្យមើល ឬធ្វើបច្ចុប្បន្នភាពព័ត៌មានដែលនឹងត្រូវបានចែករំលែកជាមួយសេវាសង្គ្រោះបន្ទាន់"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ឈ្មោះ​ចំណុច​ចូល​ប្រើប្រាស់"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"មិន​អាច​ប្រើបាន​ទេ នៅពេលភ្ជាប់ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"អ្នកកំពុងប្រើមុខងារ 16KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាច​ប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីចូលទៅក្នុងមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែប្ដូរត្រឡប់ទៅមុខងារ 4KB បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ដំណើរការនេះនឹង​កំណត់​ឧបករណ៍​ដូចចេញពីរោងចក្រ រួចត្រឡប់ឧបករណ៍ទៅ​ការកំណត់​ផលិតកម្មវិញ។ បន្ទាប់ពីឧបករណ៍ចាប់ផ្ដើមចូល Android ដោយជោគជ័យ សូមបិទការដោះសោ OEM នៅក្នុងជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍។ ប្រសិនបើ​ឧបករណ៍​មិនអាចចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ Android ឬ​មិន​មានស្ថិរភាព សូម​ជំនួសកម្មវិធីឧបករណ៍​ឡើងវិញដោយប្រើរូបភាពពីរោងចក្រចុងក្រោយបំផុតពី &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ឬប្រើ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; រួចជ្រើសរើស \'ឈូសឧបករណ៍\' \'ចាក់​សោកម្មវិធីដំណើរការប្រព័ន្ធ\' និង \'បង្ខំឱ្យជំនួសផ្នែកទាំងអស់\'។"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"មុខងារ Page-Agnostic 16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"អានបន្ថែម"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ដំណើរការកម្មវិធីដោយប្រើមុខងារត្រូវគ្នានឹងទំហំទំព័រ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ឧបករណ៍​ដោះស្រាយ​របាយការណ៍​អំពី​បញ្ហា"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"កំណត់​ថាតើ​កម្មវិធី​មួយណា​ដែលត្រូវ​ចាត់ចែង​ផ្លូវកាត់​សម្រាប់​របាយការណ៍​អំពី​បញ្ហា​នៅលើ​ឧបករណ៍​របស់អ្នក​។"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ផ្ទាល់ខ្លួន"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ស្ដាប់ការចាក់"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"ស្កេនកូដ QR ការចាក់សំឡេងលើអ៊ីនធឺណិត ដើម្បីស្ដាប់ជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"មិន​អាច​កែ​ពាក្យ​សម្ងាត់​ពេល​កំពុងស្ដាប់រួមគ្នាបានទេ។ ដើម្បីផ្លាស់ប្ដូរពាក្យសម្ងាត់ សូមបិទការស្ដាប់សំឡេងរួមគ្នាជាមុនសិន។"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ពាក្យសម្ងាត់របស់អ្នកត្រូវតែមាន 4-16 តួអក្សរ និងប្រើអក្សរ លេខ និងនិមិត្តសញ្ញាតែប៉ុណ្ណោះ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"កម្មវិធី​ស្កេនកូដ QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ត្រូវការ​ជំនួយ​ឬ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ស្វែងរកការកំណត់"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, ទំហំ​ផ្ទុក, គណនី"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ទំហំផ្ទុក Contacts"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"សម្រាប់តែឧបករណ៍"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ទំនាក់ទំនងថ្មីៗនឹងមិនត្រូវបានធ្វើសមកាលកម្មជាមួយគណនីទេ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ទំនាក់ទំនងនឹងត្រូវបានរក្សាទុកទៅក្នុងឧបករណ៍របស់អ្នក និងធ្វើសមកាលកម្មទៅគណនីរបស់អ្នកតាមលំនាំដើម"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"មានបញ្ហាក្នុងការកំណត់គណនី​លំនាំដើម"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"មិន​បាន​កំណត់​លំនាំដើម"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"សម្រាប់តែឧបករណ៍"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ឧបករណ៍ និង %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"សូមបញ្ចូល​គណនី ដើម្បីចាប់ផ្ដើម"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"កន្លែងសម្រាប់រក្សាទុកទំនាក់ទំនង"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"គូររង្វង់ដើម្បីស្វែងរក"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ចុចប៊ូតុងទំព័រ​ដើម ឬដងរុករកឱ្យជាប់ ដើម្បីស្វែងរកដោយប្រើខ្លឹមសារនៅលើអេក្រង់របស់អ្នក។"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 3487549b297..dcf27613f13 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ಸ್ನೋಫ್ಲೇಕ್"</item>
     <item msgid="7952183800501346803">"ಬೀಚ್ ಛತ್ರಿಗಳು"</item>
     <item msgid="799139025758265891">"ಕಾರ್ಯಾಗಾರದ ಟೂಲ್‌ಗಳು"</item>
-    <item msgid="1330084588359129896">"ಟೆಂಟ್"</item>
+    <item msgid="8112685757657659269">"ಪಿಯಾನೋ"</item>
     <item msgid="3861584909935022342">"ಫಿಲಂ ರೀಲ್"</item>
     <item msgid="5827426100157335512">"ಕಾಯ್ದಿರಿಸಿ"</item>
     <item msgid="8585828346253128384">"ಕಮಲದ ಹೂವು"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a4c713b840f..46804bb6b4b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ಹೊಸ ಸಾಧನ ಪೇರ್ ಮಾಡಿ"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ಬ್ಲೂಟೂತ್"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ನಾಳೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಲಿ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ನೀವು ಬ್ಲೂಟೂತ್‌ ಅನ್ನು ಆಫ್‌ ಮಾಡಿದರೆ, ಅದು ಮರುದಿನ ಮತ್ತೆ ಆನ್‌ ಆಗುತ್ತದೆ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ಬಲಕಿವಿಯ ಶ್ರವಣ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ಎಡಕಿವಿಯ ಶ್ರವಣ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ನಿಮ್ಮ ಮತ್ತೊಂದು ಕಿವಿಯ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ಬ್ಲೂಟೂತ್ LE ಆಡಿಯೋವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ಸಾಧನವು LE ಆಡಿಯೋ ಹಾರ್ಡ್‌ವೇರ್ ಸಾಮರ್ಥ್ಯಗಳನ್ನು ಬೆಂಬಲಿಸಿದರೆ ಈ ಆಯ್ಕೆಯು ಬ್ಲೂಟೂತ್ LE ಆಡಿಯೋ ಫೀಚರ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ಬ್ಲೂಟೂತ್ LE ಆಡಿಯೋ ಮೋಡ್"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ಬ್ಲೂಟೂತ್ LE ಆಡಿಯೋ ಬ್ರಾಡ್‌ಕಾಸ್ಟ್ UI ಪೂರ್ವವೀಕ್ಷಣೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"ವೈಯಕ್ತಿಕ ಆಡಿಯೋ ಹಂಚಿಕೊಳ್ಳುವಿಕೆ ಮತ್ತು ಖಾಸಗಿ ಬ್ರಾಡ್‌ಕಾಸ್ಟ್ ಸೇರಿದಂತೆ LE ಆಡಿಯೋ ಹಂಚಿಕೊಳ್ಳುವಿಕೆಯು UI ಪೂರ್ವವೀಕ್ಷಣೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ಸಾಧನ ವಿವರಗಳಲ್ಲಿ LE ಆಡಿಯೋ ಟಾಗಲ್ ತೋರಿಸಿ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ಬೈಪಾಸ್ ಬ್ಲೂಟೂತ್ LE ಆಡಿಯೊ ಅನುಮತಿ ಪಟ್ಟಿ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ಅನುಮತಿ ಪಟ್ಟಿ ಮಾನದಂಡಗಳನ್ನು ಪೂರೈಸಲು, LE ಆಡಿಯೊ ಪೆರಿಫೆರಲ್ ಅನ್ನು ದೃಢೀಕರಿಸಿರದಿದ್ದರೂ ಸಹ ಡೀಫಾಲ್ಟ್ ಆಗಿ LE ಆಡಿಯೊ ಬಳಸಿ."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ಆ್ಯಪ್ ಭಾಷೆ"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ಸೂಚಿಸಿರುವ ಭಾಷೆಗಳು"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ಎಲ್ಲಾ ಭಾಷೆಗಳು"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"ಸಲಹೆ ಮಾಡಿರುವುದು"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ಎಲ್ಲಾ ಭಾಷೆಗಳು"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ಎಲ್ಲಾ ಪ್ರದೇಶಗಳು"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ಎಲ್ಲಾ ಸಂಖ್ಯೆಯ ವ್ಯವಸ್ಥೆಗಳು"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ಸಿಸ್ಟಂ ಭಾಷೆ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ಸಿಸ್ಟಂ ಡೀಫಾಲ್ಟ್"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೂಲಕ ಈ ಆ್ಯಪ್‌ಗಾಗಿ ಭಾಷೆಯ ಆಯ್ಕೆಯು ಲಭ್ಯವಿಲ್ಲ."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ಬದಲಾಯಿಸಿ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ಈ ಭಾಷೆಯನ್ನು ಸಿಸ್ಟಂ ಭಾಷೆಯಾಗಿ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ, ಆದರೆ ನೀವು ಈ ಭಾಷೆಗೆ ಆದ್ಯತೆ ನೀಡುತ್ತೀರಿ ಎಂದು ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ವೆಬ್‌ಸೈಟ್‌ಗಳಿಗೆ ತಿಳಿಸುತ್ತಿದ್ದೀರಿ."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ಹುಡುಕಿ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ಭಾಷೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ಪ್ರದೇಶ ಪ್ರಾಶಸ್ತ್ಯ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ಭಾಷೆ ಹೆಸರನ್ನು ಟೈಪ್ ಮಾಡಿ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ಇನ್ನಷ್ಟು ಭಾಷೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ಪ್ರಾದೇಶಿಕ ಆದ್ಯತೆಗಳು"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ಯೂನಿಟ್‌ಗಳು ಹಾಗೂ ಸಂಖ್ಯೆಯ ಆದ್ಯತೆಗಳನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ನಿಮ್ಮ ಪ್ರಾದೇಶಿಕ ಆದ್ಯತೆಗಳನ್ನು ಆ್ಯಪ್‌ಗಳಿಗೆ ತಿಳಿಸಿ, ಇದರಿಂದ ಅವುಗಳು ನಿಮ್ಮ ಅನುಭವವನ್ನು ವೈಯಕ್ತೀಕರಿಸಬಹುದು."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ಆ್ಯಪ್‌ಗಳಿಗೆ ಸಾಧ್ಯವಾದರೆ, ನಿಮ್ಮ ಪ್ರಾದೇಶಿಕ ಆದ್ಯತೆಗಳನ್ನು ಬಳಸುತ್ತವೆ."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ಪ್ರಾದೇಶಿಕ ಆದ್ಯತೆಗಳು"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ತಾಪಮಾನ"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ವಾರದ ಮೊದಲ ದಿನ"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ಸಂಖ್ಯೆಗಳ ಆದ್ಯತೆಗಳು"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ರೋಮಿಂಗ್ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ಸಮಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ಈ ಟಾಗಲ್ ಆನ್ ಆಗಿರುವಾಗ ಸಮಯ ವಲಯವನ್ನು ಸೆಟ್ ಮಾಡಲು ಸ್ಥಳವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ಸ್ವಯಂಚಾಲಿತ ದಿನಾಂಕ ಮತ್ತು ಸಮಯ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ವೈರ್‌ಲೆಸ್ ಸಿಗ್ನಲ್‌ಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯವಲಯ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ನಿಮ್ಮ ಸಮೀಪದ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ಲಭ್ಯವಿದ್ದರೆ, ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳವನ್ನು ಬಳಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ಭಾಷೆ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ಗಂಟೆ ಫಾರ್ಮ್ಯಾಟ್‌‌ ಬಳಸಿ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ಸಮಯ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ಬೆರಳನ್ನು ಮೇಲಕ್ಕೆ ಎತ್ತಿರಿ, ನಂತರ ಮತ್ತೊಮ್ಮೆ ಸೆನ್ಸರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ರಿಪೇರಿ ಮಾಡುವವರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ಸ್ಕ್ರೀನ್-ಆಫ್, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್‌ಲಾಕ್"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ಸ್ಕ್ರೀನ್ ಆಫ್ ಆಗಿರುವಾಗಲೂ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ಸ್ಕ್ರೀನ್-ಆಫ್, ಅನ್‌ಲಾಕ್"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ಹೆಚ್ಚಿನ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಲಾಕ್, ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಹಾಗೂ ಇನ್ನಷ್ಟು"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ಎನ್‌ಕ್ರಿಪ್ಶನ್, ರುಜುವಾತುಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟು"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ಪ್ರೈವೇಟ್ ಸ್ಪೇಸ್‌ಗೆ ಪ್ಯಾಟರ್ನ್ ಸೆಟ್‌ ಮಾಡಿ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ಲಾಕ್"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ಮರೆಮಾಡಿ"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಪಿನ್ ಅನ್ನು ಮರು-ನಮೂದಿಸಿ"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರು-ನಮೂದಿಸಿ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ನೀವು ಗರಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ನೀವು ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಿರುವಿರಿ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ಹೆಚ್ಚಿನ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ಆನ್ ಆಗಿದೆ"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ಆಫ್ ಆಗಿದೆ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ಬಾಹ್ಯ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"ಅಂತರ್ನಿರ್ಮಿತ ಪ್ರದರ್ಶನ"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ಬಾಹ್ಯ ಡಿಸ್‌ಪ್ಲೇ ಬಳಸಿ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ಡಿಸ್‌ಪ್ಲೇ ರೆಸಲ್ಯೂಷನ್"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ಬಾಹ್ಯ ಡಿಸ್‌ಪ್ಲೇ ಕನೆಕ್ಷನ್ ಕಡಿತಗೊಂಡಿದೆ"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ತಿರುಗುವಿಕೆ ಅಥವಾ ರೆಸಲ್ಯೂಶನ್ ಅನ್ನು ಬದಲಾಯಿಸುವುದರಿಂದ ಪ್ರಸ್ತುತ ಚಾಲನೆಯಲ್ಲಿರುವ ಯಾವುದೇ ಆ್ಯಪ್‌ಗಳನ್ನು ನಿಲ್ಲಿಸಬಹುದು"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಪ್ರತಿಬಿಂಬಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಬಾಹ್ಯ ಡಿಸ್‌ಪ್ಲೇಗೆ ಕನೆಕ್ಟ್ ಮಾಡಬೇಕು"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ಪ್ರದರ್ಶನಗಳನ್ನು ಮರುಹೊಂದಿಸಲು ಹೋಲ್ಡ್‌ ಮಾಡಿ ಮತ್ತು ಡ್ರ್ಯಾಗ್‌ ಮಾಡಿ."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ಕ್ಯಾಸ್ಟ್ ಮಾಡುವಿಕೆ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ಕನ್ನಡಿ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ಪಾಸ್‌ವರ್ಡ್ ಪರಿಶೀಲಿಸಿ, ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ಸಾಧನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ಈ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್ ಇದೀಗ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ಈ QR ಕೋಡ್‌ಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ಸಮಸ್ಯೆ ಇದೆ. ಮತ್ತೊಂದು ರೀತಿಯಲ್ಲಿ ಕನೆಕ್ಟ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ನೆಟ್‌ವರ್ಕ್ ಆರಿಸಿ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿಸಲು, ನೆಟ್‌ವರ್ಕ್ ಆರಿಸಿ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಈ ಸಾಧನವನ್ನು ಸೇರಿಸುವುದೇ?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ಸ್ವಯಂ-ತಿರುಗುವಿಕೆ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ಸ್ಕ್ರೀನ್ ರೆಸಲ್ಯೂಷನ್"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ಹೆಚ್ಚಿನ ರೆಸಲ್ಯೂಷನ್"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ಪೂರ್ಣ ರೆಸಲ್ಯೂಶನ್"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ಪೂರ್ಣ ರೆಸಲ್ಯೂಶನ್ ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಹೆಚ್ಚು ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ರೆಸಲ್ಯೂಶನ್ ಅನ್ನು ಬದಲಿಸುವುದರಿಂದ ಕೆಲವು ಆ್ಯಪ್‌ಗಳು ಮರುಪ್ರಾರಂಭವಾಗಬಹುದು."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"ಗರಿಷ್ಠ ರೆಸಲ್ಯೂಶನ್"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"ಗರಿಷ್ಠ ರೆಸಲ್ಯೂಶನ್ ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಹೆಚ್ಚು ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ರೆಸಲ್ಯೂಶನ್ ಅನ್ನು ಬದಲಿಸುವುದರಿಂದ ಕೆಲವು ಆ್ಯಪ್‌ಗಳು ಮರುಪ್ರಾರಂಭವಾಗಬಹುದು."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ಬಣ್ಣಗಳು"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ಸ್ವಾಭಾವಿಕ"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ಅಡಾಪ್ಟಿವ್"</string>
     <string name="brightness" msgid="6216871641021779698">"ಪ್ರಖರತೆಯ ಮಟ್ಟ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ಅಡಾಪ್ಟಿವ್‌ ಪ್ರಖರತೆ"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"ಅಡಾಪ್ಟಿವ್ ಬ್ರೈಟ್‌ನೆಸ್ ಕುರಿತು"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಪ್ರಖರತೆಯು ನಿಮ್ಮ ಪರಿಸರ ಮತ್ತು ಚಟುವಟಿಕೆಗಳಿಗೆ ಅನುಗುಣವಾಗಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಡ್ಜಸ್ಟ್ ಆಗುತ್ತದೆ. ನಿಮ್ಮ ಆದ್ಯತೆಗಳನ್ನು ತಿಳಿದುಕೊಳ್ಳಲು ಅಡಾಪ್ಟಿವ್ ಪ್ರಖರತೆಗೆ ಸಹಾಯ ಮಾಡಲು ನೀವು ಹಸ್ತಚಾಲಿತವಾಗಿ ಸ್ಲೈಡರ್ ಅನ್ನು ಸರಿಸಬಹುದು."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ಆನ್"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ಆಫ್"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ಬೆಡ್‌ಟೈಮ್ ಮೋಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ಮೋಡ್‌ಗಳು ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಹ ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು}=1{{mode_1} ಸಹ ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ}=2{{mode_1} ಮತ್ತು {mode_2} ಸಹ ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತವೆ}=3{{mode_1}, {mode_2} ಮತ್ತು {mode_3} ಸಹ ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತವೆ}one{{mode_1}, {mode_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತವೆ}other{{mode_1}, {mode_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತವೆ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ಮೋಡ್‌ಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"ಇನ್ನೂ ಹೆಚ್ಚು ಡಿಮ್"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ಇನ್ನಷ್ಟು ಮಬ್ಬು"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ಸಾಧನವು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಡಿಮ್ ಆಗಿರಲು ಅನುಮತಿಸಿ"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ಸ್ಕ್ರೀನ್ ಟೈಮ್‌ಔಟ್"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ಆದ ಮೇಲೆ"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ಸ್ಥಾನ ಸೇವೆಗಳು"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ಸ್ಥಳವನ್ನು ಬಳಸಿ"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ಸಮಯವಲಯವನ್ನು ಸೆಟ್ ಮಾಡಲು ಸ್ಥಳವನ್ನು ಬಳಸಿ"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ಸಮಯ ವಲಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ಸ್ಥಳ ಅಥವಾ ಸ್ಥಳ ಸೇವೆಗಳು ಆಫ್ ಆಗಿವೆ"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ಸ್ಥಳದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ಇದನ್ನು ಸರಿಪಡಿಸಿ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯ ವಲಯ ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯವಲಯ ಆಫ್ ಆಗಿರುವಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ಸಮಯ ವಲಯವನ್ನು ಸೆಟ್ ಮಾಡಲು ಸ್ಥಳವನ್ನು ಬಳಸಬಹುದು"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳ ಲಭ್ಯವಿದ್ದರೆ, ನಿಮ್ಮ ಸಮಯವಲಯವನ್ನು ಸೆಟ್ ಮಾಡಲು ಅದನ್ನು ಬಳಸಬಹುದು"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ಕಾನೂನು ಮಾಹಿತಿ, ಸ್ಥಿತಿ, ಸಾಫ್ಟ್‌ವೇರ್ ಆವೃತ್ತಿಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="legal_information" msgid="7509900979811934843">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
     <string name="manual" msgid="3651593989906084868">"ಹಸ್ತಚಾಲಿತ"</string>
@@ -1663,7 +1687,7 @@
     <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"ಕೆಲಸದ ಪಿನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"ಪ್ಯಾಟರ್ನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pattern_description" msgid="6808109256008481046">"ಹೆಚ್ಚಿನ ಭದ್ರತೆಗಾಗಿ, ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡುವುದಕ್ಕಾಗಿ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
-    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"ಕೆಲಸದ ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"ಕೆಲಸದ ಪ್ಯಾಟರ್ನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"ಪಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -1683,9 +1707,9 @@
     <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"ಪಿನ್‌ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="3090582314362416762">"ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
-    <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_face" msgid="704061826984851309">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಲು ಪಿನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್ ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_face" msgid="704061826984851309">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಲು ಪಿನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="2053366309272487015">"ಮುಖ ಅಥವಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ಪಾಸ್‌ವರ್ಡ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅಥವಾ ಫೇಸ್ ಲಾಕ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"ಮುಖ ಅಥವಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ಪಿನ್ ಸೆಟ್ ಮಾಡಿ"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ಆಯ್ಕೆಗಳು"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್‌"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಲೇಔಟ್ ಪಿಕ್ಕರ್"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"ಬೌನ್ಸ್ ಕೀಗಳು"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ಮಿ.ಸೆ. ಒಳಗೆ ಒಂದೇ ಕೀಯ ಪುನರಾವರ್ತಿತ ಒತ್ತುವಿಕೆಗಳನ್ನು ಕೀಬೋರ್ಡ್ ತ್ವರಿತವಾಗಿ ನಿರ್ಲಕ್ಷಿಸುತ್ತದೆ"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ಒಂದೇ ಕೀನ ತ್ವರಿತ ಪುನರಾವರ್ತಿತ ಪ್ರೆಸ್‌ಗಳನ್ನು ಕೀಬೋರ್ಡ್ ನಿರ್ಲಕ್ಷಿಸುತ್ತದೆ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ಬೌನ್ಸ್ ಕೀ ಥ್ರೆಶೋಲ್ಡ್"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ನಿಮ್ಮ ಕೀಬೋರ್ಡ್ ಪುನರಾವರ್ತಿತ ಕೀ ಪ್ರೆಸ್‌ಗಳನ್ನು ನಿರ್ಲಕ್ಷಿಸಬೇಕಾದ ಸಮಯದ ಅವಧಿಯನ್ನು ಆರಿಸಿ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2ಸೆ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4ಸೆ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6ಸೆ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ಕಸ್ಟಮ್"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ಕಸ್ಟಮ್ ಮೌಲ್ಯ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ಸ್ಲೋ ಕೀಗಳು"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ಮಿ.ಸೆ. ಗೆ ಸಕ್ರಿಯಗೊಳಿಸಲು ಕೀ ಒತ್ತುವಿಕೆಗೆ ಇದು ತೆಗೆದುಕೊಳ್ಳುವ ಸಮಯವನ್ನು ಹೊಂದಿಸುತ್ತದೆ"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ಕೀ ಪ್ರೆಸ್ ಸಕ್ರಿಯಗೊಳ್ಳಲು ತೆಗೆದುಕೊಳ್ಳುವ ಸಮಯವನ್ನು ಅಡ್ಜಸ್ಟ್ ಮಾಡುತ್ತದೆ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ಸ್ಟಿಕಿ ಕೀಗಳು"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ಕೀಗಳನ್ನು ಜೊತೆಯಾಗಿ ಕೆಳಗೆ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವ ಬದಲಾಗಿ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳಿಗಾಗಿ ಒಂದು ಬಾರಿ ಒಂದು ಕೀ ಅನ್ನು ಒತ್ತಿ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ಮೌಸ್ ಕೀಗಳು"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ಮೌಸ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಲು ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಬಳಸಿ."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ಮೌಸ್ ಕೀಗಳನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ಪಾಯಿಂಟರ್ ಅನ್ನು ಕಂಟ್ರೋಲ್ ಮಾಡಲು ನಿಮ್ಮ ಕೀಬೋರ್ಡ್ ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ಮೌಸ್ ಹಿಮ್ಮುಖ ಸ್ಕ್ರಾಲ್ ಮಾಡುವಿಕೆ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ಪುಟವನ್ನು ಕೆಳಕ್ಕೆ ಸರಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ಕ್ರಾಲ್ ಮಾಡಿ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ಎಡ ಮತ್ತು ಬಲ ಬಟನ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ಎಡ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ನಿಮ್ಮ ಬಲ ಬಟನ್‌ ಆಗಿ ಬಳಸಿ"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> ನ ಮೌಸ್ ಕೀಗಳು"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ಮೌಸ್ ಪಾಯಿಂಟರ್ ಅನ್ನು ಸರಿಸಲು <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ಕೀಗಳನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ಪ್ರಾಥಮಿಕ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಲು <xliff:g id="CLICK_LABEL">%s</xliff:g> ಕೀಯನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ಪ್ರಾಥಮಿಕ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ಒತ್ತಿ ಹಿಡಿಯಲು <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ಕೀಯನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ಪ್ರಾಥಮಿಕ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ಬಿಡುಗಡೆ ಮಾಡಲು <xliff:g id="RELEASE_LABEL">%s</xliff:g> ಕೀಯನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ಸ್ಕ್ರಾಲ್ ಮೋಡ್ ಅನ್ನು ಟಾಗಲ್ ಮಾಡಲು <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ಕೀಯನ್ನು ಬಳಸಿ. ಇದು <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ಕೀಗಳು ವೀಕ್ಷಣೆಯನ್ನು ಮೇಲಕ್ಕೆ, ಕೆಳಕ್ಕೆ, ಎಡ ಅಥವಾ ಬಲಕ್ಕೆ ಸ್ಕ್ರಾಲ್ ಮಾಡುತ್ತದೆ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ಸೆಕೆಂಡರಿ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಲು <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ಕೀಯನ್ನು ಬಳಸಿ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಕೀಬೋರ್ಡ್‌ಗಳು ಮತ್ತು ಉಪಕರಣಗಳು"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ಟಚ್‌ಪ್ಯಾಡ್"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ಟಚ್‌ಪ್ಯಾಡ್ ಮತ್ತು ಮೌಸ್"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ಮೌಸ್"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ಪಾಯಿಂಟರ್ ವೇಗ, ಗೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ಕ್ಲಿಕ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ಟ್ಯಾಪ್ ಡ್ರ್ಯಾಗಿಂಗ್"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ಕೆಳಗಿನ-ಬಲಭಾಗದ ಕ್ಲಿಕ್"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗೆ ಟಚ್‌ಪ್ಯಾಡ್‌ನ ಕೆಳ ಬಲ ಮೂಲೆಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ಪಾಯಿಂಟರ್ ವೇಗ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ಮೂರು ಬೆರಳಿನ ಟ್ಯಾಪ್‌ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ಪಾಯಿಂಟರ್‌ನ ಬಣ್ಣ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ಬ್ಲಾಕ್‌ಗೆ ಪಾಯಿಂಟರ್ ಫಿಲ್ ಶೈಲಿ ಬದಲಿಸಿ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ಹಸಿರಿಗೆ ಪಾಯಿಂಟರ್ ಫಿಲ್ ಶೈಲಿ ಬದಲಿಸಿ"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ಟಚ್‌ಪ್ಯಾಡ್ ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಕಲಿಯಿರಿ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ಟ್ರ್ಯಾಕ್‌ಪ್ಯಾಡ್, ಟ್ರ್ಯಾಕ್ ಪ್ಯಾಡ್, ಮೌಸ್, ಕರ್ಸರ್, ಸ್ಕ್ರಾಲ್, ಸ್ವೈಪ್, ಬಲ-ಕ್ಲಿಕ್, ಕ್ಲಿಕ್, ಪಾಯಿಂಟರ್"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ಬಲ ಕ್ಲಿಕ್, ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ಮಧ್ಯೆ ಕ್ಲಿಕ್"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ಮುಖಪುಟಕ್ಕೆ ಹೋಗಿ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ಹಿಂದಿರುಗಿ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ಇತ್ತೀಚಿನ ಆ್ಯಪ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ಹೋಮ್‌ಗೆ ಹೋಗಿ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ಟಚ್‌ಪ್ಯಾಡ್‌ನಲ್ಲಿ ಎಲ್ಲಿಯಾದರೂ ಮೂರು ಬೆರಳಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ಹಿಂದಿರುಗಿ"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ಗಾಗಿ ಹೊಸ ಕೀ ಆಯ್ಕೆಮಾಡಿ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ಸ್ಟಿಕಿ ಕೀಗಳು, ಬೌನ್ಸ್ ಕೀಗಳು, ಮೌಸ್ ಕೀಗಳು"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ಕೀಗಳನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ಪುನರಾವರ್ತನೆಗೆ ಮೊದಲು ವಿಳಂಬ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ಪುನರಾವರ್ತಿತ ದರ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ಕೀ ಬಿಡುಗಡೆ ಆಗುವವರೆಗೆ ಅದರ ಅಕ್ಷರವನ್ನು ಪುನರಾವರ್ತಿಸಲು ಕೀಯನ್ನು ಹೋಲ್ಡ್ ಮಾಡಿ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ಲೇಔಟ್"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ಡಿಫಾಲ್ಟ್"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ಆಟೋಮೆಟಿಕ್: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ಪ್ರಮಾಣಿತ ಆಯ್ಕೆಗಳು"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ಭಾಷೆ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ಕ್ಯಾಪ್ಶನ್ ಗಾತ್ರ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ಶೀರ್ಷಿಕೆಯ ಶೈಲಿ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ಕಸ್ಟಮ್‌ ಆಯ್ಕೆಗಳು"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ಹಿನ್ನೆಲೆ ಬಣ್ಣ"</string>
@@ -2467,7 +2522,7 @@
     <string name="keywords_display_size" msgid="5286419615221231518">"ಸ್ಕ್ರೀನ್ ಗಾತ್ರ, ದೊಡ್ಡ ಸ್ಕ್ರೀನ್"</string>
     <string name="keywords_bold_text" msgid="6257418169207099589">"ಹೆಚ್ಚಿನ ಕಾಂಟ್ರಾಸ್ಟ್, ಕಡಿಮೆ ವಿಷನ್‌, ಬೋಲ್ಡ್ ಫಾಂಟ್, ಬೋಲ್ಡ್ ಫೇಸ್"</string>
     <string name="keywords_select_to_speak" msgid="2872704811610888719"></string>
-    <string name="keywords_color_correction" msgid="8540442886990423681">"ಬಣ್ಣವನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="keywords_color_correction" msgid="8540442886990423681">"ಬಣ್ಣವನ್ನು ಅಡ್ಜಸ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_color_inversion" msgid="4291058365873221962">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಗಾಢವಾಗಿಸಿ, ಸ್ಕ್ರೀನ್ ಅನ್ನು ಲೈಟ್ ಆಗಿಸಿ"</string>
     <string name="keywords_accessibility_menu" msgid="4300579436464706608"></string>
     <string name="keywords_switch_access" msgid="5813094504384313402"></string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ಒಳಗೊಂಡ ಪ್ಯಾಕೇಜ್‌ಗಳು"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿವೆ"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ಬ್ಯಾಟರಿ ಬದಲಿಸಲು ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ಬ್ಯಾಟರಿ ಸಾಮರ್ಥ್ಯ ಮತ್ತು ಚಾರ್ಜಿಂಗ್ ಕಾರ್ಯಕ್ಷಮತೆಯು ಕಡಿಮೆಯಾಗಿದೆ ಹಾಗೂ ಬ್ಯಾಟರಿಯನ್ನು ಬದಲಾಯಿಸಲು ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ಬ್ಯಾಟರಿ ಮಟ್ಟ ಕಡಿಮೆ ಇದೆ"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಸುಧಾರಿಸಿ"</string>
@@ -2898,7 +2955,7 @@
     <string name="data_usage_disable_mobile" msgid="6183809500102606801">"ಮೊಬೈಲ್ ಡೇಟಾ ಆಫ್ ಮಾಡಬೇಕೆ?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"ಮೊಬೈಲ್ ಡೇಟಾ ಮಿತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="data_usage_disable_4g_limit" msgid="3084868504051520840">"4G ಡೇಟಾ ಮಿತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"2G-3G ಡೇಟಾ ಮಿತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"2G-3G ಡೇಟಾ ಮಿತಿಯನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Wi‑Fi ಡೇಟಾ ಮೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="data_usage_tab_wifi" msgid="801667863336456787">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="2951873059375493878">"ಇಥರ್ನೆಟ್"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ಆವೃತ್ತಿ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ಮರೆತುಬಿಡು"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?"</string>
@@ -3016,7 +3074,7 @@
     <string name="current_backup_pw_prompt" msgid="4962276598546381140">"ಈಗಿನ ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಟೈಪ್‌ ಮಾಡಿ"</string>
     <string name="new_backup_pw_prompt" msgid="4884439230209419503">"ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್‌ಗಳಿಗಾಗಿ ಹೊಸ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="5753796799743881356">"ಹೊಸದಾದ ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಮರುಟೈಪ್ ಮಾಡಿ"</string>
-    <string name="backup_pw_set_button_text" msgid="8892357974661340070">"ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="backup_pw_set_button_text" msgid="8892357974661340070">"ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್‌ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="backup_pw_cancel_button_text" msgid="2244399819018756323">"ರದ್ದುಮಾಡಿ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="7230385345152138051">"ಹೆಚ್ಚುವರಿ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"ನೆಟ್‌ವರ್ಕ್‌ ಪರಿವೀಕ್ಷಿಸಬಹುದಾಗಿದೆ"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"ವಾರದ ದಿನಗಳಲ್ಲಿ 9 AM - 5 PM\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ಸಕ್ರಿಯವಾಗಿದೆ}=2{{mode_1} ಮತ್ತು {mode_2} ಸಕ್ರಿಯವಾಗಿವೆ}=3{{mode_1}, {mode_2}, ಮತ್ತು {mode_3} ಸಕ್ರಿಯವಾಗಿವೆ}one{{mode_1}, {mode_2}, ಮತ್ತು # ಇತ್ಯಾದಿಗಳು ಸಕ್ರಿಯವಾಗಿವೆ}other{{mode_1}, {mode_2}, ಮತ್ತು # ಇತ್ಯಾದಿಗಳು ಸಕ್ರಿಯವಾಗಿವೆ}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ಮೋಡ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}one{# ಮೋಡ್‌ಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}other{# ಮೋಡ್‌ಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ಅಡಚಣೆ ಮಾಡಬೇಡಿ}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ಆನ್ ಆಗಿದೆ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ಸೆಟ್ ಮಾಡಿಲ್ಲ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ಅರ್ಥವಾಯಿತು"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ಅವಧಿ"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ಸಂದೇಶಗಳು, ಈವೆಂಟ್‌ಗಳು &amp; ಜ್ಞಾಪನೆಗಳು"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ಮುಗಿದಿದೆ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ದೃಶ್ಯಗಳು ಕಾಣಿಸುವುದಿಲ್ಲ ಅಥವಾ ಧ್ವನಿಗಳಿರುವುದಿಲ್ಲ"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ಯಾವುದೇ ಧ್ವನಿಯಿರುವುದಿಲ್ಲ"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ ಅಥವಾ ಆಲಿಸುವುದಿಲ್ಲ. ನಕ್ಷತ್ರ ಗುರುತು ಮಾಡಿದ ಸಂಪರ್ಕಗಳಿಂದ ಕರೆಗಳು ಮತ್ತು ಪುನರಾವರ್ತಿತ ಕರೆಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ಪ್ರಸ್ತುತ ಸೆಟ್ಟಿಂಗ್)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ಅಡಚಣೆ ಮಾಡಬೇಡ ನೋಟಿಫಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳು"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಬಳಸುವ ಅದೇ ಧ್ವನಿಗಳನ್ನು ಬಳಸಿ"</string>
@@ -3538,7 +3587,7 @@
     <string name="profile_section_header" msgid="4970209372372610799">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="profile_section_header_for_advanced_privacy" msgid="8385775428904838579">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ಅಡಾಪ್ಟಿವ್‌ ಅಧಿಸೂಚನೆಯ ಆದ್ಯತೆ"</string>
-    <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ಕಡಿಮೆ ಆದ್ಯತೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಾಮಾನ್ಯ ಎಂಬುದಕ್ಕೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಿ"</string>
+    <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>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ಅನ್‌ಲಾಕ್‌ನ ಬಳಿಕ, ನೇರವಾಗಿ ಕೊನೆಯದಾಗಿ ಬಳಸಿದ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಿ. ಲಾಕ್‌ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು ಕಾಣುವುದಿಲ್ಲ. ಅವನ್ನು ನೋಡಲು ಮೇಲಿನಿಂದ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ಲಾಕ್ ಸ್ಕ್ರೀನ್, ಲಾಕ್‌ಸ್ಕ್ರೀನ್, ಸ್ಕಿಪ್ ಮಾಡಿ, ಬೈಪಾಸ್"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿದಾಗ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ನೋಟಿಫಿಕೇಶನ್ ಮಿನಿಮಲಿಸಂ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಕಡಿಮೆ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ತೋರಿಸಿ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಹೊಸ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾತ್ರ ತೋರಿಸಿ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಿಂದ ಈ ಹಿಂದೆಯೇ ವೀಕ್ಷಿಸಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆಗೆದುಹಾಕಿ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ಡೀಫಾಲ್ಟ್ ಮತ್ತು ನಿಶ್ಯಬ್ಧಗೊಳಿಸಿದ ಸಂಭಾಷಣೆಗಳನ್ನು ತೋರಿಸಿ"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ಡೀಫಾಲ್ಟ್ ಮತ್ತು ನಿಶ್ಯಬ್ಧಗೊಳಿಸಿದ ಸಂಭಾಷಣೆಗಳನ್ನು ತೋರಿಸಿ"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ಎಲ್ಲಾ ಉದ್ಯೋಗದ ನೋಟಿಫಿಕೇಶನ್ ಕಂಟೆಂಟ್ ತೋರಿಸಿ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ಸೂಕ್ಷ್ಮ ಕೆಲಸದ ಕಂಟೆಂಟ್‍ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"ನಿಮ್ಮ ಸಾಧನವು ಲಾಕ್‌ ಆಗಿರುವಾಗ, ನೀವು ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಹೇಗೆ ತೋರಿಸಲು ಬಯಸುವಿರಿ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ನೀವು ಕಡಿಮೆ ಸಮಯದಲ್ಲಿ ಹೆಚ್ಚು ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ವೀಕರಿಸಿದಾಗ, ನಿಮ್ಮ ಸಾಧನವು 2 ನಿಮಿಷಗಳವರೆಗೆ ತನ್ನ ವಾಲ್ಯೂಮ್ ಅನ್ನು ತಗ್ಗಿಸುತ್ತದೆ ಮತ್ತು ಅಲರ್ಟ್‌ಗಳನ್ನು ಕಡಿಮೆ ಮಾಡುತ್ತದೆ. ಕರೆಗಳು, ಅಲಾರಂಗಳು ಮತ್ತು ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು ಪ್ರಭಾವಿತವಾಗುವುದಿಲ್ಲ. \n\nಕೂಲ್‌ಡೌನ್ ಸಮಯದಲ್ಲಿ ಸ್ವೀಕರಿಸಿದ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಕ್ರೀನ್‌ನ ಮೇಲಿನಿಂದ ಕೆಳಕ್ಕೆ ಎಳೆಯುವ ಮೂಲಕ ಕಾಣಬಹುದಾಗಿದೆ."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ಉದ್ಯೋಗದ ಪ್ರೊಫೈಲ್‌ಗಳಿಗೆ ಅನ್ವಯಿಸಿ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನ್ವಯಿಸಿ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ಬಂಡಲ್ ಮಾಡಲಾದ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ಆನ್ ಆಗಿದೆ"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ನೋಟಿಫಿಕೇಶನ್ ಬಂಡಲ್ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಿ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ನಿಶ್ಯಬ್ದವಾದ ಅನುಭವಕ್ಕಾಗಿ ಸಮಾನವಾದ ಥೀಮ್‌ಗಳನ್ನು ಹೊಂದಿರುವ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ನಿಶ್ಯಬ್ದಗೊಳಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಒಟ್ಟಿಗೆ ಗುಂಪು ಮಾಡಲಾಗುತ್ತದೆ. ಬಂಡಲ್ ಮಾಡುವುದರಿಂದ ಆ್ಯಪ್‌ನ ಸ್ವಂತ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು ಅತಿಕ್ರಮಣಗೊಳ್ಳುತ್ತವೆ."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ಸಹಾಯ ಸೇವೆಗಳು"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ಯಾವುದೇ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳು VR ಅಸಿಸ್ಟೆಂಟ್ ಸೇವೆಗಳ ರೀತಿಯಲ್ಲಿ ರನ್ ಮಾಡಲು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ VR ಸೇವೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ಸಂಭಾಷಣೆ}one{# ಸಂಭಾಷಣೆಗಳು}other{# ಸಂಭಾಷಣೆಗಳು}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"ಸಂಭಾಷಣೆಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ಯಾರು ಅಡಚಣೆಯನ್ನು ಉಂಟುಮಾಡಬಹುದು"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ಮೆಸೇಜಿಂಗ್ ಅಥವಾ ಕರೆಗಳ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಸೂಚಿಸಲಾಗದಿದ್ದರೂ ಸಹ, ನೀವು ಇಲ್ಲಿ ಆಯ್ಕೆಮಾಡುವ ಜನರು, ಆ ಆ್ಯಪ್‌ಗಳ ಮೂಲಕ ಈಗಲೂ ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಿಸಬಹುದು"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ಕರೆಗಳು"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ಯಾರಾದರೂ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ಸ್ಟಾರ್ ಗುರುತಿನ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"ಸಂಪರ್ಕಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ನಕ್ಷತ್ರಹಾಕಿರುವ ಸಂಪರ್ಕಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ಅಲಾರಮ್‌ಗಳು"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ಕೆಲಸ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ಲೆಕ್ಕ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ಆ್ಯಪ್‌ಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ಅತಿಕ್ರಮಿಸಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ಅಡಚಣೆ ಉಂಟುಮಾಡಬಹುದಾದ ಆ್ಯಪ್‌ಗಳು"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ಮೋಡ್ ಅನ್ನು ರಚಿಸಿ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ಕಸ್ಟಮ್ ಮೋಡ್"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ಮೋಡ್ ಹೆಸರು"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ಮೋಡ್ ಹೆಸರನ್ನು ಖಾಲಿ ಬಿಡುವ ಹಾಗಿಲ್ಲ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ಒಂದು ಐಕಾನ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ಬೆಡ್‌ಟೈಮ್ ದಿನಚರಿ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ಡ್ರೈವಿಂಗ್ ಮಾಡುವಾಗ"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ಫುಲ್ ಸ್ಕ್ರೀನ್ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ಈ ಆ್ಯಪ್‌ನಿಂದ ಫುಲ್-ಸ್ಕ್ರೀನ್ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ಸಾಧನ ಲಾಕ್ ಆಗಿರುವಾಗ ಫುಲ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಆವರಿಸಿಕೊಳ್ಳುವ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ತೋರಿಸಲು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಿ. ಅಲಾರಾಂಗಳು, ಒಳಬರುವ ಕರೆಗಳು ಅಥವಾ ಇತರ ತುರ್ತಿನ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಹೈಲೈಟ್ ಮಾಡಲು ಆ್ಯಪ್‌ಗಳು ಇವುಗಳನ್ನು ಬಳಸಬಹುದು."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"ಸಿಸ್ಟಂ ಆದ್ಯತೆಗಳನ್ನು ಬರೆಯಿರಿ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ನಿಮ್ಮ ಪರವಾಗಿ ಸಿಸ್ಟಂ ಆದ್ಯತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಈ ಆ್ಯಪ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ಈ ಅನುಮತಿಯು ಕೋರ್ ಸಿಸ್ಟಂ ಆದ್ಯತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"ಮಾಧ್ಯಮ ನಿರ್ವಹಣೆಯ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ಮೀಡಿಯಾ ನಿರ್ವಹಿಸಲು ಆ್ಯಪ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ಅನುಮತಿಸಿದರೆ, ಈ ಆ್ಯಪ್ ನಿಮ್ಮನ್ನು ಕೇಳದೆಯೇ ಇತರ ಆ್ಯಪ್‌ಗಳ ಮೂಲಕ ರಚಿಸಲಾದ ಮೀಡಿಯಾ ಫೈಲ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಬಹುದು ಅಥವಾ ಅಳಿಸಬಹುದು. ಮೀಡಿಯಾ ಮತ್ತು ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಆ್ಯಪ್ ಅನುಮತಿಯನ್ನು ಹೊಂದಿರಬೇಕು."</string>
@@ -4262,7 +4343,7 @@
     <string name="set_data_warning" msgid="1685771882794205462">"ಡೇಟಾ ಎಚ್ಚರಿಕೆಯನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
     <string name="data_warning_footnote" msgid="5991901765915710592">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ ಮತ್ತು ಡೇಟಾ ಮಿತಿಯನ್ನು ನಿಮ್ಮ ಸಾಧನದಿಂದ ಅಳೆಯಲಾಗುತ್ತದೆ. ಇದು ವಾಹಕ ಡೇಟಾದಿಂದ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
-    <string name="set_data_limit" msgid="9010326815874642680">"ಡೇಟಾ ಮಿತಿ ಹೊಂದಿಸಿ"</string>
+    <string name="set_data_limit" msgid="9010326815874642680">"ಡೇಟಾ ಮಿತಿ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="data_limit" msgid="8731731657513652363">"ಡೇಟಾ ಮಿತಿ"</string>
     <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_2">%2$s</xliff:g> ಅವಧಿಯಲ್ಲಿ <xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="configure" msgid="1499586749829665889">"ಕಾನ್ಫಿಗರ್ ಮಾಡು"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ಜೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ತ್ವರಿತವಾಗಿ ಕ್ಯಾಮರಾ ತೆರೆಯಿರಿ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಲು, ಎರಡು ಬಾರಿ ಪವರ್ ಬಟನ್ ಒತ್ತಿ. ಯಾವುದೇ ಸ್ಕ್ರೀನ್‍ನಿಂದ ಕೆಲಸ ಮಾಡುತ್ತದೆ."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ಸೆಲ್ಫೀ ತೆಗೆಯಲು ಕ್ಯಾಮರಾ ತಿರುಗಿಸಿ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ನ್ಯಾವಿಗೇಶನ್ ಮೋಡ್"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ಸ್ಯಾಟಲೈಟ್ ಮೂಲಕ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ. ನಿಮ್ಮ ಖಾತೆಯ ಜೊತೆಗೆ ಸೇರಿಸಲಾಗಿದೆ."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ಸ್ಯಾಟಲೈಟ್ ಮೂಲಕ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ. ನಿಮ್ಮ ಖಾತೆಯೊಂದಿಗೆ ಸೇರಿಸಲಾಗಿಲ್ಲ."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಕುರಿತಾಗಿ"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"ಸ್ಯಾಟಲೈಟ್ ಮೆಸೇಜಿಂಗ್, ಸ್ಯಾಟಲೈಟ್ ಕನೆಕ್ಟಿವಿಟಿ"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> ಕುರಿತು"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"ಅರ್ಹ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಖಾತೆಯ ಭಾಗವಾಗಿ, ನೀವು ಸ್ಯಾಟಲೈಟ್‌ನ ಮೂಲಕ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು ಮತ್ತು ಸ್ವೀಕರಿಸಬಹುದು"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"ನಿಮ್ಮ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಪ್ಲಾನ್"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯು ನಿಮ್ಮ ಖಾತೆಯ ಜೊತೆಯಲ್ಲಿ ಸೇರಿದೆ"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"ನಿಮ್ಮ ಖಾತೆಯೊಂದಿಗೆ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯು ನಿಮ್ಮ ಖಾತೆಯ ಜೊತೆಯಲ್ಲಿ ಸೇರಿಲ್ಲ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ಇದು ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ನಿಮ್ಮ ಫೋನ್ ಸ್ಯಾಟಲೈಟ್‌ಗೆ ಆಟೋ-ಕನೆಕ್ಟ್ ಆಗುತ್ತದೆ. ಉತ್ತಮ ಕನೆಕ್ಷನ್‌ಗಾಗಿ, ಆಕಾಶ ಸ್ಪಷ್ಟವಾಗಿ ಕಾಣುವ ಹಾಗೆ ಇರಿಸಿ."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ನಿಮ್ಮ ಫೋನ್ ಸ್ಯಾಟಲೈ‌ಟ್‌ಗೆ ಕನೆಕ್ಟ್ ಆದ ನಂತರ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"ತುರ್ತು ಸೇವೆಗಳಿಗೂ ಸಹಿತ, ನೀವು ಯಾರಿಗಾದರೂ ಸಂದೇಶ ಕಳುಹಿಸಬಹುದು. ಲಭ್ಯವಿರುವಾಗ ನಿಮ್ಮ ಫೋನ್ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ರೀಕನೆಕ್ಟ್ ಆಗುತ್ತದೆ."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯು ಹೆಚ್ಚು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು ಮತ್ತು ಇದು ಕೆಲವು ಪ್ರದೇಶಗಳಲ್ಲಿ ಮಾತ್ರ ಲಭ್ಯವಿರುತ್ತದೆ. ಹವಾಮಾನ ಮತ್ತು ಕೆಲವೊಂದು ರಚನೆಗಳು ನಿಮ್ಮ ಸ್ಯಾಟಲೈಟ್ ಕನೆಕ್ಷನ್ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು. ಸ್ಯಾಟಲೈಟ್ ಮೂಲಕ ಕರೆ ಮಾಡುವ ಸೌಲಭ್ಯ ಲಭ್ಯವಿಲ್ಲ. ಹಾಗಿದ್ದರೂ ತುರ್ತು ಕರೆಗಳು ಕನೆಕ್ಟ್ ಆಗಬಹುದು.\n\nಖಾತೆಗೆ ಮಾಡಿರುವ ಬದಲಾವಣೆಗಳು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳಲು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ವಾಹಕ ಕಂಪನಿಯನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ಸ್ಯಾಟಲೈಟ್ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಕುರಿತಾಗಿ ಇನ್ನಷ್ಟು"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> ಹೆಚ್ಚು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು ಮತ್ತು ಇದು ಕೆಲವು ಪ್ರದೇಶಗಳಲ್ಲಿ ಮಾತ್ರ ಲಭ್ಯವಿರುತ್ತದೆ. ಹವಾಮಾನ ಮತ್ತು ಕೆಲವೊಂದು ರಚನೆಗಳು ನಿಮ್ಮ ಸ್ಯಾಟಲೈಟ್ ಕನೆಕ್ಷನ್ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು. ಸ್ಯಾಟಲೈಟ್ ಮೂಲಕ ಕರೆ ಮಾಡುವ ಸೌಲಭ್ಯ ಲಭ್ಯವಿಲ್ಲ. ಹಾಗಿದ್ದರೂ ತುರ್ತು ಕರೆಗಳು ಕನೆಕ್ಟ್ ಆಗಬಹುದು.\n\nಖಾತೆಗೆ ಮಾಡಿರುವ ಬದಲಾವಣೆಗಳು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳಲು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> ಕುರಿತು ಇನ್ನಷ್ಟು"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲು, ಮೊದಲು ಸ್ಯಾಟಲೈಟ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಕೊನೆಗೊಳಿಸಿ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ಸ್ಯಾಟಲೈಟ್ ಕನೆಕ್ಟಿವಿಟಿ"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"ಸ್ಯಾಟಲೈಟ್‌ ಕನೆಕ್ಟಿವಿಟಿ"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"ಸ್ಯಾಟಲೈಟ್‌ ಕನೆಕ್ಟಿವಿಟಿ"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"ಸ್ಯಾಟಲೈಟ್ ಮೆಸೇಜಿಂಗ್"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ಡೇಟಾದ ಬಳಕೆಯನ್ನು ನಿಮ್ಮ ಖಾತೆಯೊಂದಿಗೆ ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"ಸ್ಯಾಟಲೈಟ್ SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"ನೀವು ಮೊಬೈಲ್ ಅಥವಾ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗದಿದ್ದಾಗ ತುರ್ತು ಸೇವೆಗಳೊಂದಿಗೆ ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"ಸ್ಯಾಟಲೈಟ್ SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"ಸ್ಯಾಟಲೈಟ್ SOS ಕುರಿತು"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"ನೀವು ತುರ್ತು ಸೇವೆಗಳೊಂದಿಗೆ ಸಂದೇಶ ಕಳುಹಿಸಬಹುದು ಮತ್ತು ಮೊಬೈಲ್ ಅಥವಾ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗದಿದ್ದಾಗ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಈ ಸೇವೆಯು ಎಲ್ಲಾ ಸ್ಥಳಗಳಲ್ಲಿ ಅಥವಾ ಸಂದರ್ಭಗಳಲ್ಲಿ ಎಲ್ಲಾ ಸಮಯದಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲದಿರಬಹುದು."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಕರೆ ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶ"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ತುರ್ತು ಪರಿಸ್ಥಿತಿಯ ಕುರಿತ ಪ್ರಶ್ನೆಗಳಿಗೆ ಉತ್ತರಿಸಿ"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"ಸ್ಯಾಟಲೈಟ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ಹಂತಗಳನ್ನು ಅನುಸರಿಸಿ"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"ನೀವು ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಹೊಂದಿಲ್ಲದಿದ್ದರೆ, ನಿಮಗೆ ಸ್ಯಾಟಲೈಟ್ SOS ಅನ್ನು ಬಳಸುವ ಆಯ್ಕೆ ಕಾಣುತ್ತದೆ"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ನಿಮಗೆ ಸರಿಯಾದ ರೀತಿಯ ಸಹಾಯವನ್ನು ಒದಗಿಸಲು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಉತ್ತರಗಳನ್ನು ಕಳುಹಿಸಿ"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"ನೀವು ಕನೆಕ್ಟ್ ಆದ ನಂತರ, ನೀವು ತುರ್ತು ಸೇವೆಗಳೊಂದಿಗೆ ಸಂದೇಶ ಕಳುಹಿಸಬಹುದು"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ಡೆಮೋ ಬಳಸಿ ನೋಡಿ"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"ನೀವು ಸ್ಯಾಟಲೈಟ್ ಮೂಲಕ ತುರ್ತು ಸೇವೆಗಳೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ, ನಿಮ್ಮ ಹೆಸರು, ಇಮೇಲ್, ಫೋನ್ ಸಂಖ್ಯೆ, ಸ್ಥಳ, ಸಾಧನದ ಮಾಹಿತಿ (IMEI, ಭಾಷೆ, ಮಾದರಿ, ಬ್ಯಾಟರಿ ಹಂತ) ಮತ್ತು ತುರ್ತು ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ತುರ್ತು ಸೇವೆಗಳು ಮತ್ತು ಸ್ಯಾಟಲೈಟ್ ಸೇವೆ ಒದಗಿಸುವವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತದೆ. \n\nಸ್ಯಾಟಲೈಟ್ SOS ಅನ್ನು ಬಳಸಲು, Google Messages ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್ SMS ಆ್ಯಪ್ ಆಗಿರಬೇಕು. \n\nಸ್ವಯಂಚಾಲಿತ ನೆಟ್‌ವರ್ಕ್ ಆಯ್ಕೆಯು ಆಫ್ ಆಗಿದ್ದರೆ, ಅದು ಆನ್ ಆಗುತ್ತದೆ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನವು ಯಾವುದೇ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕಗೊಳ್ಳುತ್ತದೆ."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"ಆದ್ಯತೆಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳುವುದು"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ತುರ್ತು ಸಂಪರ್ಕಗಳು"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"ನಿಮ್ಮ Google ಖಾತೆ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ತುರ್ತು ಸೇವೆಗಳೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುವ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಿ ಅಥವಾ ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ಆ್ಯಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಹೆಸರುಗಳು"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ನೀವು ಪೇಜ್-ಅಗ್ನಾಸ್ಟಿಕ್ ಮೋಡ್‌ನ 16KB ಮೋಡ್‌ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್‌ನಲ್ಲಿ ಸಾಫ್ಟ್‌ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್‌ಲೋಡರ್ ಅನ್‌ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್‌ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಆ್ಯಪ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನೀವು 4KB ಮೋಡ್‌ಗೆ ಹಿಂತಿರುಗಿ ಮತ್ತು ನಂತರ ಸಾಧನದ ಬೂಟ್‌ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕು. ಇದು ಸಾಧನವನ್ನು ಮತ್ತೆ ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುತ್ತದೆ ಮತ್ತು ಅದನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಸ್ಥಾಪಿಸುತ್ತದೆ. ಸಾಧನವು ಯಶಸ್ವಿಯಾಗಿ Android ಗೆ ಬೂಟ್ ಆದ ನಂತರ, ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳಲ್ಲಿ OEM ಅನ್‌ಲಾಕಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನವು Android ಗೆ ಬೂಟ್ ಮಾಡಲು ವಿಫಲವಾದಲ್ಲಿ ಅಥವಾ ಸ್ಥಿರವಾಗಿಲ್ಲದಿದ್ದರೆ, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers ನಿಂದ ಇತ್ತೀಚಿನ ಫ್ಯಾಕ್ಟರಿ ಚಿತ್ರಗಳೊಂದಿಗೆ ಸಾಧನವನ್ನು ಮರು-ಫ್ಲಾಶ್ ಮಾಡಿ .google.com/android/images&lt;/a&gt; ಅಥವಾ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ಮತ್ತು \'ವೈಪ್ ಡಿವೈಸ್\', \'ಲಾಕ್ ಬೂಟ್‌ಲೋಡರ್\' ಮತ್ತು \'ಎಲ್ಲಾ ಪಾರ್ಟಿಶನ್‌ಗಳನ್ನು ಫೋರ್ಸ್ ಫ್ಲ್ಯಾಶ್ ಮಾಡಿ\' ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ಇನ್ನಷ್ಟು ಓದಿ"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ಪುಟ ಗಾತ್ರದ ಹೊಂದಾಣಿಕೆ ಮೋಡ್‌ನೊಂದಿಗೆ ಆ್ಯಪ್ ಅನ್ನು ರನ್ ಮಾಡಿ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ಬಗ್ ವರದಿ ಹ್ಯಾಂಡ್‌ಲರ್"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆ ಶಾರ್ಟ್‌ಕಟ್ ಅನ್ನು ಯಾವ ಆ್ಯಪ್ ಹ್ಯಾಂಡಲ್ ಮಾಡುತ್ತದೆ ಎಂದು ನಿರ್ಧರಿಸುತ್ತದೆ."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ವೈಯಕ್ತಿಕ"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ಸ್ಟ್ರೀಮ್ ಅನ್ನು ಆಲಿಸಿ"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆ ಕೇಳಲು ಆಡಿಯೋ ಸ್ಟ್ರೀಮ್ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"ಹಂಚಿಕೊಳ್ಳುವಾಗ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಎಡಿಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಪಾಸ್‌ವರ್ಡ್ ಬದಲಾಯಿಸಲು, ಮೊದಲು ಆಡಿಯೋ ಹಂಚಿಕೊಳ್ಳುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಿ."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ 4-16 ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು ಮತ್ತು ಅಕ್ಷರಗಳು, ಸಂಖ್ಯೆಗಳು ಮತ್ತು ಚಿಹ್ನೆಗಳನ್ನು ಮಾತ್ರ ಬಳಸಬೇಕು"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR ಕೋಡ್ ಸ್ಕ್ಯಾನರ್"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ಸಹಾಯ ಬೇಕೇ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"ಸಂಪರ್ಕಗಳು, ಸಂಗ್ರಹಣೆ, ಖಾತೆ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ಸಂಪರ್ಕಗಳ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ಸಾಧನ ಮಾತ್ರ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ಹೊಸ ಸಂಪರ್ಕಗಳನ್ನು ಖಾತೆಯ ಜೊತೆ ಸಿಂಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ಸಂಪರ್ಕಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೇವ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆಗಿ ನಿಮ್ಮ ಖಾತೆಗೆ ಸಿಂಕ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ ಮಾಡುವಾಗ ದೋಷ ಎದುರಾಗಿದೆ"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ಡೀಫಾಲ್ಟ್ ಆಗಿ ಯಾವುದನ್ನೂ ಸೆಟ್ ಮಾಡಿಲ್ಲ"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ಸಾಧನ ಮಾತ್ರ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ಸಾಧನ ಮತ್ತು %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ಪ್ರಾರಂಭಿಸಲು ಒಂದು ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ಸಂಪರ್ಕಗಳನ್ನು ಎಲ್ಲಿ ಸೇವ್ ಮಾಡಬೇಕು"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ಹುಡುಕಲು ಒಂದು ಸರ್ಕಲ್ ರಚಿಸಿ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿನ ಕಂಟೆಂಟ್ ಅನ್ನು ಬಳಸಿಕೊಂಡು ಹುಡುಕಲು ಹೋಮ್ ಬಟನ್ ಅಥವಾ ನ್ಯಾವಿಗೇಶನ್ ಹ್ಯಾಂಡಲ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿಯಿರಿ."</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index babd76dfc52..0d2685a4460 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"눈송이"</item>
     <item msgid="7952183800501346803">"비치 파라솔"</item>
     <item msgid="799139025758265891">"워크숍 도구"</item>
-    <item msgid="1330084588359129896">"텐트"</item>
+    <item msgid="8112685757657659269">"피아노"</item>
     <item msgid="3861584909935022342">"필름 릴"</item>
     <item msgid="5827426100157335512">"책"</item>
     <item msgid="8585828346253128384">"연꽃"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 344fc55b7a6..fa925c826cf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"새 기기와 페어링"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"블루투스"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"내일 자동 사용 설정"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"블루투스를 끄면 다음 날 다시 켜집니다."</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"오른쪽 보청기 페어링"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"왼쪽 보청기 페어링"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"반대쪽 보청기 페어링"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"블루투스 LE 오디오 사용 중지"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"기기가 LE 오디오 하드웨어 기능을 지원하는 경우 블루투스 LE 오디오 기능을 사용 중지합니다."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"블루투스 LE 오디오 모드"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"블루투스 LE 오디오 브로드캐스트 UI 미리보기 사용 설정"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"개인 오디오 공유 및 비공개 브로드캐스트를 포함한 LE 오디오 공유 UI 미리보기 사용 설정"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"기기 세부정보에 LE 오디오 전환 버튼 표시"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"블루투스 LE 오디오 허용 목록 우회"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE 오디오 주변기기가 허용 목록 기준을 충족하는 것으로 확인되지 않은 경우에도 기본적으로 LE 오디오를 사용합니다."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"앱 언어"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"추천 언어"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"모든 언어"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"추천"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"모든 언어"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"모든 지역"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"모든 번호 체계"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"시스템 언어"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"시스템 기본값"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"설정에서 이 앱의 언어를 선택할 수 없습니다."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"변경"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s 사용할 수 없음"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"이 언어는 시스템 언어로 사용할 수 없습니다. 단, 이제 앱과 웹사이트에서 이 언어가 선호 언어로 인식됩니다."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"검색"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"언어 추가"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"지역 환경설정"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"언어 이름 입력"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"언어 설정 더보기"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"지역 설정"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"단위 및 숫자 환경설정"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"앱 환경을 맞춤설정할 수 있도록 지역 설정을 알려주세요."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"가능한 경우 앱에서 지역 설정을 사용합니다."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"지역 설정"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"온도"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"일주일 중 첫날"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"숫자 환경설정"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"로밍 시 데이터 서비스에 연결"</string>
     <string name="roaming_disable" msgid="729512894708689604">"로밍 시 데이터 서비스에 연결"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"로밍 요금이 부과될 수 있습니다."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"자동으로 시간 설정"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"자동 설정"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"위치는 이 전환 스위치가 켜져 있을 때 시간대를 설정하는 데 사용됩니다."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"날짜 및 시간 자동 설정"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"네트워크 및 무선 신호를 사용하여 자동으로 설정합니다."</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"시간대 자동 설정"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"주변의 모바일 네트워크를 기반으로 자동으로 설정합니다."</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"가능한 경우, 기기 위치를 사용하여 자동으로 설정합니다."</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"언어 기본값 사용"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24시간 형식 사용"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"시간"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"손가락을 뗐다가 센서를 다시 터치하세요."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"지문 센서를 사용할 수 없음"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"수리업체에 방문하세요."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"화면 꺼짐 상태에서 지문 잠금 해제"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"화면이 꺼져 있어도 지문 잠금 해제 사용"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"화면 꺼짐, 잠금 해제"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"보안 설정 더보기"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"직장 프로필 잠금, 암호화 등"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"암호화, 사용자 인증 정보 등"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"비공개 스페이스용 패턴 설정"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"잠금"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"숨기기"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"비공개 스페이스 패턴 확인"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"비공개 스페이스 PIN 다시 입력"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"비공개 스페이스 비밀번호 다시 입력"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"지문을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"최대 개수의 지문을 추가했습니다."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"지문을 추가할 수 없습니다."</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"사용"</string>
     <string name="external_display_off" msgid="5634413756025351374">"사용 안함"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"외부 디스플레이"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"내장 디스플레이"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"외부 디스플레이 사용"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"디스플레이 해상도"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"외부 디스플레이가 연결되지 않았습니다"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"회전 또는 해상도를 변경하면 현재 실행 중인 앱이 중지될 수 있습니다"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"화면을 미러링하려면 기기가 외부 디스플레이에 연결되어 있어야 합니다"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"옵션 더보기"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"길게 터치하고 드래그하여 디스플레이를 재정렬하세요."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"전송"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"미러링"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"무선 디스플레이 사용"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"비밀번호를 확인하고 다시 시도해 보세요."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"기기 제조업체에 문의하세요."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"연결을 확인한 후 다시 시도해 보세요."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"현재 이 Wi‑Fi 네트워크를 사용할 수 없습니다."</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"이 QR 코드에 문제가 있습니다. 다른 방법으로 연결해 보세요."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"네트워크 선택"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"기기를 연결하려면 네트워크를 선택하세요."</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"이 기기를 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 추가하시겠습니까?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"자동 회전에 관해 자세히 알아보기"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"화면 해상도"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"고해상도"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"원본 해상도"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"원본 해상도 사용 시 배터리 사용량이 증가합니다. 해상도를 전환하면 일부 앱이 다시 시작될 수 있습니다."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"최대 해상도"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"최대 해상도 사용 시 배터리 사용량이 증가합니다. 해상도를 전환하면 일부 앱이 다시 시작될 수 있습니다."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"선택됨"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"색상"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"자연스럽게"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"색상 자동 조절"</string>
     <string name="brightness" msgid="6216871641021779698">"밝기 수준"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"밝기 자동 조절"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"밝기 자동 조절 정보"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"화면 밝기가 환경 및 활동에 맞게 자동으로 조정됩니다. 슬라이더를 수동으로 이동하여 밝기 자동 조절 기능이 사용자의 환경설정을 학습하도록 할 수 있습니다."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"사용"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"사용 안함"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"취침 모드 설정"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{모드에서도 어두운 테마를 활성화할 수 있습니다.}=1{{mode_1}에서도 어두운 테마가 활성화됩니다.}=2{{mode_1} 및 {mode_2}에서도 어두운 테마가 활성화됩니다.}=3{{mode_1}, {mode_2}, {mode_3}에서도 어두운 테마가 활성화됩니다.}other{{mode_1}, {mode_2} 외 #개 모드에서도 어두운 테마가 활성화됩니다.}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"모드 설정"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"더 어둡게"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"더 어둡게"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"기기 화면을 평소보다 어둡게 설정"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"화면 자동 잠금 시간"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"위치 서비스"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"위치 서비스"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"위치 정보 사용"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"시간대 설정에 위치 사용"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"시간대를 자동으로 설정할 수 없음"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"위치 또는 위치 서비스가 꺼져 있음"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"위치 설정"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"문제 해결"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"취소"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"자동 시간대가 사용 안함"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"자동 시간대가 사용 중지된 경우 사용할 수 없습니다."</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"시간대 설정을 위해 위치가 사용될 수 있음"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"기기 위치를 사용할 수 있는 경우 시간대를 설정하는 데 기기 위치가 사용될 수도 있습니다."</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"법률 정보, 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information" msgid="7509900979811934843">"법률 정보"</string>
     <string name="manual" msgid="3651593989906084868">"수동"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"옵션"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"접근성"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"물리적 키보드"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"바운스 키"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g>밀리초 이내에 동일한 키를 빠르게 반복해서 누를 시 키보드에서 이를 무시합니다."</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"동일한 키를 빠르게 반복해서 누를 시 키보드에서 이를 무시합니다."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"바운스 키 기준점"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"키보드에서 반복 키 입력을 무시하는 시간을 선택하세요"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2초"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4초"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6초"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"맞춤"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"맞춤 값"</string>
     <string name="slow_keys" msgid="2891452895499690837">"느린 키"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"키를 누를 때 활성화하기까지 걸리는 시간을 <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g>밀리초로 조정합니다."</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"키를 누를 때 활성화하기까지 걸리는 시간을 조정합니다."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"고정키"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"단축키를 사용할 때 키를 함께 누르지 않고 한 번에 하나씩 누릅니다"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"마우스 키"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"실제 키보드를 사용해서 마우스를 제어합니다."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"마우스 키 사용"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"키보드를 사용하여 포인터를 제어합니다."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"마우스 역방향 스크롤"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"위로 스크롤하여 페이지 아래로 이동합니다."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"왼쪽 및 오른쪽 버튼 바꾸기"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"왼쪽 마우스 버튼을 오른쪽 버튼으로 사용합니다."</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>의 마우스 키"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"<xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> 키를 사용하여 마우스 포인터를 이동합니다."</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"<xliff:g id="CLICK_LABEL">%s</xliff:g> 키를 사용하여 기본 마우스 버튼을 클릭합니다."</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> 키를 사용하여 기본 마우스 버튼을 길게 누릅니다."</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"<xliff:g id="RELEASE_LABEL">%s</xliff:g> 키를 사용하여 기본 마우스 버튼을 놓습니다."</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"스크롤 모드를 전환하려면 <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> 키를 사용하세요. 이렇게 하면 <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> 키를 사용하여 뷰를 위, 아래, 왼쪽 또는 오른쪽으로 스크롤할 수 있습니다."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> 키를 사용하여 마우스의 보조 버튼을 클릭합니다."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"단축키"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"단축키 목록 표시"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"직장 프로필 키보드 및 도구"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"기본"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"터치패드"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"터치패드 및 마우스"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"마우스"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"포인터 속도, 동작"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"탭하여 클릭"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"탭하여 드래그"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"오른쪽 하단 클릭"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"더 많은 옵션을 확인하려면 터치패드 오른쪽 하단을 클릭합니다"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"포인터 속도"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"세 손가락으로 탭하기 사용"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"포인터 색상"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"포인터 채움 스타일을 검은색으로 변경"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"포인터 채움 스타일을 초록색으로 변경"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"터치패드 동작 알아보기"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"트랙패드, 트랙 패드, 마우스, 커서, 스크롤, 스와이프, 마우스 오른쪽 버튼으로 클릭, 클릭, 포인터"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"마우스 오른쪽 버튼으로 클릭, 탭"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"가운데 버튼 클릭"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"어시스턴트 실행"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"홈으로 이동"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"뒤로"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"최근 앱 보기"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"홈으로 이동"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"터치패드 아무 곳에서나 세 손가락을 사용해 위로 스와이프하세요."</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"돌아가기"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>의 새 키 선택:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"실제 키보드 접근성"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"고정키, 바운스 키, 마우스 키"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"키 반복"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"반복 전 지연"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"반복 속도"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"키를 길게 눌러 문자를 반복해서 입력하고 키에서 손을 뗍니다."</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> 레이아웃"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"기본"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"자동: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"미리보기"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"표준 옵션"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"언어"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"텍스트 크기"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"자막 크기"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"자막 스타일"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"맞춤설정 옵션"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"배경색"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"전원 사용 조절"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"포함된 패키지"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"앱이 정상적으로 작동 중"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"배터리 교체 권장"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"배터리 용량과 충전 성능이 저하되어 배터리 교체가 권장됩니다."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"배터리 잔량 부족"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"절전 모드를 사용 설정하여 배터리 수명을 늘리세요"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"배터리 수명 개선"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"이 VPN을 연결 해제하시겠습니까?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"연결 해제"</string>
     <string name="vpn_version" msgid="6344167191984400976">"버전"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"버전 <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN 삭제"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"기존 VPN을 교체하시겠습니까?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"연결 유지 VPN을 설정하시겠습니까?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\'평일 오전 9시~오후 5시\'"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"캘린더 일정"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} 모드가 활성화됨}=2{{mode_1} 및 {mode_2} 모드가 활성화됨}=3{{mode_1}, {mode_2}, {mode_3} 모드가 활성화됨}other{{mode_1}, {mode_2} 외 #개 모드가 활성화됨}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{모드 1개가 자동으로 사용 설정될 수 있음}other{모드 #개가 자동으로 사용 설정될 수 있음}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{방해 금지 모드}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"사용"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"설정되지 않음"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"사용 중지됨"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"확인"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"알림"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"길이"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"메시지, 일정, 캘린더 알림"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"방해 금지 모드가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"완료"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"설정"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"알림 표시 및 소리 차단"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"알림 소리 차단"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"알림을 보거나 들을 수 없게 됩니다. 별표 표시된 연락처 및 반복 발신자의 전화는 허용됩니다."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(현재 설정)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"방해 금지 모드의 알림 설정을 변경하시겠습니까?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"직장 프로필 소리"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"개인 프로필 소리 사용"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"개인 프로필과 동일한 소리 사용"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"잠금 해제 후 최근 사용한 화면으로 바로 이동합니다. 잠금 화면에 알림이 표시되지 않습니다. 알림을 보려면 위에서 아래로 스와이프하세요."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"잠금 화면, 잠금화면, 건너뛰기, 우회"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"직장 프로필이 잠긴 경우"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"잠금 화면 알림 최소화"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"잠금 화면에 알림 간략히 표시"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"잠금 화면에 새 알림만 표시"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"잠금 화면에서 이미 본 알림 자동으로 삭제"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"잠금 화면에 표시할 알림"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"대화, 기본 및 무음 알림 표시"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"모든 대화와 기본 및 무음 알림 표시"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"모든 직장 알림 내용 표시"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"민감한 직장 콘텐츠 숨기기"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"기기가 잠겨 있을 때 프로필 알림 표시 방법을 선택하세요."</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"짧은 시간 내에 많은 알림을 받으면 최대 2분간 기기에서 볼륨을 낮추고 알림을 최소화합니다. 통화, 알람, 우선순위 대화는 영향을 받지 않습니다. \n\n쿨다운 중에 받은 알림은 화면 상단에서 아래로 당겨서 확인할 수 있습니다."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"직장 프로필에 적용"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"직장 프로필 앱에 적용"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"번들로 묶인 알림"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"사용"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"사용 안함"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"알림 번들로 묶기 사용"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"비슷한 테마의 알림은 음소거되고 함께 그룹화되어 더 조용한 환경을 제공합니다. 번들로 묶기는 앱 자체의 알림 설정보다 우선합니다."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 도우미 서비스"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"설치된 앱 중에서 VR 도우미 서비스로 실행되도록 요청한 앱이 없습니다."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR 서비스가 <xliff:g id="SERVICE">%1$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"우선순위 대화"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"없음"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{없음}=1{대화 1개}other{대화 #개}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"대화 설정"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"예외 대상"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"메시지 또는 전화 앱에서 나에게 알림을 전송할 수 없을 때에도 여기에서 선택한 사람은 이러한 앱을 통해 나에게 연락할 수 있습니다."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"전화"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"모든 사용자"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"연락처"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"별표표시한 연락처"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"연락처 설정"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"별표표시 연락처 설정"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"없음"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"없음"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"알람"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g>(직장용)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"계산 중…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"앱 설정"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"앱에서 무시하도록 허용"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"예외가 허용되는 앱"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"모드 만들기"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"맞춤 모드"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"모드 이름"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"모드 이름은 비워 둘 수 없습니다."</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"아이콘 선택"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"캘린더 일정"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"취침 시간 루틴"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"운전 중"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"전체 화면 알림"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"이 앱에 전체 화면 알림 허용"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"기기가 잠겨 있을 때 앱에서 알림을 전체 화면에 표시할 수 있도록 허용합니다. 앱에서는 이러한 방식으로 알람, 수신 전화 또는 기타 긴급 알림을 강조 표시할 수 있습니다."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"시스템 환경설정 쓰기"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"이 앱이 사용자를 대신하여 시스템 환경설정을 수정하도록 허용"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"이 권한은 앱이 핵심 시스템 환경설정을 수정하도록 허용합니다."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"미디어 관리 앱"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"앱이 미디어를 관리하도록 허용"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"허용하면 이 앱이 다른 앱에서 생성된 미디어 파일을 사용자의 동의 없이 수정하거나 삭제할 수 있습니다. 앱에 파일 및 미디어 액세스 권한을 부여해야 합니다."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"동작"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"빠르게 카메라 열기"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"카메라를 빨리 열려면 전원 버튼을 두 번 누릅니다. 어느 화면에서나 작동합니다."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"뒤집어서 셀카용 카메라로 전환"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"탐색 모드"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"위성 메시지"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"위성을 통해 문자 메시지를 주고받습니다. 계정에 포함되어 있습니다."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"위성을 통해 문자 메시지를 주고받습니다. 계정에 포함되어 있지 않습니다."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"위성 메시지"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"위성 메시지 정보"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"위성 메시지, 위성 연결"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> 정보"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"대상 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 계정에 포함되어 있는 경우 위성으로 문자 메시지를 주고 받을 수 있습니다"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"사용 중인 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 요금제"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"위성 메시지가 계정에 포함되어 있음"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"계정에 메시지가 포함되어 있음"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"위성 메시지가 계정에 포함되어 있지 않음"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"자세히 알아보기"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"작동 방식"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"휴대전화가 위성에 자동 연결됩니다. 최적의 연결을 위해 하늘이 잘 보이는 상태를 유지하세요."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"휴대전화가 위성에 연결된 후"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"응급 서비스를 포함해 누구에게나 문자 메시지를 보낼 수 있습니다. 모바일 네트워크가 사용 가능해지면 휴대전화가 네트워크에 다시 연결됩니다."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"위성 메시지는 시간이 더 오래 소요될 수 있으며 일부 지역에서만 사용 가능합니다. 날씨 및 특정 구조물이 위성 연결에 영향을 미칠 수 있습니다. 위성 통화를 사용할 수 없습니다. 긴급 전화는 연결될 수 있습니다.\n\n계정 변경사항이 설정에 표시되는 데 다소 시간이 걸릴 수 있습니다. 자세한 내용은 이동통신사에 문의하세요."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"위성 메시지 자세히 알아보기"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>은 시간이 더 오래 소요될 수 있으며 일부 지역에서만 사용 가능합니다. 날씨 및 특정 구조물이 위성 연결에 영향을 미칠 수 있습니다. 위성 통화를 사용할 수 없습니다. 긴급 전화는 연결될 수 있습니다.\n\n계정 변경사항이 설정에 표시되는 데 다소 시간이 걸릴 수 있습니다. 자세한 정보는 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>에 문의하세요."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> 정보 더보기"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> 기능을 사용 설정할 수 없음"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> 기능을 사용 설정하려면 먼저 위성 연결을 해제하세요."</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"위성 연결"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"위성 연결"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"위성 연결"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"위성 메시지"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"계정에 데이터 사용이 포함되어 있음"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"위성 긴급 SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"모바일 또는 Wi‑Fi 네트워크에 연결할 수 없을 때 응급 서비스에 메시지를 보낼 수 있습니다."</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"위성 긴급 sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"위성 긴급 SOS 정보"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"모바일이나 Wi-Fi 네트워크에 연결할 수 없을 때 응급 서비스에 메시지를 보내고 위치를 공유할 수 있습니다. 일부 위치, 상황, 시간대에는 서비스가 제공되지 않을 수 있습니다."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"응급 서비스에 전화하거나 문자 메시지를 보내세요."</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"긴급 상황에 관한 질문에 답변하세요."</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"단계에 따라 위성에 연결하세요."</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"모바일 네트워크에 연결되지 않으면 위성 긴급 SOS를 사용할 수 있는 옵션이 표시됩니다."</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"적절한 도움을 받을 수 있도록 응급 서비스로 답변이 전송됩니다."</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"연결되면 응급 서비스에 메시지를 보낼 수 있습니다."</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"데모 사용해 보기"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"위성으로 응급 서비스에 연결하면 이름, 이메일, 전화번호, 위치, 기기 정보(IMEI, 언어, 모델, 배터리 잔량), 비상 연락처 정보가 응급 서비스 및 위성 서비스 제공업체와 공유됩니다. \n\n위성 긴급 SOS를 사용하려면 Google 메시지가 기본 SMS 앱이어야 합니다. \n\n자동 네트워크 선택이 사용 중지되어 있다면 사용 설정되고 기기가 네트워크에 자동으로 연결됩니다."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"공유 환경설정"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"비상 연락처"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"내 Google 계정"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"응급 서비스와 공유될 정보를 검토하거나 업데이트하세요."</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"액세스 포인트 네임(APN)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>에 연결된 경우 사용할 수 없음"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"현재 페이지 크기에 구속받지 않는 16KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 4KB 모드로 다시 전환한 후 기기의 부트로더를 잠가야 합니다. 이렇게 하면 기기가 다시 초기화되고 프로덕션 설정으로 복원됩니다. 기기를 Android로 부팅 완료한 후에는 개발자 옵션에서 OEM 잠금 해제를 사용 중지하세요. 기기가 Android로 부팅되지 않거나 불안정한 경우 &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;의 최신 공장 출고 시 이미지로 기기를 다시 플래시하거나 &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;을 사용하여 \'기기 완전 삭제\', \'부트로더 잠금\', \'모든 파티션 강제 플래시\'를 선택하세요."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"페이지에 구속받지 않는 16KB 모드"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"자세히 알아보기"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"페이지 크기 호환 모드로 앱 실행"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"버그 신고 핸들러"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"어떤 앱이 기기의 버그 신고 바로가기를 처리하는지 정합니다."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"개인"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"스트림 듣기"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"오디오 스트림 QR 코드를 스캔하여 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기로 들으세요."</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"공유 중에는 비밀번호를 수정할 수 없습니다. 비밀번호를 변경하려면 먼저 오디오 공유를 사용 중지하세요."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"비밀번호는 4~16자(영문 기준)여야 하며 문자, 숫자, 기호만 사용해야 합니다."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR 코드 스캐너"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"도움이 필요하신가요?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"설정 검색"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"연락처, 저장소, 계정"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"연락처 저장소"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"기기만"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"새 연락처는 계정과 동기화되지 않습니다."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"연락처가 기기에 저장되고 기본적으로 계정과 동기화됩니다."</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"기본 계정을 설정하는 중에 오류가 발생했습니다."</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"기본 설정 없음"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"기기만"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"기기 및 %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"계정을 추가하여 시작하세요."</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"연락처 저장 위치"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"서클 투 서치"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"화면의 콘텐츠를 사용해 검색하려면 홈 버튼 또는 탐색 핸들을 길게 터치합니다."</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index ecd3a22e499..7514614940d 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Кар бүртүгү"</item>
     <item msgid="7952183800501346803">"Кумдуу жээктеги чатыр"</item>
     <item msgid="799139025758265891">"Устаканадагы аспаптар"</item>
-    <item msgid="1330084588359129896">"Чатыр"</item>
+    <item msgid="8112685757657659269">"Пианино"</item>
     <item msgid="3861584909935022342">"Тасма түрмөгү"</item>
     <item msgid="5827426100157335512">"Аудиокитеп"</item>
     <item msgid="8585828346253128384">"Лотос гүлү"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 5792ce8cbc8..2a08f63f0b9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Жаңы түзмөк кошуу"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Эртең автоматтык түрдө күйгүзүлсүн"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Өчүп турган Bluetooth эртеси өзү эле күйүп калат"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Оң кулакты жупташтыруу"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Сол кулакты жупташтыруу"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Экинчи кулагыңызды жупташтырыңыз"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE audio\'ну өчүрүү"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Эгер түзмөктө аппараттык мүмкүнчүлүктөр болсо, Bluetooth LE Audio функциясы өчүрүлөт."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio режими"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio Broadcast колдонуучу интерфейсинин алдын ала версиясын иштетүү"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"LE Audio Sharing колдонуучу интерфейсинин алдын ала версиясын, ошондой эле жеке аудиону бөлүшүү жана купуя кабарлоону иштетет"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Түзмөктүн чоо-жайынан LE Audio которгучун көрсөтүү"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio ак тизмесин кыйгап өтүү"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio тышкы түзмөгү ак тизменин талабына жооп берери ырасталбаса да, LE Audio\'ну демейки шартта колдонуңуз."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Колдонмонун тили"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Сунушталган тилдер"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Бардык тилдер"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Сунушталган"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Бардык тилдер"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Бардык аймактар"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Бардык номерлөө системалары"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Системанын тили"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Системанын демейки параметрлери"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Бул колдонмонун тилин Параметрлерден тандоого болбойт."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Өзгөртүү"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s жеткиликсиз"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Бул тилди системанын тили катары колдонууга болбойт, бирок колдонмолор менен вебсайттар ушул тилди жактырарыңызды билип турушат."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Издөө"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Тил кошуу"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Чөлкөмдүк жөндөөлөр"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Тилди киргизиңиз"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Дагы башка тил параметрлери"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Чөлкөмдүк параметрлер"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Бирдик жана сан параметрлерин тууралайсыз"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Колдонмолор ушул параметрлер аркылуу кызматты жекелештиришет."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Колдонмолор мүмкүн болгон жерлерде чөлкөмдүк параметрлериңизди колдонот."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Өлкөгө ылайыктап тууралоо"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Аптанын биринчи күнү"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Сан параметрлери"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Роуминг учурунда маалыматтарды өткөрүүчү кызматтарга туташасыз"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Роуминг учурунда маалыматтарды өткөрүүчү кызматтарга туташасыз"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Роуминг акысын төлөп калышыңыз мүмкүн."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Убакытты автоматтык түрдө коюу"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Автоматтык түрдө коюу"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Бул параметр күйгүзүлгөндө, убакыт алкагы жүргөн жериңизге жараша туураланат"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Күн менен убакытты автоматтык түрдө аныктоо"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Тармак жана зымсыз сигналдар аркылуу автоматтык түрдө коюлат"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Убакыт алкагын автоматтык түрдө аныктоо"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Жаныңыздагы мобилдик тармактарга жараша автоматтык түрдө коюлат"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Түзмөктүн жайгашкан жерине жараша автоматтык түрдө коюлат"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Демейки жергиликтүү форматты колдонуу"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сааттык форматты колдонуу"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Убакыт"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Манжаңызды көтөрүп, кайра сенсорго тийгизиңиз"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Манжа изинин сенсорун колдонууга болбойт"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Тейлөө кызматына кайрылыңыз."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Өчүрүлгөн экран, Манжа изи менен ачуу"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Экран өчүп турса да, манжа изи менен ачуу функциясы колдонулат"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Өчүрүлгөн экран, кулпуну ачуу"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Кошумча коопсуздук параметрлери"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Жумуш профилин кулпулоо, шифрлөө жана башкалар"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрлөө, аккаунтка байланыштуу нерселер жана башкалар"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Жеке мейкиндик үчүн граф. ачкыч коюңуз"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Кулпулоо"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Жашыруу"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Жеке мейкиндиктин графикалык ачкычын ырастаңыз"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Жеке мейкиндиктин PIN кодун ырастаңыз"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Жеке мейкиндиктин сырсөзүн кайра киргизиңиз"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> чейин манжа изин кошсоңуз болот"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Кошулган манжа издеринин саны жогорку чегине жетти"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Дагы манжа издерин кошуу мүмкүн эмес"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Күйүк"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Өчүк"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Тышкы экран"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Алдын ала орнотулган дисплей"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Тышкы экранды колдонуу"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Экрандын дааналыгы"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Тышкы экран ажыратылды"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Буруу же дааналыгын өзгөртүү учурда иштеп жаткан колдонмолорду токтотушу мүмкүн"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Башка экранга чыгаруу үчүн түзмөгүңүз тышкы экранга туташтырылышы керек"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Башка варианттар"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Экрандардын иретин өзгөртүү үчүн кармап туруп, сүйрөңүз."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Тышкы экранга чыгаруу"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"күзгү"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Зымсыз мониторду иштетүү"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Сырсөздү текшерип, кайталап көрүңүз"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Түзмөктү өндүрүүчүгө кайрылыңыз"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Туташууну текшерип, кайталап көрүңүз"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Бул Wi‑Fi тармагы азыр жеткиликсиз"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Бул QR кодунда маселе бар. Башка жол менен туташып көрүңүз."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Тармакты тандоо"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Түзмөктү туташтыруу үчүн тармакты тандаңыз"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Бул түзмөк \"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулсунбу?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Автоматтык түрдө бурулуу жөнүндө кененирээк маалымат"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Экрандын дааналыгы"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Жогорку дааналык"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Толук дааналык"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Толук дааналык режиминде батареяңыз тез отуруп калат. Дааналыкты өзгөртсөңүз, айрым колдонмолор өчүп кайра күйүшү мүмкүн."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Эң жогорку дааналык"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Эң жогорку дааналык режиминде батареяңыз тез отуруп калат. Дааналыкты өзгөртсөңүз, айрым колдонмолор өчүп кайра күйүшү мүмкүн."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Тандалды"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстөр"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табигый"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Ыңгайлаштырылуучу"</string>
     <string name="brightness" msgid="6216871641021779698">"Жарык деңгээли"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Ыңгайлашуучу жарык"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Ыңгайлаштырылуучу жарык жөнүндө"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Экрандын жарыктыгы жүргөн жериңизге жана аткарган ишиңизге жараша автоматтык түрдө өзгөрөт. Сыдырманы колуңуз менен сыдырып, жарыкты өзүңүз каалагандай ыңгайлаштырып алыңыз."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Күйүк"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Өчүк"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Уйку режиминин параметрлери"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режимдерде караңгы тема да иштетилиши мүмкүн}=1{{mode_1} режиминде караңгы тема да иштетилет}=2{{mode_1} жана {mode_2} режимдеринде караңгы тема да иштетилет}=3{{mode_1}, {mode_2} жана {mode_3} режимдеринде караңгы тема да иштетилет}other{{mode_1}, {mode_2} жана дагы # режимде караңгы тема да иштетилет}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Режимдердин параметрлери"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Күңүртүрөөк"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Кошумча караңгылатуу"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Экранды адаттагыдан күңүртүрөөк кыласыз"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Экран канчадан кийин өчөт"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өчүп турса да, колдонмолор менен кызматтарга жакын жердеги түзмөктөрдү издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Жайгашкан жерди аныктоо кызматтары"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Жайгашкан жерди аныктоо кызматтары"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Жайгашкан жерди аныктоо"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Убакыт алкагын жүргөн жердин негизинде аныктоо"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Убакыт алкагы автоматтык түрдө коюлбай жатат"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Жайгашкан жер же Жайгашкан жерди аныктоо кызматтары өчүк"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Жайгашкан жерди аныктоо параметрлери"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Муну оңдоо"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Жок"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Убакыт алкагын автоматтык түрдө аныктоо өчүк"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Убакыт алкагын автоматтык түрдө аныктоо өчүп турганда жеткиликсиз"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Убакыт алкагы жайгашкан жерге жараша орнотулушу мүмкүн"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Түзмөгүңүздүн жайгашкан жери аныкталса, убакыт алкагы ошого жараша коюлушу мүмкүн"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
     <string name="legal_information" msgid="7509900979811934843">"Юридикалык маалымат"</string>
     <string name="manual" msgid="3651593989906084868">"Кол менен"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Параметрлер"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Атайын мүмкүнчүлүктөр"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Аппараттык баскычтоп"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Кайтаруу баскычтары"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мсек. ичинде баскычтын удаа басылганы этибарга алынбайт"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Бир эле баскычтын удаа басылганы этибарга алынбайт"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Удаа басылган баскычтардын мааниси"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Баскычтын удаа басылганы этибарга алынбаган убакыттын узундугун тандаңыз"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 сек."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 сек."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 сек."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Жеке"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"жеке маани"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Жай баскычтар"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мсек. өткөндөн кийин басылган баскыч эске алынат"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Басылган баскыч качан эске алынарын тууралайт"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Жабышма баскычтар"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Ыкчам баскычтарды чогуу басып туруунун ордуна бирден басасыз"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Чычкандын баскычтары"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Чычканды аппараттык баскычтоп аркылуу башкарасыз"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Чычкандын баскычтарын колдонуу"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Курсорду баскычтоп менен башкарасыз"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Чычкан менен артка сыдыруу"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Баракты ылдый жылдыруу үчүн экранды өйдө сыдырыңыз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Сол жана оң баскычтарды алмаштырыңыз"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Чычкандын сол баскычын оң баскыч катары колдонуңуз"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> үчүн чычкандын баскычтары"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Чычкандын курсорун жылдыруу үчүн <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> баскычтарын колдонуңуз"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Чычкандын негизги баскычын басуу үчүн <xliff:g id="CLICK_LABEL">%s</xliff:g> баскычын колдонуңуз"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Чычкандын негизги баскычын коё бербей басып туруу үчүн <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> баскычын колдонуңуз"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Чычкандын негизги баскычын коё берүү үчүн <xliff:g id="RELEASE_LABEL">%s</xliff:g> баскычын колдонуңуз"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Сыдыруу режимин өчүрүү/күйгүзүү үчүн <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> баскычын колдонуңуз. Бул режимде <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> баскычтары менен экранды өйдө, ылдый, солго же оңго сыдырууга болот"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Чычкандын кошумча баскычын басуу үчүн <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> баскычын колдонуңуз"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Ыкчам баскычтар"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ыкчам баскычтардын тизмеси көрүнөт"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Жумуш профилинин баскычтоптору жана куралдары"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Демейки"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сенсордук такта"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сенсордук такта жана чычкан"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Чычкан"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Көрсөткүчтүн ылдамдыгы, жаңсоолор"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Таптап чыкылдатуу"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Таптап сүйрөө"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Ылдыйкы оң бурчун чыкылдатуу"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Дагы параметрлерди көрүү үчүн сенсордук тактанын ылдыйкы оң бурчун басыңыз"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Көрсөткүчтүн ылдамдыгы"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Үч манжа менен таптоо параметрин колдонуу"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Курсордун түсү"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Толтуруу стилин карага өзгөртүү"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Толтуруу стилин жашылга өзгөртүү"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Сенсордук тактанын жаңсоолорун үйрөнүү"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"трекпад, трекпад, чычкан, курсор, сыдыруу, сүрүү, оң баскычын чыкылдатуу, чыкылдатуу, көрсөткүч"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"оң баскычын чыкылдатуу, таптап коюу"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Ортосун чыкылдатуу"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Жардамчыны иштетүү"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Башкы бетке өтүү"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Артка кайтуу"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Акыркы колдонмолорду көрүү"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Башкы бетке өтүү"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Сенсордук тактанын каалаган жерин үч манжаңыз менен жогору сүрүңүз"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Артка кайтуу"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> үчүн жаңы ачкыч тандаңыз:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Аппараттык баскычтоптогу атайын мүмкүнчүлүктөр"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Жабышма баскычтар, Кайтаруу баскычтары, Чычкандын баскычтары"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Баскычтарды кайталоо"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Кайталанганга чейинки кечигүү"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Кайталоо ылдамдыгы"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Символду кайталап терүү үчүн баскычты коё бербей басып туруңуз"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> калыбы"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Демейки"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматтык: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Алдын ала көрүү"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандарттык опциялар"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Тили"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Тексттин көлөмү"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Коштомо жазуунун өлчөмү"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Коштомо жазуунун стили"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Ылайыкташтырылган тууралоолор"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Фондун түсү"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Кубат сарпталышын тууралоо"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Камтылган топтомдор"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Колдонмолор туура иштеп жатат"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Түзмөгүңүздүн батареясын алмаштырыңыз"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Батареянын сыйымдуулугу жана кубаттоо майнаптуулугу төмөндөдү. Батареяны алмаштыруу сунушталат."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Батареянын деңгээли төмөн"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Батареяны көбүрөөк убакытка жеткирүү үчүн Батареяны үнөмдөгүч режимин күйгүзүңүз"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Батареяны көбүрөөк убакытка жеткирүү"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Бул VPN ажыратылсынбы?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ажыратуу"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> версиясы"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN профили унутулсун"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Учурдагы VPN алмаштырылсынбы?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Туруктуу VPN\'ди жөндөйсүзбү?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Иш күндөрү саат 09:00 баштап 17:00 чейин\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Жылнаамадагы иш-чаралар"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} иштеп жатат}=2{{mode_1} жана {mode_2} иштеп жатат}=3{{mode_1}, {mode_2} жана {mode_3} иштеп жатат}other{{mode_1}, {mode_2} жана дагы # иштеп жатат}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режимди автоматтык түрдө күйгүзүүгө болот}other{# режимди автоматтык түрдө күйгүзүүгө болот}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Тынчымды алба}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"КҮЙҮК"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Туураланган эмес"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Өчүк"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Түшүндүм"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Билдирмелер"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Узактыгы"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Билдирүүлөр, иш-чаралар жана эстеткичтер"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\"Тынчымды алба\" режиминде билдирүүлөр, эстеткичтер жана иш-чаралар тууралуу билдирмелер үнсүз режимде алынат (жогоруда уруксат берилгендерден тышкары). Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүнүн үнүн угуп алуу үчүн параметрлерди тууралап алыңыз."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Бүттү"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Параметрлер"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Билдирмелердин үнү чыкпайт"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Билдирмелерди көрбөйсүз да, укпайсыз. Белгиленген байланыштарга жана кайталап чалгандарга уруксат берилди."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Учурдагы жөндөө)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"Тынчымды алба\" режиминин билдирмелеринин параметрлери өзгөртүлсүнбү?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Жумуш профилиндеги үндөр"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Жеке профилдин үндөрүн колдонуу"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Жеке профилдин үндөрү колдонулат"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Кулпусу ачылгандан кийин акыркы көргөн экранга өтөсүз. Билдирмелер кулпуланган экранда көрүнбөйт. Аларды көрүү үчүн экранды ылдый сүрүңүз."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Кулпуланган экран, кулпу экраны, өткөрүп жиберүү, айланып өтүү"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Жумуш профили кулпуланганда"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Кулпуланган экранда көрсөтүлгөн билдирмелерди азайтуу"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Кулпуланган экранда билдирмелерди азыраак көрсөтүү"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Кулпуланган экранда жаңы билдирмелерди гана көрсөтүү"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Буга чейин көрүлгөн билдирмелер кулпуланган экрандан дароо өчүп калат"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Кулпуланган экрандагы билдирмелер"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Бардык жазышууларды көрсөтүү"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Бардык жазышуулар көрүнөт"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Жумуш билдирмелери толугу менен көрүнөт"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Жумушка байланыштуу купуя нерселер жашырылат"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Түзмөгүңүз кулпуланып турганда, профиль билдирмелери кандайча көрүнсүн?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Кыска убакытта көп билдирме келгенде, түзмөгүңүздүн үнү 2 мүнөткө басаңдап, алардын келгенин кабарлаган билдирүүлөр да азаят. Бул режимдин чалууларга, ойготкучтарга жана маанилүү жазышууларга таасири тийбейт. \n\nУшул 2 мүнөттүн ичинде келген билдирмелерди экранды өйдө жагынан ылдый сүрүп көрсөңүз болот."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Жумуш профилдерине колдонуу"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Жумуш профилинин колдонмолоруна колдоносуз"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Топтоштурулган билдирмелер"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Күйүк"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Өчүк"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Билдирмелер топтоштуруусун колдонуу"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Окшош темалардагы билдирмелердин үнү өчүрүлүп, тынчыраак иштөө үчүн топтоштурулат. Топтоштуруу колдонмонун билдирмелер жөндөөлөрүн өзгөртүп коёт."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR көмөкчү кызматтары"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнотулган колдонмолор көмөкчү VR кызматы катары иштөөгө уруксат сураган жок."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR кызматына <xliff:g id="SERVICE">%1$s</xliff:g> кызматын жеткиликтүү кыласызбы?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"маанилүү жазышуулар"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Эч бири"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жок}=1{1 сүйлөшүү}other{# сүйлөшүү}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Сүйлөшүүлөрдүн параметрлери"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"\"Тынчымды алба\" режими таасир этпеген колдонуучулар"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Жазышуу жана чалуулар колдонмолорунун билдирмелери өчүк болсо да, бул жерде көрсөтүлгөн байланыштар сиз менен байланыша беришет"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Чалуулар"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Баары"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Байланыштар"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Белгиленген байланыштар"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Байланыштардын параметрлери"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Жылдызчаланган байланыштардын параметрлери"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Эч бири"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Эч бири"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Ойготкучтар"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (жумуш)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Эсептелүүдө…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Колдонмонун параметрлери"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Колдонмолорго өзгөртүп коюуга уруксат берүү"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"\"Тынчымды алба\" режими таасир этпеген колдонмолор"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Режим түзүү"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Жеке режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Режимдин аталышы"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Режимдин аталышы бош болбошу керек"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Сүрөтчө тандаңыз"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Жылнаамадагы иш-чаралар"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Уктоо жана ойгонуу убакыты"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Айдап бара жатканда"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Толук экрандагы билдирмелер"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Бул колдонмого толук экрандагы билдирмелерди көрсөтүүгө уруксат берүү"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Бул колдонмого түзмөк кулпуланып турганда толук экрандагы билдирмелерди көрсөтүүгө уруксат бериңиз. Колдонмолор муну ойготкучтарды, кирүүчү чалууларды же башка шашылыш билдирмелерди көрсөтүү үчүн колдонушат."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Системанын параметрлерин жазуу"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Бул колдонмого системанын параметрлерин сиздин атыңыздан өзгөртүүгө уруксат бериңиз"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Колдонмо системанын негизги параметрлерин өзгөртө алат."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Медиафайлдарды башкарган колдонмолор"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Колдонмого медиа файлдарды башкарууга уруксат берүү"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Эгер уруксат берилсе, бул колдонмо башка колдонмолордо түзүлгөн медиа файлдарды сурабастан түзөтүп же жок кыла алат. Колдонмого файлдар менен медиага кирүүгө уруксат берүү керек."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Жаңсоолор"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Камераны тез ачуу"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Камераны тез ачуу үчүн каалаган экрандан кубат баскычын эки жолу басыңыз."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Селфи тартуу үчүн маңдайкы камерага которулуу"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Навигация режими"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Спутник аркылуу жазышуу"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Спутник аркылуу текст билдирүүлөрдү алып же жөнөтүңүз. Аккаунтуңузда бул мүмкүнчүлүк бар."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Спутник аркылуу текст билдирүүлөрдү алып же жөнөтүңүз. Аккаунтуңузга кошулган эмес."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Спутник аркылуу жазышуу"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Спутник аркылуу жазышуу тууралуу"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Спутник аркылуу байланышуу, спутник байланышы"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> жөнүндө"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Эгер сизде жарамдуу <xliff:g id="CARRIER_NAME">%1$s</xliff:g> аккаунту болсо, спутник аркылуу текст билдирүүлөрдү жөнөтүп же ала аласыз"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> тарифтик планыңыз"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Аккаунтуңузда Спутник аркылуу жазышуу мүмкүнчүлүгү бар"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Аккаунтуңузда жазышуу мүмкүнчүлүгү камтылган"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Аккаунтуңузда Спутник аркылуу жазышуу мүмкүнчүлүгү жок"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Кеңири маалымат"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Ал кантип иштейт"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Телефонуңуз спутникке автоматтык түрдө туташат. Асман ачык көрүнгөн жерде болушуңуз керек."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Телефонуңуз спутникке туташкандан кийин"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Сиз каалаган адамга, анын ичинде кырсыктаганда жардамга келчү кызматтарга текст билдирүү жөнөтө аласыз. Телефонуңуз мүмкүн болгондо мобилдик тармакка кайра туташат."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Спутник аркылуу жазышуу көбүрөөк убакытты алышы мүмкүн жана кээ бир аймактарда гана жеткиликтүү. Аба ырайы жана айрым нерселер спутник менен байланышыңызга таасирин тийгизиши мүмкүн. Спутник аркылуу чалууга болбойт. Шашылыш чалуу жеткиликтүү болушу мүмкүн.\n\nАккаунтка киргизилген өзгөртүүлөр Параметрлерде бир аздан кийин көрүнөт. Кеңири маалымат үчүн байланыш операторуңузга кайрылыңыз."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Спутник аркылуу жазышуу тууралуу кеңири маалымат"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> көбүрөөк убакытты алышы мүмкүн жана айрым аймактарда гана жеткиликтүү. Аба ырайы жана айрым нерселер спутник менен байланышыңызга таасирин тийгизиши мүмкүн. Спутник аркылуу чалууга болбойт. Шашылыш чалуу жеткиликтүү болушу мүмкүн.\n\nАккаунтка киргизилген өзгөртүүлөр Параметрлерде бир аздан кийин көрүнөт. Кеңири маалымат алуу үчүн <xliff:g id="CARRIER_NAME">%1$s</xliff:g> менен байланышыңыз."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> жөнүндө көбүрөөк маалымат"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> күйгүзүлбөй жатат"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> функциясын иштетүү үчүн алгач спутник менен байланышты токтотуңуз"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Спутник байланышы"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Спутник байланышы"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"спутник байланышы"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"спутник аркылуу байланышуу"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Аккаунтуңузда маалыматтарды колдонуу мүмкүнчүлүгү камтылган"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Спутник SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Мобилдик Интернетке же Wi-Fi тармагына туташа албаганда кырсыктаганда жардамга келчү кызматтарга билдирүү жөнөтө аласыз"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"спутник sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Спутник SOS тууралуу"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Мобилдик же Wi-Fi тармагына туташа албаганда кырсыктаганда жардамга келчү кызматтарга билдирүү жөнөтүп, жүргөн жериңизди бөлүшө аласыз. Бул кызмат айрым жерлерде же шарттарда ар дайым жеткиликтүү болбой калышы мүмкүн."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Кырсыктаганда жардамга келчү кызматтарга чалып же SMS жөнөтүңүз"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Өзгөчө кырдаал жөнүндө суроолорго жооп бериңиз"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Спутникке туташуу үчүн кадамдарды аткарыңыз"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Эгер мобилдик тармак болбосо, спутник SOS\'ту колдонуу сунушун көрөсүз"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Керектүү жардам алууңуз үчүн жоопторуңузду кырсыктаганда жардамга келчү кызматтарга жөнөтүңүз"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Туташкандан кийин кырсыктаганда жардамга келчү кызматтарга билдирүү жөнөтө аласыз"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Демо версиясын колдонуп көрүү"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Кырсыктаганда жардамга келчү кызматтар менен спутник аркылуу байланышканда аты-жөнүңүз, электрондук почтаңыз, телефон номериңиз, жүргөн жериңиз, түзмөк тууралуу маалымат (IMEI, тил, үлгүсү, батареянын деңгээли) жана кырсыктаганда байланышуучу адамдын маалыматы кырсыктаганда жардамга келчү кызматтар жана спутник кызматтарын көрсөтүүчүлөр менен бөлүшүлөт. \n\nСпутник SOS\'ту колдонуу үчүн Google Messages демейки SMS колдонмоңуз болушу керек. \n\nЭгер тармакты автоматтык түрдө тандоо өчүрүлгөн болсо, ал күйгүзүлүп, түзмөгүңүз ар кандай тармакка автоматтык түрдө туташат."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Бөлүшүү параметрлери"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Кырсыктаганда байланышуучу адамдар"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google аккаунтуңуз"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Кырсыктаганда жардамга келчү кызматтар менен бөлүшүлө турган маалыматты карап чыгып же жаңыртыңыз"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Байланыш түйүнүнүн аталыштары"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна туташып турганда жеткиликсиз"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Беттин көлөмүнө көз каранды эмес режимдин 16 Кб режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн 4 Кб режимине кайтып, андан кийин түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Бул түзмөктү кайра баштапкы абалга келтирип, өндүрүш параметрлерине кайтарат. Түзмөк Android\'ге ийгиликтүү жүктөлгөндөн кийин, иштеп чыгуучунун параметрлеринен OEM ачууну өчүрүңүз. Түзмөк Android\'ге жүктөлбөй калса же туруксуз болсо, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; дарегиндеги баштапкы сүрөттөр менен акыркы версияга кайтарып, \"Түзмөктү тазалоо\", \"Операциялык тутумду жүктөгүчтү кулпулоо\" жана \'Бардык бөлүктөрүн мажбурлап программалоо\" параметрлерин тандаңыз."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Беттен көз карандысыз 16Кб өлчөмүндөгү режим"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Дагы окуу"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Колдонмону барактын өлчөмүнө шайкештирүү режиминде иштетүү"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Мүчүлүштүк тууралуу кабар берүүнү иштеткич"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Түзмөгүңүздөгү Мүчүлүштүк тууралуу кабарлоо ыкчам баскычын кайсы колдонмо иштетерин аныктайт."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Жеке"</string>
@@ -5161,7 +5284,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB учурдагы жерде жеткиликсиз"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread\'ди колдонуу"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread акылдуу үйдүн түзмөктөрүн туташтырып жана майнаптуулукту жогорулатууга жардам берет.\n\nИштетилсе, түзмөк Thread тармагына кошулуп, ушул телефондон Matter колдоого алынган түзмөктөрдү көзөмөлдөөгө өбөлгө түзүлөт."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread акылдуу үйдөгү түзмөктөрдү туташтырып, аларды жакшыраак иштеткенге жардам берет.\n\nБул параметр күйгүзүлсө, бул түзмөктү Thread тармагына кошуп, ал аркылуу Matter орнотулган түзмөктөрдү башкарууга болот."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread жөнүндө кеңири маалымат алыңыз"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Камераны колдонуу"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Микрофонду колдонуу"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Агымды угуу"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүндө угуу үчүн аудио агымдын QR кодун скандаңыз"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Чогуу угуп жатканда сырсөздү өзгөртө албайсыз. Адегенде чогуу угууну өчүрүңүз."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Сырсөзүңүз 4-16 символдон туруп, анда тамгалар, сандар жана белгилер гана болушу керек"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR кодунун сканери"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Жардам керекпи?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Издөө параметрлери"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"байланыштар, сактагыч, аккаунт"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Байланыштар сактагычы"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Түзмөк аркылуу гана"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Жаңы байланыштар аккаунтта шайкештирилбейт"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Байланыштар түзмөгүңүздө сакталып, аккаунтуңузда демейки шартта шайкештирилет"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Демейки аккаунтту орнотуп жатканда ката кетти"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Демейки аккаунт орнотулган жок"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Түзмөктө гана"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Түзмөк жана %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Баштоо үчүн аккаунт кошуңуз"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Байланыштарды кайда сактоо керек"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Тегеректеп издөө"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Экрандагы нерселер боюнча издөө үчүн Башкы бет баскычын же өтүү тилкесин коё бербей басып туруңуз."</string>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 6421e3e42dc..c175ee7e591 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -30,4 +30,7 @@
 
     <!-- Keyboard -->
     <dimen name="keyboard_picker_margin">106dp</dimen>
+
+    <!-- Connected displays -->
+    <dimen name="display_topology_pane_margin">80dp</dimen>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 6dcbd8db16b..d4b312d0b5e 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ເກັດຫິມະ"</item>
     <item msgid="7952183800501346803">"ຄັນຮົ່ມຫາດຊາຍ"</item>
     <item msgid="799139025758265891">"ເຄື່ອງມືເວີກຊັອບ"</item>
-    <item msgid="1330084588359129896">"ເຕັ້ນ"</item>
+    <item msgid="8112685757657659269">"ເປຍໂນ"</item>
     <item msgid="3861584909935022342">"ມ້ວນຟີມ"</item>
     <item msgid="5827426100157335512">"ປຶ້ມ"</item>
     <item msgid="8585828346253128384">"ດອກບົວ"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 76117ed6c77..9ff343db7d9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ເປີດໂດຍອັດຕະໂນມັດໃນມື້ອື່ນ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ຫາກທ່ານປິດ Bluetooth, ອຸປະກອນຈະເປີດອີກຄັ້ງໃນມື້ຕໍ່ໄປ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ຈັບຄູ່ຫູຂວາ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ຈັບຄູ່ຫູຊ້າຍ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ຈັບຄູ່ຫູອີກຂ້າງຂອງທ່ານ"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ປິດການນຳໃຊ້ສຽງ Bluetooth LE"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ປິດການນຳໃຊ້ຄຸນສົມບັດສຽງ Bluetooth LE ຫາກອຸປະກອນຮອງຮັບຄວາມສາມາດຂອງຮາດແວສຽງ LE."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ໂໝດສຽງ Bluetooth LE"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ເປີດການນຳໃຊ້ຕົວຢ່າງ Bluetooth LE Audio Broadcast UI"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"ເປີດການນຳໃຊ້ຕົວຢ່າງ LE Audio Sharing UI ໂດຍຮວມເອົາການແບ່ງປັນສຽງສ່ວນຕົວ ແລະ ການອອກອາກາດສ່ວນຕົວ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ສະແດງການສະຫຼັບສຽງ LE ໃນລາຍລະອຽດອຸປະກອນ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ຂ້າມລາຍຊື່ອະນຸຍາດສຽງ Bluetooth LE"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ໃຊ້ສຽງ LE ໂດຍຄ່າເລີ່ມຕົ້ນເຖິງວ່າອຸປະກອນຕໍ່ພ່ວງສຽງ LE ຈະບໍ່ໄດ້ຮັບການຢັ້ງຢືນວ່າເປັນໄປຕາມເກນລາຍຊື່ອະນຸຍາດກໍຕາມ."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ພາສາແອັບ"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ພາສາທີ່ແນະນຳ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ພາສາທັງໝົດ"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"ແນະນຳ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ທຸກພາສາ"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ທຸກພາກພື້ນ"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ລະບົບລຳດັບໝາຍເລກທັງໝົດ"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ພາສາລະບົບ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ບໍ່ສາມາດເລືອກພາສາສຳລັບແອັບນີ້ຈາກການຕັ້ງຄ່າໄດ້."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ປ່ຽນ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ບໍ່ມີໃຫ້ໃຊ້"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ພາສານີ້ບໍ່ສາມາດໃຊ້ເປັນພາສາລະບົບໄດ້, ແຕ່ທ່ານໄດ້ໃຫ້ແອັບ ແລະ ເວັບໄຊຮູ້ວ່າທ່ານຕ້ອງການໃຊ້ພາສານີ້."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ຄົ້ນຫາ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ເພີ່ມພາສາ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ການຕັ້ງຄ່າພາກພື້ນ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ພິມຊື່ພາສາ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ການຕັ້ງຄ່າພາສາເພີ່ມເຕີມ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ການຕັ້ງຄ່າຕາມພາກພື້ນ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ກຳນົດການຕັ້ງຄ່າຫົວໜ່ວຍ ແລະ ຕົວເລກ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ບອກໃຫ້ແອັບຮູ້ການຕັ້ງຄ່າຕາມພາກພື້ນຂອງທ່ານເພື່ອໃຫ້ແອັບສາມາດປັບແຕ່ງປະສົບການຂອງທ່ານໃຫ້ເປັນແບບສ່ວນຕົວໄດ້."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ແອັບຈະໃຊ້ການຕັ້ງຄ່າຕາມພາກພື້ນຂອງທ່ານຫາກເປັນໄປໄດ້."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ການຕັ້ງຄ່າຕາມພາກພື້ນ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ອຸນຫະພູມ"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ມື້ທຳອິດຂອງອາທິດ"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ການຕັ້ງຄ່າຕົວເລກ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ເຊື່ອມຕໍ່ບໍລິການອິນເຕີເນັດເມື່ອໂຣມມິງຢູ່"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ເຊື່ອມຕໍ່ບໍລິການອິນເຕີເນັດເມື່ອໂຣມມິງຢູ່"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ອາດ​ມີ​ການ​ຄິດ​ໄລ່​ຄ່າ​ບໍ​ລິ​ການ​ໂຣມ​ມິງ."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ຕັ້ງເວລາອັດຕະໂນມັດ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ຕັ້ງຄ່າໂດຍອັດຕະໂນມັດ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ລະບົບຈະໃຊ້ສະຖານທີ່ເພື່ອຕັ້ງຄ່າເຂດເວລາເມື່ອເປີດການສະຫຼັບນີ້"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ວັນທີ ແລະ ເວລາອັດຕະໂນມັດ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍໃຊ້ເຄືອຂ່າຍ ແລະ ສັນຍານໄຮ້ສາຍຂອງທ່ານ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ເຂດເວລາອັດຕະໂນມັດ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍອີງຕາມເຄືອຂ່າຍມືຖືທີ່ຢູ່ໃກ້ກັບທ່ານ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍໃຊ້ສະຖານທີ່ອຸປະກອນຂອງທ່ານ, ຫາກມີ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງສະຖານທີ່"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ໃຊ້ຮູບແບບ 24 ຊົ່ວໂມງ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ເວລາ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ຍົກນິ້ວມືອອກ, ຈາກນັ້ນ ສຳຜັດເຊັນເຊີອີກຄັ້ງ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ບໍ່ສາມາດໃຊ້ເຊັນເຊີລາຍນິ້ວມືໄດ້"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ກະລຸນາໄປຫາຜູ້ໃຫ້ບໍລິການສ້ອມແປງ."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ປົດລັອກດ້ວຍລາຍນິ້ວມືເມື່ອໜ້າຈໍປິດ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ໃຊ້ການປົດລັອກດ້ວຍລາຍນິ້ວມືເຖິງແມ່ນວ່າໜ້າຈໍຈະປິດຢູ່"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ປິດໜ້າຈໍ, ປົດລັອກ"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ການຕັ້ງຄ່າຄວາມປອດໄພເພີ່ມເຕີມ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ລັອກ​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ, ການເຂົ້າລະຫັດ ແລະ ອື່ນໆ"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ການເຂົ້າລະຫັດ, ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ ແລະ ອື່ນໆ"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ຕັ້ງຄ່າຮູບແບບສຳລັບພື້ນທີ່ສ່ວນຕົວຂອງທ່ານ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ລັອກ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ເຊື່ອງ"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ຢືນຢັນຮູບແບບພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ໃສ່ PIN ພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານຄືນໃໝ່"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ໃສ່ລະຫັດຜ່ານພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານຄືນໃໝ່"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ທ່ານ​ສາ​ມາດ​ເພີ່ມ​ບໍ່ເກີນ <xliff:g id="COUNT">%d</xliff:g> ລາຍ​ນີ້ວ​ມື​"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ເປີດ"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ປິດ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ຈໍສະແດງຜົນພາຍນອກ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"ຈໍສະແດງຜົນໃນຕົວ"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ໃຊ້ຈໍສະແດງຜົນພາຍນອກ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ຄວາມລະອຽດຂອງຈໍສະແດງຜົນ"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ຍົກເລີກການເຊື່ອມຕໍ່ຈໍສະແດງຜົນພາຍນອກແລ້ວ"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ການປ່ຽນການໝຸນ ຫຼື ຄວາມລະອຽດອາດຢຸດແອັບໃດກໍຕາມທີ່ກຳລັງເຮັດວຽກຢູ່ໃນປັດຈຸບັນ"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ອຸປະກອນຂອງທ່ານຕ້ອງເຊື່ອມຕໍ່ກັບຈໍສະແດງຜົນພາຍນອກເພື່ອສະທ້ອນໜ້າຈໍຂອງທ່ານ"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ກົດຄ້າງແລ້ວລາກເພື່ອຈັດຮຽງຈໍສະແດງຜົນຄືນໃໝ່."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ການສົ່ງສັນຍານ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ແວ່ນສະທ້ອນ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ກະລຸນາກວດສອບລະຫັດຜ່ານແລ້ວລອງໃໝ່"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດອຸປະກອນ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ກະລຸນາກວດສອບແລ້ວລອງໃໝ່"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ເຄືອຂ່າຍ Wi-Fi ນີ້ບໍ່ມີໃຫ້ໃນຕອນນີ້"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ມີບັນຫາກັບລະຫັດ QR ນີ້. ລອງເຊື່ອມຕໍ່ວິທີອື່ນ."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ເລືອກເຄືອຂ່າຍ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ກະລຸນາເລືອກເຄືອຂ່າຍເພື່ອເຊື່ອມຕໍ່ຫາອຸປະກອນຂອງທ່ານ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"ເພີ່ມອຸປະກອນນີ້ໃສ່ “<xliff:g id="SSID">%1$s</xliff:g>” ບໍ?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ສຶກສາເພີ່ມເຕີມກ່ຽວກັບການໝຸນອັດຕະໂນມັດ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ຄວາມລະອຽດໜ້າຈໍ"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ຄວາມລະອຽດສູງ"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ຄວາມລະອຽດເຕັມ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ຄວາມລະອຽດເຕັມຈະໃຊ້ແບັດເຕີຣີຂອງທ່ານຫຼາຍຂຶ້ນ. ການສະຫຼັບໄປໃຊ້ຄວາມລະອຽດຂອງທ່ານອາດເຮັດໃຫ້ບາງແອັບຣີສະຕາດໄດ້."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"ຄວາມລະອຽດສູງສຸດ"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"ຄວາມລະອຽດສູງສຸດຈະໃຊ້ແບັດເຕີຣີຂອງທ່ານຫຼາຍຂຶ້ນ. ການປ່ຽນຄວາມລະອຽດຂອງທ່ານອາດເຮັດໃຫ້ບາງແອັບຣີສະຕາດ."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ເລືອກແລ້ວ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ສີ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ທຳ​ມະ​ຊາດ"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ປັບປ່ຽນໄດ້"</string>
     <string name="brightness" msgid="6216871641021779698">"ລະດັບ​ຄວາມແຈ້ງ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ປັບ​ຄວາມ​ແຈ້ງ​ອັດຕະໂນມັດ"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"ກ່ຽວກັບຄຸນສົມບັດປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ຄວາມແຈ້ງໜ້າຈໍຂອງທ່ານຈະຖືກປັບໂດຍອັດຕະໂນມັດໂດຍອ້າງອີງຈາກສະພາບແວດລ້ອມ ແລະ ກິດຈະກຳທີ່ທ່ານເຮັດ. ທ່ານສາມາດຍ້າຍຕົວເລື່ອນດ້ວຍຕົນເອງເພື່ອຊ່ວຍໃຫ້ລະບົບຮຽນຮູ້ການຕັ້ງຄ່າຂອງທ່ານໄດ້."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ເປີດ"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ປິດ"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ການຕັ້ງຄ່າໂໝດເວລານອນ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ໂໝດຍັງສາມາດເປີດໃຊ້ຮູບແບບສີສັນມືດນຳ}=1{{mode_1} ຍັງສາມາດເປີດໃຊ້ຮູບແບບສີສັນມືດນຳ}=2{{mode_1} ແລະ {mode_2} ຍັງສາມາດເປີດໃຊ້ຮູບແບບສີສັນມືດນຳ}=3{{mode_1}, {mode_2} ແລະ {mode_3} ຍັງສາມາດເປີດໃຊ້ຮູບແບບສີສັນມືດນຳ}other{{mode_1}, {mode_2} ແລະ ອີກ # ໂໝດຍັງສາມາດເປີດໃຊ້ຮູບແບບສີສັນມືດນຳ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ການຕັ້ງຄ່າໂໝດ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"ມົວລົງ"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ຫຼຸດແສງເປັນພິເສດ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ອະນຸຍາດໃຫ້ອຸປະກອນມົວລົງກວ່າປົກກະຕິ"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ໄລຍະໝົດເວລາໜ້າຈໍ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Bluetooth ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ບໍລິການສະຖານທີ່"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ບໍລິການສະຖານທີ່"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ໃຊ້ສະຖານທີ່"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ໃຊ້ສະຖານທີ່ສຳລັບເຂດເວລາ"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ບໍ່ສາມາດຕັ້ງເຂດເວລາໂດຍອັດຕະໂນມັດໄດ້"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ສະຖານທີ່ ຫຼື ບໍລິການສະຖານທີ່ປິດຢູ່"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ການຕັ້ງຄ່າສະຖານທີ່"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ແກ້ໄຂບັນຫານີ້"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ຍົກເລີກ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ເຂດເວລາອັດຕະໂນມັດປິດຢູ່"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ບໍ່ພ້ອມໃຫ້ນຳໃຊ້ເມື່ອເຂດເວລາອັດຕະໂນມັດປິດຢູ່"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ສະຖານທີ່ອາດຖືກໃຊ້ເພື່ອຕັ້ງຄ່າເຂດເວລາ"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ຫາກສະຖານທີ່ອຸປະກອນຂອງທ່ານພ້ອມນຳໃຊ້, ລະບົບກໍອາດຈະໃຊ້ເພື່ອຕັ້ງຄ່າເຂດເວລາຂອງທ່ານ"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ເບິ່ງຂໍ້ມູນທາງກົດໝາຍ, ສະຖານະ, ເວີຊັນຊອບແວ"</string>
     <string name="legal_information" msgid="7509900979811934843">"ຂໍ້ມູນທາງກົດໝາຍ"</string>
     <string name="manual" msgid="3651593989906084868">"ຄູ່​ມື"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ຕົວເລືອກ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ແປ້ນພິມພາຍນອກ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"ປຸ່ມດີດກັບ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"ແປ້ນພິມຈະລະເວັ້ນການກົດປຸ່ມດຽວຊ້ຳໆຢ່າງວ່ອງໄວພາຍໃນ <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ແປ້ນພິມຈະບໍ່ສົນໃຈການກົດປຸ່ມຊ້ຳໆໄວໆຂອງປຸ່ມດຽວກັນ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ເກນການຍົກເລີກການກົດປຸ່ມຊໍ້າໆ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ເລືອກໄລຍະເວລາທີ່ແປ້ນພິມຂອງທ່ານບໍ່ສົນໃຈການກົດປຸ່ມຊໍ້າໆ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 ວິ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 ວິ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 ວິ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ກຳນົດເອງ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ຄ່າທີ່ກຳນົດເອງ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ເພີ່ມໄລຍະເວລາໃນການກົດປຸ່ມ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"ປັບເວລາທີ່ມັນໃຊ້ສໍາລັບການກົດປຸ່ມເພື່ອເປີດໃຊ້ເປັນ <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ປັບແກ້ເວລາທີ່ມັນໃຊ້ສໍາລັບການກົດປຸ່ມເພື່ອເປີດໃຊ້"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ປຸ່ມກົດຄ້າງ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ກົດເທື່ອລະປຸ່ມເພື່ອໃຊ້ທາງລັດແທນການກົດປຸ່ມຄ້າງໄວ້ຮ່ວມກັນ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ແປ້ນເມົ້າ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ໃຊ້ແປ້ນພິມພາຍນອກເພື່ອຄວບຄຸມເມົ້າ."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ໃຊ້ແປ້ນເມົ້າ"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ໃຊ້ແປ້ນພິມຂອງທ່ານເພື່ອຄວບຄຸມຕົວຊີ້"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ການເລື່ອນເມົ້າຖອຍຫຼັງ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ເລື່ອນຂຶ້ນເພື່ອຍ້າຍໜ້າລົງ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ສະຫຼັບປຸ່ມຊ້າຍ ແລະ ຂວາ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ໃຊ້ປຸ່ມເມົ້າເບື້ອງຊ້າຍເປັນປຸ່ມເບື້ອງຂວາຂອງທ່ານ"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"ແປ້ນເມົ້າສຳລັບ <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ໃຊ້ປຸ່ມ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ເພື່ອຍ້າຍຕົວຊີ້ເມົ້າ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ໃຊ້ປຸ່ມ <xliff:g id="CLICK_LABEL">%s</xliff:g> ເພື່ອຄລິກປຸ່ມຫຼັກຂອງເມົ້າ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ໃຊ້ປຸ່ມ <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ເພື່ອກົດປຸ່ມຫຼັກຂອງເມົ້າຄ້າງໄວ້"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ໃຊ້ປຸ່ມ <xliff:g id="RELEASE_LABEL">%s</xliff:g> ເພື່ອປ່ອຍປຸ່ມຫຼັກຂອງເມົ້າ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ໃຊ້ປຸ່ມ <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ເພື່ອເປີດ/ປິດໂໝດເລື່ອນ. ເຊິ່ງຈະເຮັດໃຫ້ປຸ່ມ <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ເລື່ອນມຸມມອງຂຶ້ນເທິງ, ລົງລຸ່ມ, ໄປທາງຊ້າຍ ຫຼື ຂວາ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ໃຊ້ປຸ່ມ <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ເພື່ອຄລິກປຸ່ມສຳຮອງຂອງເມົ້າ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ປຸ່ມລັດແປ້ນພິມ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ສະແດງລາຍຊື່ຂອງທາງລັດ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ແປ້ນພິມໂປຣໄຟລ໌ວຽກ ແລະ ເຄື່ອງມື"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ແຜ່ນສຳຜັດ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ແຜ່ນສຳຜັດ ແລະ ເມົ້າ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ເມົ້າ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ຄວາມໄວຂອງຕົວຊີ້, ທ່າທາງ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ແຕະເພື່ອຄລິກ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ແຕະລາກ"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ຄລິກຂວາລຸ່ມສຸດ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ຄລິກຢູ່ແຈຂວາລຸ່ມສຸດຂອງແຜ່ນສຳຜັດເພື່ອເບິ່ງຕົວເລືອກເພີ່ມເຕີມ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ຄວາມໄວຂອງຕົວຊີ້"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ໃຊ້ສາມນິ້ວແຕະ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ສີຂອງຕົວຊີ້"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ປ່ຽນຮູບແບບການຕື່ມຕົວຊີ້ເປັນສີດຳ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ຮູບແບບການຕື່ມຕົວຊີ້ເປັນສີຂຽວ"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ສຶກສາທ່າທາງຂອງແຜ່ນສຳຜັດ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ແທຣັກແຜດ, ແທຣັກ ແຜດ, ເມົ້າ, ເຄີເຊີ, ເລື່ອນ, ປັດ, ຄລິກຂວາ, ຄລິກ, ຕົວຊີ້"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ຄລິກຂວາ, ແຕະ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ຄລິກເຄິ່ງກາງ"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"ເປີດໃຊ້ຜູ້ຊ່ວຍ"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ໄປຫາໜ້າຫຼັກ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ກັບຄືນ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ເບິ່ງແອັບຫຼ້າສຸດ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ໄປຫາໜ້າຫຼັກ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ໃຊ້ 3 ນິ້ວປັດຂຶ້ນຈາກຕຳແໜ່ງໃດກໍໄດ້ຢູ່ແຜ່ນສຳຜັດຂອງທ່ານ"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ກັບຄືນ"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ເລືອກປຸ່ມໃໝ່ສຳລັບ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ການຊ່ວຍເຂົ້າເຖິງແປ້ນພິມພາຍນອກ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ປຸ່ມກົດຄ້າງ, ປຸ່ມຕີກັບ, ແປ້ນເມົ້າ"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ປຸ່ມຊ້ຳ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ຄວາມຊັກຊ້າກ່ອນການກົດຊ້ຳ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ອັດຕາການກົດຊ້ຳ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ກົດປຸ່ມຄ້າງໄວ້ເພື່ອເຮັດຊ້ຳຕົວອັກສອນຂອງມັນຈົນກວ່າປຸ່ມຈະຖືກປ່ອຍ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"ໂຄງຮ່າງ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ອັດຕະໂນມັດ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ຕົວຢ່າງ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ໂຕເລືອກມາດຕະຖານ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ພາສາ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ຂະໜາດຕົວອັກສອນ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ຂະໜາດຄຳບັນຍາຍ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ຮູບແບບຄຳບັນຍາຍ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ໂຕເລືອກກຳນົດເອງ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ສີພື້ນຫຼັງ"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ປັບແຕ່ງການໃຊ້ພະລັງງານ"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ແພັກເກດທີ່ຮວມມານຳ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ແອັບຕ່າງໆກຳລັງເຮັດວຽກຕາມປົກກະຕິ"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ແນະນຳໃຫ້ປ່ຽນແບັດເຕີຣີ"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ຄວາມຈຸແບັດເຕີຣີ ແລະ ປະສິດທິພາບການສາກຫຼຸດລົງ ແລະ ຂໍແນະນຳໃຫ້ປ່ຽນແບັດເຕີຣີ."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ລະດັບແບັດເຕີຣີເຫຼືອໜ້ອຍ"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ທ່ານສາມາດເປີດໃຊ້ຕົວປະຢັດແບັດເຕີຣີເພື່ອຍືດອາຍຸແບັດເຕີຣີໄດ້"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ປັບປຸງອາຍຸແບັດເຕີຣີ"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ຕັດການເຊື່ອມຕໍ່"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ເວີຊັນ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ເວີຊັນ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"ລືມ VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09:00 - 17:00 ໂມງ ຈັນຫາສຸກ\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ນັດໝາຍປະຕິທິນ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ເຮັດວຽກຢູ່}=2{{mode_1} ແລະ {mode_2} ເຮັດວຽກຢູ່}=3{{mode_1}, {mode_2} ແລະ {mode_3} ເຮັດວຽກຢູ່}other{{mode_1}, {mode_2} ແລະ ອີກ # ໂໝດເຮັດວຽກຢູ່}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{ສາມາດເປີດໃຊ້ 1 ໂໝດໂດຍອັດຕະໂນມັດ}other{ສາມາດເປີດໃຊ້ # ໂໝດໂດຍອັດຕະໂນມັດ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ຫ້າມລົບກວນ}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ເປີດ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ປິດການນຳໃຊ້ຢູ່"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ເຂົ້າໃຈແລ້ວ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ການແຈ້ງເຕືອນ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ໄລຍະເວລາ"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ຂໍ້ຄວາມ, ນັດໝາຍ ແລະ ການເຕືອນ"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ເມື່ອເປີດໂໝດຫ້າມລົບກວນ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ແລະ ເຫດການຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ແລ້ວໆ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ການຕັ້ງຄ່າ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ບໍ່ມີສຽງຈາກການແຈ້ງເຕືອນ"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ທ່ານຈະບໍ່ໄດ້ຍິນສຽງການແຈ້ງເຕືອນ. ແຕ່ອະນຸຍາດການໂທຈາກລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ ແລະ ຜູ້ທີ່ໂທຊ້ຳໆ."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ການຕັ້ງຄ່າປັດຈຸບັນ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ປ່ຽນການຕັ້ງຄ່າການແຈ້ງເຕືອນຫ້າມລົບກວນບໍ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ໃຊ້ສຽງໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ໃຊ້ສຽງດຽວກັບໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານ"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ຫຼັງຈາກປົດລັອກແລ້ວ, ໃຫ້ເຂົ້າໄປໜ້າຈໍທີ່ໃຊ້ຫຼ້າສຸດໂດຍກົງ. ການແຈ້ງເຕືອນຈະບໍ່ສະແດງຢູ່ໜ້າຈໍລັອກ. ປັດລົງຈາກເທິງສຸດເພື່ອເບິ່ງການແຈ້ງເຕືອນ."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ໜ້າຈໍລັອກ, ຂ້າມ, ອ້ອມ"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ເມື່ອລັອກໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ການແຈ້ງເຕືອນແບບຮຽບງ່າຍຢູ່ໜ້າຈໍລັອກ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ສະແດງການແຈ້ງເຕືອນໜ້ອຍລົງໃນໜ້າຈໍລັອກ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ສະແດງສະເພາະການແຈ້ງເຕືອນໃໝ່ຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ລຶບການແຈ້ງເຕືອນທີ່ເບິ່ງກ່ອນໜ້າອອກຈາກໜ້າຈໍລັອກໂດຍອັດຕະໂນມັດ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ສະແດງການສົນທະນາ, ຄ່າເລີ່ມຕົ້ນ ແລະ ການປິດສຽງ"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ສະແດງການສົນທະນາ, ຄ່າເລີ່ມຕົ້ນ ແລະ ການປິດສຽງ"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ສະແດງເນື້ອຫາການແຈ້ງເຕືອນວຽກທັງໝົດ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ເຊື່ອງເນື້ອຫາວຽກທີ່ລະອຽດອ່ອນ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"​ທ່ານ​ຕ້ອງ​ການ​ໃຫ້​ສະ​ແດງ​​ການ​ແຈ້ງ​ເຕືອນ​ໂປຣໄຟລ໌ແນວ​ໃດ​ໃນ​ເວ​ລາ​ທີ່​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນຈຳນວນຫຼາຍພາຍໃນໄລຍະເວລາສັ້ນໆ, ອຸປະກອນຂອງທ່ານຈະຫຼຸດລະດັບສຽງ ແລະ ຫຼຸດຈຳນວນແຈ້ງເຕືອນລົງເປັນເວລາສູງສຸດ 2 ນາທີ. ໂດຍທີ່ການໂທ, ໂມງປຸກ ແລະ ການສົນທະນາສຳຄັນຈະບໍ່ໄດ້ຮັບຜົນກະທົບ. \n\nການແຈ້ງເຕືອນທີ່ໄດ້ຮັບໃນລະຫວ່າງຄູດາວສາມາດເບິ່ງໄດ້ໂດຍການດຶງລົງຈາກທາງເທິງຂອງໜ້າຈໍ."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ນຳໃຊ້ກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ໃຊ້ກັບແອັບໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ຈັດການແຈ້ງເຕືອນເປັນຊຸດແລ້ວ"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ເປີດ"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ປິດ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ໃຊ້ການຈັດການແຈ້ງເຕືອນເປັນຊຸດ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ການແຈ້ງເຕືອນທີ່ມີຮູບແບບສີສັນຄ້າຍກັນຈະຖືກປິດສຽງ ແລະ ຈັດກຸ່ມໄວ້ນໍາກັນສໍາລັບປະສົບການທີ່ງຽບກວ່າເກົ່າ. ການຈັດເປັນຊຸດຈະຍົກເລີກການຕັ້ງຄ່າການແຈ້ງເຕືອນຂອງແອັບເອງ."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ບໍລິການຕົວຊ່ວຍ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງແລ້ວທີ່ຮ້ອງຂໍໃຫ້ໃຊ້ເປັນບໍລິການຕົວຊ່ວຍ VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງບໍລິການ VR ສຳລັບ <xliff:g id="SERVICE">%1$s</xliff:g> ບໍ?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ການສົນທະນາສຳຄັນ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ບໍ່ມີ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ບໍ່ມີ}=1{1 ການສົນທະນາ}other{# ການສົນທະນາ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"ການຕັ້ງຄ່າການສົນທະນາ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ໃຜທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ເຖິງແມ່ນວ່າແອັບການຮັບສົ່ງຂໍ້ຄວາມ ຫຼື ການໂທຈະບໍ່ສາມາດແຈ້ງເຕືອນທ່ານ, ຄົນທີ່ທ່ານເລືອກຢູ່ບ່ອນນີ້ຈະຍັງຄົງສາມາດຕິດຕໍ່ຫາທ່ານໄດ້ຜ່ານແອັບເຫຼົ່ານີ້"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ການໂທ"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"ການຕັ້ງຄ່າລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ການຕັ້ງຄ່າລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ບໍ່ມີ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ບໍ່ມີ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ໂມງປຸກ"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ວຽກ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ກຳລັງຄຳນວນ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ການຕັ້ງຄ່າແອັບ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ອະນຸຍາດໃຫ້ແອັບຍົກເລີກໄດ້"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ແອັບທີ່ສາມາດລົບກວນໄດ້"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ສ້າງໂໝດ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ໂໝດທີ່ກຳນົດເອງ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ຊື່ໂໝດ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ຊື່ໂໝດບໍ່ສາມາດຫວ່າງເປົ່າໄດ້"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ເລືອກໄອຄອນ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ນັດໝາຍປະຕິທິນ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ສິ່ງທີ່ເຮັດປະຈຳໃນເວລານອນ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ໃນຂະນະຂັບລົດ"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ການແຈ້ງເຕືອນແບບເຕັມຈໍ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ອະນຸຍາດໃຫ້ແອັບນີ້ສະແດງການແຈ້ງເຕືອນແບບເຕັມຈໍ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ອະນຸຍາດໃຫ້ແອັບນີ້ສະແດງການແຈ້ງເຕືອນແບບເຕັມຈໍເມື່ອອຸປະກອນລັອກຢູ່. ແອັບອາດໃຊ້ການແຈ້ງເຕືອນເຫຼົ່ານີ້ເພື່ອໄຮໄລ້ໂມງປຸກ, ສາຍໂທເຂົ້າ ຫຼື ການແຈ້ງເຕືອນສຸກເສີນອື່ນໆ."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"ຂຽນຄ່າກຳນົດຂອງລະບົບ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ອະນຸຍາດໃຫ້ແອັບນີ້ແກ້ໄຂຄ່າກຳນົດຂອງລະບົບໃນນາມຂອງທ່ານ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ສິດນີ້ອະນຸຍາດໃຫ້ແອັບແກ້ໄຂຄ່າກຳນົດຫຼັກຂອງລະບົບໄດ້."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"ແອັບການຈັດການມີເດຍ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ອະນຸຍາດໃຫ້ແອັບຈັດການມີເດຍ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ຫາກອະນຸຍາດ, ແອັບນີ້ຈະສາມາດແກ້ໄຂ ຫຼື ລຶບໄຟລ໌ມີເດຍທີ່ສ້າງຂຶ້ນໂດຍແອັບອື່ນໄດ້ໂດຍບໍ່ຕ້ອງຖາມທ່ານ. ແອັບຈະຕ້ອງມີການອະນຸຍາດເພື່ອເຂົ້າເຖິງໄຟລ໌ ແລະ ມີເດຍໄດ້."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ທ່າທາງ"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ເປີດກ້ອງດ່ວນ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ເພື່ອເປີດກ້ອງຂຶ້ນມາແບບດ່ວນ, ໃຫ້ກົດປຸ່ມປິດເປີດສອງເທື່ອຕິດກັນ. ສາມາດເຮັດໄດ້ຈາກທຸກໜ້າຈໍ."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ສະຫຼັບກ້ອງເພື່ອຖ່າຍເຊວຟີ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ໂໝດການນຳທາງ"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ສົ່ງ ແລະ ຮັບຂໍ້ຄວາມຜ່ານດາວທຽມ. ຮວມຢູ່ໃນບັນຊີຂອງທ່ານ."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ສົ່ງ ແລະ ຮັບຂໍ້ຄວາມຜ່ານດາວທຽມ. ບໍ່ຮວມມາກັບບັນຊີຂອງທ່ານ."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"ກ່ຽວກັບການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ, ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມ"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"ກ່ຽວກັບ <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"ທ່ານສາມາດສົ່ງ ແລະ ຮັບຂໍ້ຄວາມຜ່ານດາວທຽມໄດ້ໂດຍເປັນພາກສ່ວນໜຶ່ງຂອງບັນຊີ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ທີ່ມີສິດ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"ແພັກເກດ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ຂອງທ່ານ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມຮວມຢູ່ໃນບັນຊີຂອງທ່ານ"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"ການຮັບສົ່ງຂໍ້ຄວາມຈະຮວມຢູ່ໃນບັນຊີຂອງທ່ານ"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມບໍ່ໄດ້ຮວມຢູ່ໃນບັນຊີຂອງທ່ານ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ສຶກສາເພີ່ມເຕີມ"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ມັນເຮັດວຽກແນວໃດ"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ໂທລະສັບຂອງທ່ານຈະເຊື່ອມຕໍ່ກັບດາວທຽມໂດຍອັດຕະໂນມັດ. ສຳລັບການເຊື່ອມຕໍ່ທີ່ດີທີ່ສຸດ, ກະລຸນາຢູ່ໃນພື້ນທີ່ທີ່ເບິ່ງເຫັນທ້ອງຟ້າໄດ້ຢ່າງຊັດເຈນ."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ຫຼັງຈາກທີ່ໂທລະສັບຂອງທ່ານເຊື່ອມຕໍ່ກັບດາວທຽມ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"ທ່ານສາມາດສົ່ງຂໍ້ຄວາມຫາໃຜກໍໄດ້, ເຊິ່ງຮວມທັງບໍລິການສຸກເສີນ. ໂທລະສັບຂອງທ່ານຈະເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍມືຖືອີກຄັ້ງເມື່ອມີໃຫ້ໃຊ້."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມອາດໃຊ້ເວລາດົນກວ່າປົກກະຕິ ແລະ ພ້ອມໃຫ້ບໍລິການໃນບາງພື້ນທີ່ເທົ່ານັ້ນ. ສະພາບອາກາດ ແລະ ໂຄງສ້າງບາງຢ່າງອາດສົ່ງຜົນຕໍ່ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມຂອງທ່ານ. ການໂທຜ່ານດາວທຽມບໍ່ພ້ອມໃຫ້ບໍລິການ. ການໂທສຸກເສີນອາດຍັງເຊື່ອມຕໍ່ຢູ່.\n\nລະບົບອາດໃຊ້ເວລາໄລຍະໜຶ່ງຈົນກວ່າການປ່ຽນແປງໃນບັນຊີຈະສະແດງໃນການຕັ້ງຄ່າ. ກະລຸນາຕິດຕໍ່ຜູ້ໃຫ້ບໍລິການຂອງທ່ານສຳລັບລາຍລະອຽດ."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> ອາດໃຊ້ເວລາດົນກວ່າປົກກະຕິ ແລະ ພ້ອມໃຫ້ບໍລິການໃນບາງພື້ນທີ່ເທົ່ານັ້ນ. ສະພາບອາກາດ ແລະ ໂຄງສ້າງບາງຢ່າງອາດສົ່ງຜົນຕໍ່ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມຂອງທ່ານ. ການໂທຜ່ານດາວທຽມບໍ່ພ້ອມໃຫ້ບໍລິການ. ການໂທສຸກເສີນອາດຍັງເຊື່ອມຕໍ່ຢູ່.\n\nລະບົບອາດໃຊ້ເວລາໄລຍະໜຶ່ງຈົນກວ່າການປ່ຽນແປງໃນບັນຊີຈະສະແດງໃນການຕັ້ງຄ່າ. ກະລຸນາຕິດຕໍ່ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ສຳລັບລາຍລະອຽດ."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບ <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"ບໍ່ສາມາດເປີດ <xliff:g id="FUNCTION">%1$s</xliff:g> ໄດ້"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"ເພື່ອເປີດ <xliff:g id="FUNCTION">%1$s</xliff:g>, ໃຫ້ສິ້ນສຸດການເຊື່ອມຕໍ່ດາວທຽມກ່ອນ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມ"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມ"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"ການເຊື່ອມຕໍ່ຜ່ານດາວທຽມ"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"ການຮັບສົ່ງຂໍ້ຄວາມຜ່ານດາວທຽມ"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ການໃຊ້ຂໍ້ມູນຈະຮວມຢູ່ໃນບັນຊີຂອງທ່ານ"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS ດາວທຽມ"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"ສົ່ງຂໍ້ຄວາມຫາບໍລິການສຸກເສີນເມື່ອທ່ານບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍມືຖື ຫຼື Wi-Fi ໄດ້"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS ດາວທຽມ, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"ກ່ຽວກັບ SOS ດາວທຽມ"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"ທ່ານສາມາດສົ່ງຂໍ້ຄວາມຫາບໍລິການສຸກເສີນ ແລະ ແບ່ງປັນສະຖານທີ່ຂອງທ່ານໄດ້ເຖິງແມ່ນໃນເວລາທີ່ທ່ານບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍມືຖື ຫຼື Wi-Fi. ບໍລິການນີ້ອາດນຳໃຊ້ບໍ່ໄດ້ໃນບາງເທື່ອ, ບາງສະຖານທີ່ ຫຼື ບາງສະຖານະການ."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ໂທ ຫຼື ສົ່ງຂໍ້ຄວາມຫາບໍລິການສຸກເສີນ"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ຕອບຄຳຖາມກ່ຽວກັບເຫດສຸກເສີນ"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"ປະຕິບັດຕາມຂັ້ນຕອນເພື່ອເຊື່ອມຕໍ່ກັບດາວທຽມ"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"ຫາກທ່ານບໍ່ມີເຄືອຂ່າຍມືຖື, ທ່ານຈະເຫັນຕົວເລືອກໃຫ້ໃຊ້ SOS ດາວທຽມ"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ສົ່ງຄຳຕອບໄປຫາບໍລິການສຸກເສີນເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອທີ່ເໝາະສົມສຳລັບທ່ານ"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"ເມື່ອທ່ານເຊື່ອມຕໍ່ແລ້ວ, ທ່ານສາມາດສົ່ງຂໍ້ຄວາມຫາບໍລິການສຸກເສີນໄດ້"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ລອງໃຊ້ການສາທິດ"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"ເມື່ອທ່ານເຊື່ອມຕໍ່ກັບບໍລິການສຸກເສີນຜ່ານດາວທຽມ, ລະບົບຈະແບ່ງປັນຊື່, ອີເມວ, ເບີໂທລະສັບ, ສະຖານທີ່, ຂໍ້ມູນອຸປະກອນ (IMEI, ພາສາ, ຮຸ່ນ, ລະດັບແບັດເຕີຣີ) ແລະ ຂໍ້ມູນລາຍຊື່ຜູ້ຕິດຕໍ່ສຸກເສີນຂອງທ່ານກັບບໍລິການສຸກເສີນ ແລະ ຜູ້ໃຫ້ບໍລິການດາວທຽມ. \n\nGoogle Messages ຕ້ອງເປັນແອັບ SMS ເລີ່ມຕົ້ນຂອງທ່ານຈຶ່ງຈະໃຊ້ SOS ດາວທຽມໄດ້. \n\nລະບົບຈະເປີດການເລືອກເຄືອຂ່າຍອັດຕະໂນມັດຫາກປິດຢູ່ກ່ອນໜ້ານີ້ ແລະ ອຸປະກອນຂອງທ່ານຈະເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໂດຍອັດຕະໂນມັດ."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"ການຕັ້ງຄ່າການແບ່ງປັນ"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ລາຍຊື່ຜູ້ຕິດຕໍ່ສຸກເສີນ"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"ບັນຊີ Google ຂອງທ່ານ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ກວດສອບ ຫຼື ອັບເດດຂໍ້ມູນທີ່ຈະແບ່ງປັນກັບບໍລິການສຸກເສີນ"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ຊື່ຈຸດເຂົ້າເຖິງ (APN)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ບໍ່ສາມາດໃຊ້ໄດ້ເມື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ທ່ານຢູ່ໃນໂໝດ 16KB ຂອງໂໝດບໍ່ຂຶ້ນກັບໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ Bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4KB ຈາກນັ້ນລັອກ Bootloader ຂອງອຸປະກອນ. ການດຳເນີນການນີ້ຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານອີກເທື່ອໜຶ່ງ ແລະ ກູ້ຄືນເປັນການຕັ້ງຄ່າໂປຣດັກຊັນ. ຫຼັງຈາກທີ່ອຸປະກອນເປີດເຂົ້າເປັນ Android ໄດ້ສຳເລັດ, ໃຫ້ປິດການນຳໃຊ້ການປົດລັອກ OEM ໃນຕົວເລືອກນັກພັດທະນາ. ຫາກອຸປະກອນບໍ່ສາມາດເປີດເຂົ້າເປັນ Android ຫຼື ບໍ່ສະຖຽນ, ໃຫ້ແຟລຊອຸປະກອນອີກເທື່ອໜຶ່ງໂດຍໃຊ້ຮູບພາບໂຮງງານຫຼ້າສຸດຈາກ &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ຫຼື ໃຊ້ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ແລະ ເລືອກ \'ລ້າງຂໍ້ມູນອຸປະກອນ\', \'ລັອກ Bootloader\' ແລະ \'ບັງຄັບໃຫ້ແຟລຊທຸກພາທິຊັນ\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"ໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ ໂດຍໃຊ້ຂະໜາດ 16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ອ່ານເພີ່ມເຕີມ"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ເອີ້ນໃຊ້ແອັບດ້ວຍໂໝດຄວາມເຂົ້າກັນໄດ້ກັບຂະໜາດໜ້າ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ເຄື່ອງຈັດການລາຍງານຂໍ້ຜິດພາດ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ເລືອກແອັບທີ່ຈະໃຫ້ຈັດການທາງລັດລາຍງານຂໍ້ຜິດພາດຢູ່ອຸປະກອນຂອງທ່ານ."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ສ່ວນຕົວ"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ຟັງສະຕຣີມ"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"ສະແກນລະຫັດ QR ການສະຕຣີມສຽງເພື່ອຟັງກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"ບໍ່ສາມາດແກ້ໄຂລະຫັດຜ່ານໃນລະຫວ່າງທີ່ແບ່ງປັນໄດ້. ເພື່ອປ່ຽນລະຫັດຜ່ານ, ທຳອິດໃຫ້ປິດການແບ່ງປັນສຽງ."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ລະຫັດຜ່ານຂອງທ່ານຕ້ອງມີ 4-16 ຕົວອັກສອນ ແລະ ໃຊ້ຕົວອັກສອນ, ຕົວເລກ ແລະ ສັນຍາລັກເທົ່ານັ້ນ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"ຕົວສະແກນລະຫັດ QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ຕ້ອງການຄວາມຊ່ວຍເຫຼືອບໍ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ຊອກຫາໃນການຕັ້ງຄ່າ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"ລາຍຊື່ຜູ້ຕິດຕໍ່, ບ່ອນຈັດເກັບຂໍ້ມູນ, ບັນຊີ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ບ່ອນຈັດເກັບຂໍ້ມູນລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ອຸປະກອນເທົ່ານັ້ນ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່ຈະບໍ່ຖືກຊິ້ງຂໍ້ມູນກັບບັນຊີ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຈະຖືກບັນທຶກໄປໃສ່ອຸປະກອນ ແລະ ຊິ້ງຂໍ້ມູນໄປຫາບັນຊີຂອງທ່ານເປັນຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ການຕັ້ງຄ່າບັນຊີເລີ່ມຕົ້ນຜິດພາດ"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ບໍ່ມີການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ອຸປະກອນເທົ່ານັ້ນ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ອຸປະກອນ ແລະ %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ເພີ່ມບັນຊີເພື່ອເລີ່ມຕົ້ນ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ບ່ອນທີ່ບັນທຶກລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ແຕ້ມວົງມົນເພື່ອຊອກຫາ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ແຕະປຸ່ມໜ້າທຳອິດ ຫຼື ດ້າມຈັບນຳທາງຄ້າງໄວ້ເພື່ອຊອກຫາໂດຍໃຊ້ເນື້ອຫາຢູ່ໜ້າຈໍຂອງທ່ານ."</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index af16799a888..6566f11d4ad 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snaigė"</item>
     <item msgid="7952183800501346803">"Paplūdimio skėtis"</item>
     <item msgid="799139025758265891">"Darbo įrankiai"</item>
-    <item msgid="1330084588359129896">"Palapinė"</item>
+    <item msgid="8112685757657659269">"Pianinas"</item>
     <item msgid="3861584909935022342">"Kino juosta"</item>
     <item msgid="5827426100157335512">"Knyga"</item>
     <item msgid="8585828346253128384">"Lotoso žiedas"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b0c133dd801..0d9efd6540e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Susieti naują įrenginį"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatiškai įjungti rytoj"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Jei išjungsite „Bluetooth“, jis vėl bus įjungtas kitą dieną"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Susieti dešinę ausį"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Susieti kairę ausį"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Susiekite kitą ausį"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"„Bluetooth LE Audio“ išjungimas"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Jei įrenginys palaiko „LE Audio“ aparatinės įrangos galimybes, išjungiama funkcija „Bluetooth LE Audio“."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"„Bluetooth LE Audio“ režimas"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"„Bluetooth LE Audio“ transliacijos NS peržiūros įgalinimas"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Įgalinama „LE Audio“ bendrinimo NS peržiūra, įskaitant asmeninių garso įrašų bendrinimą ir privatų transliavimą"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Rodyti „LE Audio“ jungiklį įrenginio informacijoje"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"„Bluetooth LE Audio“ leidžiamųjų sąrašo išskyrimas"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Naudoti „LE Audio“ pagal numatytuosius nustatymus, net jei „LE Audio“ išorinis įrenginys nebuvo patvirtintas kaip atitinkantis leidžiamųjų sąrašo kriterijus."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Programos kalba"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Siūlomos kalbos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Visos kalbos"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Siūloma"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Visos kalbos"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Visi regionai"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Visos numeravimo sistemos"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistemos kalba"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Numatytoji sistemos vertė"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Šios programos kalbos pasirinkimas nepasiekiamas iš skilties „Nustatymai“."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Keisti"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nepasiekiama"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Šios kalbos negalima naudoti kaip sistemos kalbos, bet programoms ir svetainėms nurodėte, kad teikiate pirmenybę šiai kalbai."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Paieška"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Pridėti kalbą"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regiono nuostata"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Įveskite kalbos pav."</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Daugiau kalbos nustatymų"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Tinkamumo nustatymai pagal regioną"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Nustatyti vienetus ir numerių nuostatas"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Leiskite programoms žinoti jūsų tinkamumo nustatymus pagal regioną, kad galėtų suasmeninti funkcijas."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Programos naudos jūsų tinkamumo nustatymus pagal regioną, kai bus galima."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Tinkamumo nustatymai pagal regioną"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatūra"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Pirma savaitės diena"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Skaičių nuostatos"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Gali būti taikomi tarptinklinio ryšio mokesčiai."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Nustatyti laiką automatiškai"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Nustatyti automatiškai"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Kai įjungtas šis perjungiklis, laiko juostai nustatyti naudojama vietovė"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatinė data ir laikas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Nustatykite automatiškai pagal tinklo ir belaidžio ryšio signalus"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatinė laiko juosta"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nustatykite automatiškai pagal netoliese esančius mobiliojo ryšio tinklus"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Nustatykite automatiškai pagal įrenginio vietovę, jei ji pasiekiama"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Naudoti numatytuosius lokalės nustatymus"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Naudoti 24 val. formatą"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Laikas"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Patraukite pirštą, tada vėl palieskite jutiklį"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Negalima naudoti piršto atspaudo jutiklio"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Apsilankykite pas taisymo paslaugos teikėją."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekranas išjungtas, atrakinimas piršto atspaudu"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Naudoti atrakinimą piršto atspaudu, net kai ekranas išjungtas"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekranas išjungtas, atrakinti"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Daugiau saugos nustatymų"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Darbo profilio užraktas, šifruotė ir kt."</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifruotė, prisijungimo duomenys ir kt."</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Privačios erdvės atrakinimo piešinio nustatymas"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Užrakinimas"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Slėpimas"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Patvirtinkite privačios erdvės atrakinimo piešinį"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Iš naujo įveskite privačios erdvės PIN kodą"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Pakartotinai įveskite privačios erdvės slaptažodį"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Galite pridėti iki <xliff:g id="COUNT">%d</xliff:g> piršto ats."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Pridėjote maksimalų skaičių kontrolinių kodų"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Negalima pridėti daugiau kontrolinių kodų"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Įjungta"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Išjungta"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Išorinis vaizdo įrenginys"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Įtaisytasis ekranas"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Išorinio vaizdo įrenginio naudojimas"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ekrano skyra"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Išorinis vaizdo įrenginys atjungtas"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Pakeitus pasukimą arba skyrą, gali būti sustabdytos šiuo metu veikiančios programos"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Įrenginys turi būti prijungtas prie išorinio vaizdo įrenginio, kad būtų galima bendrinti ekrano vaizdą"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Daugiau parinkčių"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Laikykite ir vilkite, kad pertvarkytumėte ekranus."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Perdavimas"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ekrano vaizdo bendrinimas"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Įgalinti belaidį rodymą"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Patikrinkite slaptažodį ir bandykite dar kartą"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Susisiekite su įrenginio gamintoju"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Patikrinkite ryšį ir bandykite dar kartą"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Šis „Wi‑Fi“ tinklas šiuo metu nepasiekiamas"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Iškilo problema dėl šio QR kodo. Bandykite prisijungti kitu būdu."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Tinklo pasirinkimas"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Kad prijungtumėte įrenginį, pasirinkite tinklą"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Pridėti šį įrenginį prie „<xliff:g id="SSID">%1$s</xliff:g>“?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Sužinokite daugiau apie automatinį pasukimą"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekrano skyra"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Didelė skyra"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Visa skyra"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Esant visai skyrai eikvojama daugiau akumuliatoriaus energijos. Perjungus skyrą, kai kurios programos gali būti paleistos iš naujo."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Didžiausia skyra"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Didžiausia skyra eikvoja daugiau akumuliatoriaus energijos. Perjungus skyrą, kai kurios programos gali būti paleistos iš naujo."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Pasirinkta"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Spalvos"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natūrali"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Prisitaikanti"</string>
     <string name="brightness" msgid="6216871641021779698">"Šviesumo lygis"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Prisitaikantis šviesumas"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Apie prisitaikantį šviesumą"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekrano šviesumas automatiškai prisitaikys prie jūsų aplinkos ir veiklos. Galite šliaužiklį perkelti patys, kad prisitaikantis šviesumas įsimintų jūsų nuostatas."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Įjungta"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Išjungta"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Miego režimo nustatymai"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Režimai taip pat gali suaktyvinti tamsiąją temą}=1{Režimas „{mode_1}“ taip pat suaktyvina tamsiąją temą}=2{Režimai „{mode_1}“ ir „{mode_2}“ taip pat suaktyvina tamsiąją temą}=3{Režimai „{mode_1}“, „{mode_2}“ ir „{mode_3}“ taip pat suaktyvina tamsiąją temą}one{„{mode_1}“, „{mode_2}“ ir dar # režimas taip pat suaktyvina tamsiąją temą}few{„{mode_1}“, „{mode_2}“ ir dar # režimai taip pat suaktyvina tamsiąją temą}many{„{mode_1}“, „{mode_2}“ ir dar # režimo taip pat suaktyvina tamsiąją temą}other{„{mode_1}“, „{mode_2}“ ir dar # režimų taip pat suaktyvina tamsiąją temą}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Režimų nustatymai"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Dar blankesnis"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Itin blanku"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Leisti blankesnį įrenginio ekraną nei įprastai"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekrano skirtasis laikas"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Vietovės paslaugos"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Vietovės paslaugos"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Naudoti vietovę"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Naudoti vietovės duomenis laiko juostai"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Laiko juostos nustatyti automatiškai nepavyko"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Vietovė arba Vietovės paslaugos išjungtos"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Vietovės nustatymai"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Taisyti"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Atšaukti"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatinė laiko juosta išjungta"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nepasiekiama, kai automatinė laiko juosta išjungta"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Vietovės duomenys gali būti naudojami laiko juostai nustatyti"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Jei įrenginio vietovė pasiekiama, ji gali būti naudojama laiko juostai nustatyti"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
     <string name="legal_information" msgid="7509900979811934843">"Teisinė informacija"</string>
     <string name="manual" msgid="3651593989906084868">"Neautomatiškai"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Parinktys"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pritaikomumas"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizinė klaviatūra"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Peradresavimo klavišai"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klaviatūra nepaiso greitai kartojamų to paties klavišo paspaudimų <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> milisek."</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviatūra nepaiso greitai kartojamų to paties klavišo paspaudimų"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Peradresavimo klavišų slenkstis"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pasirinkite, kiek laiko klaviatūra nepaiso pasikartojančių klavišų paspaudimų"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sek."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sek."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sek."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Tinkinta"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"priskirta vertė"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lėtieji klavišai"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Laikas, per kurį aktyvinamas klavišo paspaudimas, koreguojamas į <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> milisek."</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Koreguojamas laikas, per kurį aktyvinamas klavišo paspaudimas"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Atmenieji klavišai"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Norėdami naudoti spartųjį klavišą, vienu metu paspauskite vieną klavišą, užuot laikę nuspaudę kelis klavišus"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Pelės klavišai"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Naudokite fizinę klaviatūrą, kad galėtumėte valdyti pelę."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Naudoti pelės klavišus"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Naudodami klaviatūrą valdykite žymeklį"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Atvirkštinis slinkimas pele"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Slinkite aukštyn, kad pereitumėte puslapiu žemyn"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sukeisti kairįjį ir dešinįjį mygtukus"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Naudokite kairįjį pelės mygtuką kaip dešinįjį"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Pelės klavišai, skirti klaviatūrai „<xliff:g id="KEYBOARD_NAME">%s</xliff:g>“"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Perkelkite pelės žymeklį naudodami šiuos klavišus: <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Spustelėkite pagrindinį pelės mygtuką naudodami klavišą „<xliff:g id="CLICK_LABEL">%s</xliff:g>“"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Paspauskite ir palaikykite pagrindinį pelės mygtuką naudodami klavišą „<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>“"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Atleiskite pagrindinį pelės mygtuką naudodami klavišą „<xliff:g id="RELEASE_LABEL">%s</xliff:g>“"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Perjunkite slinkimo režimą naudodami klavišą „<xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>“. Tai atlikus bus galima slinkti vaizdu aukštyn, žemyn, kairėn arba dešinėn naudojant šiuos klavišus: <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Spustelėkite antrinį pelės mygtuką naudodami klavišą „<xliff:g id="RELEASE_2_LABEL">%s</xliff:g>“"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Spartieji klavišai"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Rodyti sparčiųjų klavišų sąrašą"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Darbo profilio klaviatūros ir įrankiai"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Numatytasis"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Jutiklinė dalis"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Jutiklinė dalis ir pelė"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Pelė"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Žymiklio greitis, gestai"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Palieskite ir spustelėkite"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Vilkimas palietus"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Spustelėti apačioje dešinėje"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Daugiau parinkčių – jutiklinės dalies apačioje dešinėje"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Žymiklio greitis"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Naudoti palietimą trimis pirštais"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Rodyklės spalva"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Keisti rodyklės užpildymo stilių į juodą"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Keisti rodyklės užpildymo stilių į žalią"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Sužinokite jutiklinės dalies gestus"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"jutiklinė dalis, pelė, žymeklis, slinkti, perbraukti, spustelėti dešiniuoju klavišu, spustelėti"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"spustelėti dešiniuoju klavišu, paliesti"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Spustelėjimas viduriniuoju klavišu"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Paleisti Padėjėją"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Eiti į pagrindinį puslapį"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Grįžti"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Peržiūrėti naujausias programas"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Eikite į pagrindinį puslapį"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Braukite viršun trimis pirštais bet kur jutiklinėje dalyje"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Grįžti"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pasirinkite naują „<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>“ slaptažodį:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fizinės klaviatūros pritaikomumas"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Atmenieji klavišai, pakartotinių paspaudimų kontrolė, pelės klavišai"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Klavišų kartojimas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Atidėti iki pakartojimo"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Kartojimo dažnis"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Laikykite paspaudę klavišą, kad kartotumėte jo simbolį, kol klavišas bus atleistas"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"„<xliff:g id="IME_LABEL">%s</xliff:g>“ išdėstymas"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Numatytasis"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatinis: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Peržiūra"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standartinės parinktys"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Kalba"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Teksto dydis"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtitrų dydis"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitrų stilius"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tinkintos parinktys"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fono spalva"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Reguliuoti maitinimo naudojimą"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Įtraukti paketai"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Programos veikia įprastai"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Rekomenduojama pakeisti akumuliatorių"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Sumažinta akumuliatoriaus talpa ir įkrovimo našumas, todėl rekomenduojama pakeisti akumuliatorių."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Žemas akumuliatoriaus lygis"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Įjunkite Akumuliatoriaus tausojimo priemonę, kad akumuliatorius veiktų ilgiau"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Akumuliatoriaus veikimo laiko pailginimas"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Atsijungti nuo šio VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Atsijungti"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> vers."</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Pamiršti VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Pakeisti esamą VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nustatyti visada įjungtą VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„9.00–17.00 darbo dienomis“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalendoriaus įvykiai"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Aktyvus režimas „{mode_1}“}=2{Aktyvūs režimai „{mode_1}“ ir „{mode_2}“}=3{Aktyvūs režimai „{mode_1}“, „{mode_2}“ ir „{mode_3}“}one{Aktyvūs režimai „{mode_1}“ ir „{mode_2}“ ir dar #}few{Aktyvūs režimai „{mode_1}“ ir „{mode_2}“ ir dar #}many{Aktyvūs režimai „{mode_1}“ ir „{mode_2}“ ir dar #}other{Aktyvūs režimai „{mode_1}“ ir „{mode_2}“ ir dar #}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Vieną režimą galima įjungti automatiškai}one{# režimą galima įjungti automatiškai}few{# režimus galima įjungti automatiškai}many{# režimo galima įjungti automatiškai}other{# režimų galima įjungti automatiškai}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Netrukdymo režimas}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ĮJUNGTA"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nenustatyta"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Išjungta"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Supratau"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Pranešimai"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trukmė"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Pranešimai, įvykiai ir priminimai"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Atlikta"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Nustatymai"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Nieko nerodyti arba neskambėti gavus pranešimų"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Neskambėti gavus pranešimų"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Nematysite arba negirdėsite pranešimų. Skambučiai nuo žvaigždute pažymėtų kontaktų ir pakartotinai skambinančiųjų leidžiami."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Dabartinis nustatymas)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Pakeisti netrukdymo režimo pranešimų nustatymus?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Darbo profilio garsai"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Naudoti asmen. profilio garsus"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Naudoti tokius pat garsus kaip asmeniniame profilyje"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Atrakinę tiesiogiai eikite į paskutinį naudotą ekraną. Pranešimai nebus rodomi užrakinimo ekrane. Peržiūrėkite perbraukę žemyn iš viršaus."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"užrakinimo ekranas, praleisti, apeiti"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kai darbo profilis užrakintas"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Užrakinimo ekrano pranešimų minimalizmas"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Rodyti mažiau pranešimų užrakinimo ekrane"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Užrakinimo ekrane rodyti tik naujus pranešimus"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatiškai pašalinti anksčiau žiūrėtus pranešimus iš užrakinimo ekrano"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Pranešimai užrakinimo ekrane"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Rodyti pokalbius, numatytuosius ir tylius"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Rodyti pokalbius, numatytuosius ir tylius"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Rodyti visą darbo pranešimų turinį"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Slėpti neskelbtiną darbo turinį"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kaip norite matyti profilio pranešimus, kai įrenginys užrakintas?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilio pranešimai"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Pranešimai"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Programų pranešimai"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kai per trumpą laiką gaunate daug pranešimų, įrenginys sumažina garsumą ir įspėjimų skaičių ekrane ne daugiau nei dviem minutėms. Skambučiai, signalai ir prioritetiniai pokalbiai nepaveikiami. \n\nNeaktyvumo laikotarpiu gautus pranešimus galima rasti perbraukus žemyn iš ekrano viršaus."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Taikyti darbo profiliams"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Taikyti darbo profilio programoms"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Sugrupuoti pranešimai"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Įjungta"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Išjungta"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Naudoti pranešimų grupavimą"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Panašių temų pranešimai bus išjungti ir sugrupuoti, kad būtų tyliau. Grupuojant bus perrašomi pačios programos pranešimų nustatymai."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pagalbinės virtualiosios realybės paslaugos"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nėra įdiegtų programų, kurios pateikė užklausą būti vykdomos kaip pagalbinės virtualiosios realybės paslaugos."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leisti „<xliff:g id="SERVICE">%1$s</xliff:g>“ pasiekti virtualiosios realybės paslaugą?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritetiniai pokalbiai"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Pokalbių nustatymai"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas gali trikdyti"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Net jei pranešimų ar skambučių programos negali teikti jums pranešimų, čia pasirinkti žmonės vis tiek gali pasiekti jus naudodami šias programas"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Skambučiai"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktų nustatymai"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Žvaigždute pažymėtų kontaktų nustatymai"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Niekas"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nėra"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Signalai"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"„<xliff:g id="APP_LABEL">%s</xliff:g>“ (darbas)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Skaičiuojama…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Programų nustatymai"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Leisti programoms nepaisyti"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Programos, kurios gali trikdyti"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Režimo kūrimas"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Tinkintas režimas"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Režimo pavadinimas"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Režimo pavadinimo laukas negali būti tuščias"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Pasirinkite piktogramą"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendoriaus įvykiai"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Laiko miegoti veiksmų seka"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Vairuojant"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Pranešimai viso ekrano režimu"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Leisti pranešimus viso ekrano režimu iš šios programos"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Leiskite šiai programai rodyti pranešimus viso ekrano režimu, kai įrenginys užrakintas. Programos gali juos naudoti, kad paryškintų įspėjimus, gaunamuosius skambučius ar kitus skubius pranešimus."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Rašyti sistemos nuostatas"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Leisti šiai programai keisti sistemos nuostatas jūsų vardu"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Šis leidimas leidžia programai keisti pagrindines sistemos nuostatas."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Medijos valdymo programos"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Leisti programai valdyti mediją"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Leidus ši programa galės keisti arba ištrinti kitomis programomis sukurtus medijos failus be jūsų sutikimo. Programai turi būti suteiktas leidimas pasiekti failus ir mediją."</string>
@@ -4396,6 +4478,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestai"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Spartusis fotoaparato atidarymas"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Jei norite greitai atidaryti fotoaparatą, dukart paspauskite maitinimo mygtuką. Veikia bet kuriame ekrane."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Dukart paliesti maitinimo mygtuką"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Naudoti palietimą dukart"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Dukart paliesti maitinimo mygtuką"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Atidaryti Fotoaparatą"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Prieiga prie Fotoaparato"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Atidaryti „Wallet“"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Prieiga prie „Wallet“"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Fotoaparato apvertimas fiksuojant asmenukę"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Naršymo režimas"</string>
@@ -4793,11 +4882,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Palydoviniai pranešimai"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Siųskite ir gaukite teksto pranešimus per palydovą. Įtraukiama į jūsų paskyrą."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Siųskite ir gaukite teksto pranešimus per palydovą. Neįtraukiama į jūsų paskyrą."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Palydoviniai pranešimai"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Apie palydovinius pranešimus"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Susirašinėjimas palydoviniais pranešimais, palydovinis ryšys"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Apie funkciją „<xliff:g id="SUBJECT">%1$s</xliff:g>“"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Galite siųsti ir gauti teksto pranešimus palydovo ryšiu, jei turite tinkamą „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ paskyrą"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Jūsų „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ planas"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Palydoviniai pranešimai įtraukti į jūsų paskyrą"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Susirašinėjimo funkcija įtraukta į jūsų paskyrą"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Palydoviniai pranešimai neįtraukti į jūsų paskyrą"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Sužinokite daugiau"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Kaip tai veikia"</string>
@@ -4805,10 +4894,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonas bus automatiškai prijungtas prie palydovo. Kad užtikrintumėte geriausią ryšį, turi būti aiškiai matomas dangus."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kai telefonas prisijungia prie palydovo"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Galite siųsti teksto pranešimą bet kam, įskaitant pagalbos tarnybas. Telefonas bus iš naujo prijungtas prie mobiliojo ryšio tinklo, kai jis bus pasiekiamas."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Palydoviniai pranešimai gali užtrukti ilgiau ir būti pasiekiami tik tam tikruose regionuose. Orų sąlygos ir tam tikros struktūros gali turėti įtakos palydovo ryšiui. Skambinti per palydovą negalima. Skambučiai pagalbos numeriu gali būti sujungiami.\n\nGali šiek tiek užtrukti, kol paskyros pakeitimai bus rodomi Nustatymuose. Jei reikia išsamios informacijos, susisiekite su operatoriumi."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Daugiau apie palydovinius pranešimus"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Funkcija „<xliff:g id="SUBJECT">%1$s</xliff:g>“ gali veikti lėčiau ir būti pasiekiama tik tam tikrose vietovėse. Orų sąlygos ir tam tikros struktūros gali turėti įtakos palydovo ryšiui. Skambinti per palydovą negalima. Skambučiai pagalbos numeriu gali būti sujungiami.\n\nGali šiek tiek užtrukti, kol paskyros pakeitimai bus rodomi Nustatymuose. Kreipkitės į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ išsamios informacijos."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Daugiau apie funkciją „<xliff:g id="SUBJECT">%1$s</xliff:g>“"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nepavyko įjungti „<xliff:g id="FUNCTION">%1$s</xliff:g>“"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Jei norite įjungti „<xliff:g id="FUNCTION">%1$s</xliff:g>“, pirmiausia nutraukite palydovinį ryšį"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Palydovinis ryšys"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Palydovinis ryšys"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"palydovinis ryšys"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"susirašinėjimas palydoviniais pranešimais"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Duomenų naudojimas įtrauktas į jūsų paskyrą"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Prisijungimas prie palydovo kritiniu atveju"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Siųskite pranešimą pagalbos tarnyboms, kai negalite prisijungti prie mobiliojo ryšio ar „Wi‑Fi“ tinklo"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"prisijungimas prie palydovo kritiniu atveju, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Apie prisijungimą prie palydovo kritiniu atveju"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Siųskite pranešimus pagalbos tarnyboms ir bendrinkite vietovės informaciją, kai nėra galimybės prisijungti prie mobiliojo ryšio ar „Wi-Fi“ tinklo. Paslauga gali būti pasiekiama ne visada, ne visur ir ne visomis aplinkybėmis."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Skambinkite arba siųskite teksto pranešimą pagalbos tarnyboms"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Atsakykite į klausimus apie kritinę padėtį"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Atlikite veiksmus, kad prisijungtumėte prie palydovo"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Jei neturite mobiliojo ryšio tinklo, bus pateikta parinktis naudoti prisijungimo prie palydovo kritiniu atveju funkciją"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Siųskite atsakymus pagalbos tarnyboms, kad gautumėte tinkamą pagalbą"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kai prisijungsite, galėsite siųsti pranešimus pagalbos tarnyboms"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Išbandyti demonstracinę versiją"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kai susisiekiate su pagalbos tarnybomis palydoviniu ryšiu, jūsų vardas, pavardė, el. pašto adresas, telefono numeris, vietovė, įrenginio informacija (IMEI, kalba, modelis, akumuliatoriaus lygis) ir kritinės padėties kontaktų informacija bendrinama su pagalbos tarnybomis ir palydovinio ryšio paslaugų teikėjais. \n\nNorint naudoti prisijungimo prie palydovo kritiniu atveju funkciją, „Google Messages“ turi būti numatytoji SMS programa. \n\nJei automatinis tinklo pasirinkimas išjungtas, jis bus įjungtas ir įrenginys automatiškai prisijungs prie bet kurio tinklo."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Bendrinimo nuostatos"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kritinės padėties kontaktai"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Jūsų „Google“ paskyra"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Peržiūrėkite arba atnaujinkite informaciją, kuri bus bendrinama su pagalbos tarnybomis"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Prieigos taškų pavadinimai"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"Prieigos taško pavadinimas"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nepasiekiama, kai prisijungta prie „<xliff:g id="CARRIER">%1$s</xliff:g>“"</string>
@@ -4995,6 +5108,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Dirbate 16 KB puslapio agnostikos režimu. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai paleidyklė atrakinta, gali kilti pavojus. Kai kurios funkcijos gali būti išjungtos šiais režimais, todėl kai kurios programos gali neveikti. Jei norite vėl įjungti generavimo režimą, turite vėl perjungti į 4 KB režimą ir užrakinti įrenginio paleidyklę. Tada vėl bus atkurti įrenginio gamykliniai nustatymai. Kai įrenginys bus sėkmingai paleistas sistemoje „Android“, išjunkite OĮG operatoriaus pasirinkimo ribojimo panaikinimą skiltyje „Kūrėjo parinktys“. Jei nepavyksta paleisti įrenginio sistemoje „Android“ arba jis nestabilus, iš naujo įdiekite įrenginį „Android“ ROM vidinėje atmintyje su naujausiais gamykliniais disko atvaizdžiais iš &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; arba naudokite &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ir pasirinkite „Naikinti įrenginio duomenis“, „Užrakinti paleidyklę“ ir „Priverstinai įdiegti visus skaidinius „Android“ ROM vidinėje atmintyje“."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB nepriklausomo puslapio dydžio režimas"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Skaityti daugiau"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Programos paleidimas naudojant puslapio dydžio suderinamumo režimą"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Pranešimų apie riktus doroklė"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Nustatoma, kuri programa apdoroja pranešimo apie riktą spartųjį klavišą įrenginyje."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Asmeninė"</string>
@@ -5435,7 +5551,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Klausyti srauto"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Nuskaitykite garso srauto QR kodą, kad galėtumėte klausyti naudodami „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Bendrinant negalima redaguoti slaptažodžio. Jei norite pakeisti slaptažodį, pirmiausia išjunkite garso įrašų bendrinimą."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Slaptažodį turi sudaryti 4–16 simbolių ir tai gali būti tik raidės, skaičiai bei simboliai"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR kodų skaitytuvas"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Reikia pagalbos?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Nustatymų paieška"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktai, saugykla, paskyra"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktų saugykla"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tik įrenginys"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nauji kontaktai nebus sinchronizuojami su paskyra"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Pagal numatytuosius nustatymus kontaktai bus išsaugomi įrenginyje ir sinchronizuojami su paskyra"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Nustatant numatytąją paskyrą įvyko klaida"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Numatytoji paskyra nenustatyta"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tik įrenginys"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Įrenginys ir %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Jei norite pradėti, pridėkite paskyrą"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kur išsaugoti kontaktus"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Paieška apibrėžiant"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Jei norite ieškoti naudodami turinį ekrane, palieskite ir palaikykite pagrindinio puslapio mygtuką arba naršymo rankenėlę."</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 4412a86c975..5626332ec9b 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Sniegpārsliņa"</item>
     <item msgid="7952183800501346803">"Saulessargs"</item>
     <item msgid="799139025758265891">"Darbnīcas rīki"</item>
-    <item msgid="1330084588359129896">"Telts"</item>
+    <item msgid="8112685757657659269">"Klavieres"</item>
     <item msgid="3861584909935022342">"Filmas rullītis"</item>
     <item msgid="5827426100157335512">"Grāmata"</item>
     <item msgid="8585828346253128384">"Lotosa zieds"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 983e014087f..6c4b11ca511 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automātiski ieslēgt rīt"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ja izslēdzat Bluetooth, nākamajā dienā tas tiek ieslēgts"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Savienot pārī labo"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Savienot pārī kreiso"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Savienojiet otru aparātu"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Atspējot Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Tiek atspējota Bluetooth LE Audio funkcija, ja ierīcē tiek atbalstītas LE Audio aparatūras iespējas."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio režīms"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Iespējot Bluetooth LE audio apraides lietotāja saskarnes priekšskatījumu"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Tiks iespējots LE Audio kopīgošanas lietotāja saskarnes priekšskatījums, tostarp personīga audio kopīgošana un privāta apraide."</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE Audio slēdzis informācijā par ierīci"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Apiet Bluetooth LE Audio atļaušanas sarakstu"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Pēc noklusējuma izmantot LE Audio, pat ja nav pārbaudīta LE Audio perifērijas ierīces atbilstība atļaušanas saraksta kritērijiem."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Lietotnes valoda"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Ieteiktās valodas"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Visas valodas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Ieteikumi"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Visas valodas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Visi reģioni"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Visas numerācijas sistēmas"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistēmas valoda"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistēmas noklusējums"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Iestatījumos nav pieejama valodas atlase šai lietotnei."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Mainīt"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Šī valoda nav pieejama: %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Šo valodu nevar lietot kā sistēmas valodu, bet esat norādījis lietotnēm un vietnēm, ka dodat priekšroku šai valodai."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Meklēt"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Valodas pievienošana"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Reģiona preference"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Ierakstiet valodas nosaukumu"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Citi valodas iestatījumi"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Reģionālās preferences"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Iestatiet vienību un skaitļu preferences."</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Atklājiet lietotnēm savas reģionālās preferences, lai lietotnes varētu personalizēt jums pieejamās iespējas."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Lietotnēs tiks izmantotas jūsu reģionālās preferences, kad tas būs iespējams."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Reģionālās preferences"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatūra"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Pirmā nedēļas diena"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Skaitļu preferences"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Var tikt piemērota maksa par viesabonēšanu."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Iestatīt laiku automātiski"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Iestatīt automātiski"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Ja šis slēdzis būs ieslēgts, atrašanās vietas dati tiks izmantoti, lai iestatītu laika joslu"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automātisks datums un laiks"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Iestatīt automātiski, izmantojot tīklu un bezvadu signālus."</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automātiska laika joslu noteikšana"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Iestatīt automātiski, ņemot vērā mobilos tīklus jūsu tuvumā."</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Iestatīt automātiski, izmantojot ierīces atrašanās vietu (ja pieejama)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Izmantot lokalizācijas noklusējuma vērtību"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Izmantot 24 stundu formātu"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Laiks"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Paceliet pirkstu un pēc tam vēlreiz pieskarieties sensoram."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Nevar izmantot pirksta nospieduma sensoru"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Sazinieties ar remonta pakalpojumu sniedzēju."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Autorizācija ar pirksta nospiedumu, kad ekrāns izslēgts"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Izmantot autorizāciju ar pirksta nospiedumu, pat ja ekrāns ir izslēgts"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekrāna izslēgšana, atbloķēšana"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Vairāk drošības iestatījumu"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Darba profila bloķēšana, šifrēšana u.c."</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifrēšana, akreditācijas dati u.c."</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Iestatiet kombināciju privātajai telpai"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloķēšana"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Paslēpšana"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Apstipriniet privātās telpas kombināciju"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Atkārtoti ievadiet privātās telpas PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Atkārtoti ievadiet privātās telpas paroli"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Varat pievienot līdz <xliff:g id="COUNT">%d</xliff:g> pirkstu nospiedumiem."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Jūs esat pievienojis maksimālo pirkstu nospiedumu skaitu."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nevar pievienot citus pirkstu nospiedumus."</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Ieslēgts"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Izslēgts"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ārējais displejs"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Iebūvēts displejs"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Izmantot ārējo displeju"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Displeja izšķirtspēja"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ārējais displejs ir atvienots"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Mainot virzienu vai izšķirtspēju, var tikt apturētas lietotnes, kas pašlaik darbojas"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Lai varētu spoguļot ekrānu, ierīcei jābūt savienotai ar ārēju displeju"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Citas iespējas"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Lai pārkārtotu displejus, turiet un velciet."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Apraide"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spogulis"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bezvadu attēlošanas iespējošana"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Pārbaudiet paroli un mēģiniet vēlreiz"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Sazinieties ar ierīces ražotāju"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Pārbaudiet savienojumu un mēģiniet vēlreiz"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Šis Wi-Fi tīkls šobrīd nav pieejams"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ir radusies problēma ar šo kvadrātkodu. Mēģiniet izveidot savienojumu citā veidā."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Tīkla izvēle"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Lai pievienotu ierīci, izvēlieties tīklu."</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Vai pievienot šo ierīci tīklam <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Uzzināt vairāk par automātisko pagriešanu"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekrāna izšķirtspēja"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Augsta izšķirtspēja"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Pilna izšķirtspēja"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Izmantojot pilnu izšķirtspēju, tiek patērēts vairāk akumulatora enerģijas. Ja mainīsiet izšķirtspēju, noteiktas lietotnes var tikt restartētas."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimālā izšķirtspēja"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Izmantojot maksimālo izšķirtspēju, tiek patērēts vairāk akumulatora enerģijas. Ja mainīsiet izšķirtspēju, noteiktas lietotnes var tikt restartētas."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Atlasīta"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Krāsas"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Dabiska"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptīva krāsa"</string>
     <string name="brightness" msgid="6216871641021779698">"Spilgtuma līmenis"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptīvs spilgtums"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Par adaptīvo spilgtumu"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekrāna spilgtums automātiski tiks pielāgots apkārtējai videi un veiktajām darbībām. Lai adaptīvajam spilgtumam iestatītu savas preferences, pārvietojiet slīdni."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Ieslēgt"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Izslēgts"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Gulēšanas režīma iestatījumi"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Režīmi var arī aktivizēt tumšo motīvu.}=1{Režīms “{mode_1}” arī aktivizē tumšo motīvu.}=2{Režīmi “{mode_1}” un “{mode_2}” arī aktivizē tumšo motīvu.}=3{Režīmi “{mode_1}”, “{mode_2}” un “{mode_3}” arī aktivizē tumšo motīvu.}zero{Režīmi “{mode_1}”, “{mode_2}” un vēl # režīmi arī aktivizē tumšo motīvu.}one{Režīmi “{mode_1}”, “{mode_2}” un vēl # režīms arī aktivizē tumšo motīvu.}other{Režīmi “{mode_1}”, “{mode_2}” un vēl # režīmi arī aktivizē tumšo motīvu.}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Režīmu iestatījumi"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Aptumšot papildus"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Papildu aptumšošana"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Varat atļaut aptumšot ierīci vairāk nekā parasti."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekrāna noildze"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Atrašanās vietu pakalpojumi"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Atrašanās vietu pakalpojumi"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Izmantot atrašanās vietu"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Izmantot atrašanās vietu laika joslas noteikšanai"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Nevar automātiski iestatīt laika joslu"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Atrašanās vietas atļauja/pakalpojumi ir izslēgti"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Atrašanās vietas iestatījumi"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Novērst problēmu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Atcelt"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automātiskā laika josla ir izslēgta."</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Šī iespēja nav pieejama, ja automātiska laika joslu noteikšana ir izslēgta."</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Atrašanās vietu var izmantot, lai iestatītu laika joslu"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ja ierīces atrašanās vieta ir pieejama, tā var tikt izmantota, lai iestatītu laika joslu."</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Skatīt juridisko informāciju, statusu, programmatūras versiju"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juridiskā informācija"</string>
     <string name="manual" msgid="3651593989906084868">"Rokasgrāmata"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcijas"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pieejamība"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziskā tastatūra"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Atlēcienu taustiņi"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastatūra ignorē ātru taustiņa nospiešanu vairākas reizes, ja tas tiek atkārtoti nospiests <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms laikā."</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatūra ignorē ātri atkārtotu viena taustiņa nospiešanu."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Atlēcienu taustiņu slieksnis"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Izvēlieties, cik ilgi tastatūra ignorēs atkārtotu taustiņu nospiešanu."</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Pielāgots"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"pielāgota vērtība"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lēnie taustiņi"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Laiks, kas nepieciešams, lai aktivizētu nospiestu taustiņu, tiek pielāgots uz <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms."</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tiek pielāgots laiks, kas nepieciešams, lai aktivizētu nospiestu taustiņu."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taustiņu ķēde"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Izmantojot īsinājumtaustiņus, vienlaikus nospiediet tikai vienu taustiņu, nevis turiet nospiestus vairākus taustiņus."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Peles taustiņi"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Izmantojiet fizisko tastatūru, lai kontrolētu peli."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Izmantot peles taustiņus"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Izmantojiet tastatūru, lai kontrolētu rādītāju."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Peles ritināšana atpakaļgaitā"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Ritiniet augšup, lai pārvietotu lapu uz leju"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Apmainīt vietām kreiso un labo pogu"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Izmantojiet peles kreiso pogu kā labo"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Peles taustiņi tastatūrai <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Lai pārvietotu peles rādītāju, izmantojiet taustiņus <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Lai noklikšķinātu uz peles primārās pogas, izmantojiet taustiņu <xliff:g id="CLICK_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Lai nospiestu un turētu peles primāro pogu, izmantojiet taustiņu <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Lai atlaistu peles primāro pogu, izmantojiet taustiņu <xliff:g id="RELEASE_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Lai pārslēgtu ritināšanas režīmu, izmantojiet taustiņu <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. Šajā režīmā varēsiet ritināt skatu augšup, lejup, pa kreisi un pa labi ar taustiņiem <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Lai noklikšķinātu uz peles sekundārās pogas, izmantojiet taustiņu <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Īsinājumtaustiņi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Rādīt īsinājumtaustiņu sarakstu"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatūras un rīki darba profilā"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Noklusējums"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Skārienpaliktnis"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Skārienpaliktnis un pele"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Pele"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Rādītāja ātrums, žesti"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Pieskaršanās, lai noklikšķinātu"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Vilkšana pieskaroties"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Noklikšķināt apakšējā labajā stūrī"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Citas iespējas: skārienpaliktņa labais apakšējais stūris"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Rādītāja ātrums"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Izmantot skārienu ar trim pirkstiem"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Rādītāja krāsa"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Mainīt aizpildījuma stilu uz melnu"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Mainīt aizpildījuma stilu uz zaļu"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Apgūt skārienpaliktņa žestus"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"skārienpaliktnis, pele, kursors, ritināt, vilkt, noklikšķināt ar peles labo pogu, noklikšķināt, rādītājs"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"noklikšķināt ar peles labo pogu, pieskarties"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Noklikšķināt ar peles vidējo pogu"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Palaist Asistentu"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Doties uz sākuma ekrānu"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Doties atpakaļ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Skatīt nesen izmantotās lietotnes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Došanās uz sākuma ekrānu"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Ar trīs pirkstiem velciet augšup pa skārienpaliktni"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Došanās atpakaļ"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izvēlieties jaunu taustiņu — <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziskās tastatūras pieejamība"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taustiņu ķēde, atlēcienu taustiņi, peles taustiņi"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Taustiņu atkārtošana"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Aizkave pirms atkārtošanas"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Atkārtošanas intervāls"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Turot taustiņu nospiestu, tiks atkārtoti ievadīta tā rakstzīme, līdz taustiņš tiks atlaists."</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Izkārtojums: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Noklusējums"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automātiski: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Priekšskatījums"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standarta opcijas"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Valoda"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Teksta lielums"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Parakstu lielums"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitru stils"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Pielāgotas opcijas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fona krāsa"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Noregulēt strāvas patēriņu"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Iekļautās pakotnes"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Lietotnes darbojas normāli"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Ieteicams nomainīt akumulatoru"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Akumulatora ietilpība un uzlādes veiktspēja ir samazinājusies, un ir ieteicams nomainīt akumulatoru."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Zems akumulatora uzlādes līmenis"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Lai paildzinātu akumulatora darbību, ieslēdziet akumulatora enerģijas taupīšanas režīmu"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Akumulatora darbības paildzināšana"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vai pārtraukt šo VPN savienojumu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Pārtraukt savienojumu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Aizmirst VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vai aizstāt esošo VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vai iestatīt vienmēr ieslēgtu VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"“Darbdienās plkst. 9:00–17:00”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalendāra pasākumi"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Režīms {mode_1} ir aktīvs}=2{Režīmi {mode_1} un {mode_2} ir aktīvi}=3{Režīmi {mode_1}, {mode_2} un {mode_3} ir aktīvi}zero{Režīmi {mode_1}, {mode_2} un vēl # ir aktīvi}one{Režīmi {mode_1}, {mode_2} un vēl # ir aktīvi}other{Režīmi {mode_1}, {mode_2} un vēl # ir aktīvi}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 režīmu var ieslēgt automātiski}zero{# režīmus var ieslēgt automātiski}one{# režīmu var ieslēgt automātiski}other{# režīmus var ieslēgt automātiski}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Netraucēt}=1{{mode_1}}=2{{mode_1}, {mode_2}}zero{{mode_1}, {mode_2} un {mode_3}}one{{mode_1}, {mode_2} un {mode_3}}other{{mode_1}, {mode_2} un {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"IESLĒGTS"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nav iestatīts"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Atspējots"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Labi"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Paziņojumi"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Ilgums"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Ziņojumi, pasākumi un atgādinājumi"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kad ir ieslēgts režīms Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi par pasākumiem, izņemot vienumus, ko iepriekš būsiet atļāvis. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gatavs"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Iestatījumi"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Nav vizuālo vai skaņas signālu no paziņojumiem"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Nav skaņas signālu no paziņojumiem"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Jūs neredzēsiet vai nedzirdēsiet paziņojumus. Ir atļauti zvani no kontaktpersonām, kas atzīmētas ar zvaigznīti, un no atkārtotiem zvanītājiem."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(pašreizējais iestatījums)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Vai mainīt režīma “Netraucēt” paziņojumu iestatījumus?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Darba profila signāli"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Personiskā profila signāli"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Izmantot tos pašus skaņas signālus, kas tiek lietoti personīgajā profilā"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Pēc atbloķēšanas pāriesiet tieši uz pēdējo izmantoto ekrānu. Paziņojumi netiks rādīti bloķēšanas ekrānā. Lai tos skatītu, būs jāvelk lejup no augšas."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloķēšanas ekrāns, izlaist, apiet"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kad darba profils ir bloķēts"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Paziņojumu minimālisms bloķēšanas ekrānā"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Bloķēšanas ekrānā rādīt mazāk paziņojumu"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Bloķēšanas ekrānā rādīt tikai jaunus paziņojumus"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automātiski noņemt iepriekš skatītos paziņojumus no bloķēšanas ekrāna"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Paziņojumi bloķēšanas ekrānā"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Rādīt sarunas, noklusējuma un klusos paziņojumus"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Rādīt sarunas, noklusējuma un klusos paziņojumus"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Rādīt visu saturu darba profila paziņojumos"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Paslēpt sensitīvu darba profila saturu"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kā ierīcē rādīt profila paziņojumus, kad tā ir bloķēta?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profila paziņojumi"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Paziņojumi"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Lietotņu paziņojumi"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Ja īsā laika posmā saņemsiet daudz paziņojumu, ierīce samazinās skaļumu un brīdinājumu rādīšanu līdz pat divām minūtēm. Tas neattiecas uz zvaniem, signāliem un prioritārām sarunām. \n\nNogaidīšanas perioda laikā saņemtos paziņojumus var atrast, pavelkot lejup no ekrāna augšdaļas."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Lietot darba profiliem"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Lietot darba profila lietotnēm"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupēti paziņojumi"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Ieslēgta"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Izslēgta"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Paziņojumu grupēšanas izmantošana"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Paziņojumi ar līdzīgām tēmām tiks izslēgti un grupēti, lai samazinātu traucēkļus. Grupējot tiks ignorēti pašas lietotnes paziņojumu iestatījumi."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR palīga pakalpojumi"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nevienai instalētajai lietotnei nav pieprasīta palaišana kā VR palīga pakalpojumam."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vai atļaut VR pakalpojumam piekļūt pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritārās sarunas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Sarunu iestatījumi"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas var pārtraukt"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Pat ja ziņojumapmaiņas vai zvanu lietotnes nevar nosūtīt jums paziņojumus, jūsu šeit izvēlētās personas joprojām var sazināties ar jums, izmantojot šīs lietotnes."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zvani"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktpersonu iestatījumi"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Ar zvaigznīti atzīmētu kontaktpersonu iestatījumi"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Neviens"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Neviens"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Signāli"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Nevienai lietotnei nav atļauts pārtraukt}=1{Lietotnei {app_1} ir atļauts pārtraukt}=2{Lietotnēm {app_1} un {app_2} ir atļauts pārtraukt}=3{Lietotnēm {app_1}, {app_2} un {app_3} ir atļauts pārtraukt}zero{Lietotnēm {app_1} un {app_2}, kā arī vēl # lietotnēm ir atļauts pārtraukt}one{Lietotnēm {app_1} un {app_2}, kā arī vēl # lietotnei ir atļauts pārtraukt}other{Lietotnēm {app_1} un {app_2}, kā arī vēl # lietotnēm ir atļauts pārtraukt}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (darbam)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Notiek aprēķināšana…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Lietotņu iestatījumi"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Atļaut lietotnēm ignorēt režīmu “Netraucēt”"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Lietotnes, kas var pārtraukt"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Režīma izveide"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Pielāgots režīms"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Režīma nosaukums"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Jānorāda režīma nosaukums"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Izvēlieties ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendāra pasākumi"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Gulēšanas laiks"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Braukšanas laikā"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Pilnekrāna paziņojumi"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Atļaut pilnekrāna paziņojumus no šīs lietotnes"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Atļaujiet šai lietotnei rādīt paziņojumus pilnekrāna režīmā, kad ierīce ir bloķēta. Lietotnes var šādi izcelt signālus, ienākošos zvanus vai citus svarīgus paziņojumus."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Rakstīt sistēmas preferences"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Atļaujiet šai lietotnei pārveidot sistēmas preferences jūsu vārdā"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Izmantojot šo atļauju, lietotnes var pārveidot sistēmas pamata preferences."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Multivides satura pārvaldības lietotnes"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Atļaut lietotnei pārvaldīt multivides failus"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ja piešķirsiet atļauju, šī lietotne varēs bez iepriekšēja brīdinājuma pārveidot vai dzēst multivides failus, kas izveidoti citās lietotnēs. Lietotnei ir nepieciešama atļauja piekļūt failiem un multivides saturam."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Žesti"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Ātra kameras atvēršana"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Lai ātri atvērtu kameru, divreiz nospiediet barošanas pogu. Šī funkcija darbojas jebkurā ekrānā."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Apvērst kameru pašbildes uzņemšanai"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigācijas režīms"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Ziņojumapmaiņa, izmantojot satelītu"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Sūtiet un saņemiet īsziņas, izmantojot satelītu. Šī iespēja ir iekļauta jūsu kontā."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Sūtiet un saņemiet īsziņas, izmantojot satelītu. Šī iespēja nav pieejama ar jūsu kontu."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Ziņojumapmaiņa, izmantojot satelītu"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Par ziņojumapmaiņu, izmantojot satelītu"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satelīta ziņojumapmaiņa, satelīta savienojamība"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Par funkciju <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Varat sūtīt un saņemt īsziņas, izmantojot satelītu, ja jums ir prasībām atbilstošs <xliff:g id="CARRIER_NAME">%1$s</xliff:g> konts"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Jūsu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> plāns"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Ziņojumapmaiņa, izmantojot satelītu, ir iekļauta jūsu kontā"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Ziņojumapmaiņa ir ietverta jūsu konta plānā"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Ziņojumapmaiņa, izmantojot satelītu, nav iekļauta jūsu kontā"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Uzzināt vairāk"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Darbības principi"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Tālrunī tiks automātiski izveidots savienojums ar satelītu. Vislabākais savienojums ir zem klajas debess."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kad tālrunī ir izveidots savienojums ar satelītu"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Varat sūtīt īsziņu ikvienam, tostarp ārkārtas palīdzības dienestiem. Tālrunī tiks atkārtoti izveidots savienojums ar mobilo tīklu, tiklīdz tas būs pieejams."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Ziņojumapmaiņai, izmantojot satelītu, var būt nepieciešams ilgāks laiks, un tā ir pieejama tikai noteiktos apgabalos. Laikapstākļi un noteiktas būves var ietekmēt savienojumu ar satelītu. Zvanīšana, izmantojot satelītu, nav pieejama. Var būt iespējami ārkārtas izsaukumi.\n\nVar būt nepieciešams laiks, lai kontā veiktās izmaiņas būtu redzamas iestatījumos. Lai iegūtu detalizētu informāciju, sazinieties ar savu mobilo sakaru operatoru."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Vairāk par ziņojumapmaiņu, izmantojot satelītu"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> var aizņemt vairāk laika, un tā ir pieejama tikai noteiktos apgabalos. Laikapstākļi un noteiktas būves var ietekmēt savienojumu ar satelītu. Zvanīšana, izmantojot satelītu, nav pieejama. Var būt iespējami ārkārtas izsaukumi.\n\nVar būt nepieciešams laiks, lai kontā veiktās izmaiņas būtu redzamas iestatījumos. Sazinieties ar operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g> un uzziniet vairāk."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Plašāka informācija par funkciju <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nevar ieslēgt <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Lai ieslēgtu <xliff:g id="FUNCTION">%1$s</xliff:g>, vispirms pārtrauciet savienojumu ar satelītu."</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satelīta savienojamība"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satelīta savienojamība"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satelīta savienojamība"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satelīta ziņojumapmaiņa"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Datu pārsūtīšana ir ietverta jūsu konta plānā"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satelīta SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Sūtiet īsziņas ārkārtas palīdzības dienestiem, kad nevar izveidot savienojumu ar mobilo vai Wi‑Fi tīklu"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satelīta SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Par funkciju Satelīta SOS"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Varat nosūtīt īsziņu ārkārtas palīdzības dienestiem un kopīgot atrašanās vietu, kad nav savienojuma ar mobilo vai Wi-Fi tīklu. Šis pakalpojums var nebūt pieejams vienmēr, visās vietās vai apstākļos."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Zvaniet vai sūtiet īsziņu ārkārtas palīdzības dienestiem"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Atbildēšana uz jautājumiem par ārkārtas situāciju"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Izpildiet norādītās darbības, lai izveidotu savienojumu ar satelītu"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ja nav piekļuves mobilajam tīklam, tiks rādīta iespēja izmantot funkciju Satelīta SOS"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Sūtiet atbildes ārkārtas palīdzības dienestiem, lai jums varētu sniegt nepieciešamo palīdzību"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Tiklīdz būs izveidots savienojums, varēsiet nosūtīt īsziņu ārkārtas palīdzības dienestiem"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Izmēģināt demonstrācijas versiju"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Ja saziņai ar ārkārtas palīdzības dienestiem izmantosiet satelīta savienojumu, ar ārkārtas palīdzības dienestiem un satelīta pakalpojumu sniedzējiem tiks kopīgots jūsu vārds, e-pasta adrese, tālruņa numurs, atrašanās vieta, informācija par ierīci (IMEI, valoda, modelis, akumulatora uzlādes līmenis) un ārkārtas kontaktpersonu informācija. \n\nLai varētu izmantot funkciju Satelīta SOS, lietotnei Google ziņojumi jābūt jūsu noklusējuma īsziņu lietotnei.\n\nJa automātiskā tīkla atlase ir izslēgta, tā tiks ieslēgta un jūsu ierīce automātiski izveidos savienojumu ar jebkuru tīklu."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Kopīgošanas preferences"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Ārkārtas kontaktpersonas"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Jūsu Google konts"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Pārskatiet vai atjauniniet informāciju, kas tiks kopīgota ar ārkārtas palīdzības dienestiem"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Piekļuves punktu nosaukumi"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nav pieejams, ja izveidots savienojums ar operatoru <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Pašlaik izmantojat 16 KB režīmu, kas nav atkarīgs no lappušatmiņas lieluma. Šajā režīmā nevar garantēt programmatūras integritāti, un tālrunī glabātie dati var būt apdraudēti, kamēr operētājsistēmu ielādes rīks ir atbloķēts. Šajos režīmos dažas funkcijas tiks atspējotas, tāpēc dažas lietojumprogrammas var nedarboties. Lai atjaunotu produkcijas režīmu, jums būs atkal jāpāriet uz 4 KB režīmu un pēc tam jābloķē ierīces operētājsistēmu ielādes rīks. Tādējādi ierīcē tiks atkal atiestatīti rūpnīcas dati un atjaunoti produkcijas iestatījumi. Kad ierīcē būs sekmīgi palaista operētājsistēma Android, izstrādātāju opcijās atspējojiet OAR atbloķēšanu. Ja ierīcē neizdodas palaist operētājsistēmu Android vai tā nav stabila, atkārtoti instalējiet lasāmatmiņu ierīces iekšējā atmiņā, izmantojot jaunākos rūpnīcas attēlus no vietnes &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; vai apmeklējiet vietni &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; un atlasiet “Wipe Device” (Notīrīt ierīci), “Lock Bootloader” (Bloķēt operētājsistēmu ielādes rīku) un “Force Flash all partitions” (Piespiedu kārtā instalēt lasāmatmiņu visos ierīces iekšējās atmiņas nodalījumos)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB režīms, kas nav atkarīgs no lappušatmiņas lieluma"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Uzzināt vairāk"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Palaist lietotni ar lapas lieluma saderības režīmu"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Kļūdu pārskatu apstrādātājs"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Šeit varat noteikt, kurai lietotnei jūsu ierīcē jāapstrādā kļūdu pārskatu saīsne."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personiskais profils"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Klausīties straumi"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skenējiet audio straumes kvadrātkodu, lai to klausītos ierīcē <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Kopīgošanas laikā paroli nevar rediģēt. Lai mainītu paroli, vispirms izslēdziet audio kopīgošanu."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Parolei ir jābūt 4–16 rakstzīmes garai, un tajā drīkst izmantot tikai burtus, ciparus un simbolus."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Kvadrātkoda skeneris"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Vai nepieciešama palīdzība?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Meklēšanas iestatījumi"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktpersonas, krātuve, konts"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktpersonu krātuve"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tikai ierīcē"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Jaunas kontaktpersonas netiks sinhronizētas ar kontu."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Pēc noklusējuma kontaktpersonas tiks saglabātas jūsu ierīcē un sinhronizētas ar jūsu kontu."</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Iestatot noklusējuma kontu, radās kļūda."</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nav iestatīts noklusējuma konts"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tikai ierīcē"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Ierīce un %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lai sāktu darbu, pievienojiet kontu."</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kur saglabāt kontaktpersonas"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Apvilkt un meklēt"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Pieskarieties un turiet pogu “Sākums” vai navigācijas turi, lai meklētu, izmantojot ekrāna saturu."</string>
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 916f2a329fb..e4b8599e02b 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Снегулка"</item>
     <item msgid="7952183800501346803">"Чадор за плажа"</item>
     <item msgid="799139025758265891">"Алати во работилница"</item>
-    <item msgid="1330084588359129896">"Шатор"</item>
+    <item msgid="8112685757657659269">"Пијано"</item>
     <item msgid="3861584909935022342">"Филмска лента"</item>
     <item msgid="5827426100157335512">"Книга"</item>
     <item msgid="8585828346253128384">"Цвет на лотос"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2e8a318282f..27548c84a72 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Спарете нов уред"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматски вклучи го утре"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ако го исклучите Bluetooth, ќе се вклучи пак следниот ден"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Спари го десното уво"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Спари го левото уво"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Спари го другото уво"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Оневозможи Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Ја оневозможува функцијата Bluetooth LE Audio ако уредот поддржува хардверски способности за LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Режим за Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Овозможи преглед на UI за емитување Bluetooth LE Audio."</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Овозможува преглед на UI за LE Audio Sharing што опфаќа и лично споделување аудио и приватно емитување"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Прекинувач за LE Audio во „Детали за уредот“"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Игнорирај го списокот со дозволени за Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Користи LE Audio стандардно дури и ако не е потврдено дека периферното LE Audio ги исполнува критериумите на списокот со дозволени."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Јазик на апликациjата"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Предложени јазици"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Сите јазици"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Предложени"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Сите јазици"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Сите региони"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Сите системи за нумерирање"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Системски јазик"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Стандарден за системот"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Не може да се бира јазик за апликацијава од „Поставките“."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Промени"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s не е достапен"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Овој јазик не може да се користи како системски јазик, но им дадовте до знаење на апликациите и веб-сајтовите дека го претпочитате овој јазик."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Пребарај"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Додајте јазик"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Претпочитувања за регион"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Внесете име на јазик"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Повеќе поставки за јазик"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Регионални поставки"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Одредете поставки за мерни единици и броеви"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Дозволете им на апликациите да пристапуваат до вашите регионални поставки за да ви овозможат персонализирано доживување."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Апликациите ќе ги користат регионалните поставки онаму каде што е можно."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Регионални поставки"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Прв ден од седмицата"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Поставки за бројки"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Поврзи се со интернет услуги во роаминг"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Поврзи се со интернет услуги во роаминг"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Може да ви се наплати за роаминг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Постави време автоматски"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Постави автоматски"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Локацијата ќе се користи за поставување на часовната зона кога прекинувачов е вклучен"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Автоматски датум и време"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Поставете автоматски со вашата мрежа и безжични сигнали"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Автоматска часовна зона"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Поставете автоматски според мобилните мрежи во ваша близина"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Постави автоматски со локацијата на уредот, ако е достапна"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи локален стандард"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовен формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Време"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Подигнете го прстот, потоа допрете го сензорот повторно"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Не може да се користи сензорот за отпечатоци"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Однесете го уредот на поправка."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"„Отклучување со отпечаток“ при исклучен екран"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Користете „Отклучување со отпечаток“ дури и кога е исклучен екранот"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Исклучен екран, отклучете"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Повеќе поставки за безбедност"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Заклучување работен профил, шифрирање и друго"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрирање, акредитиви и друго"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Поставете шема за „Приватен простор“"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Заклучи"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Скриј"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Потврдете ја шемата за „Приватен простор“"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Внесете го PIN-кодот за „Приватен простор“ пак"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Внесете ја лозинката за „Приватен простор“ пак"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Може да додадете до <xliff:g id="COUNT">%d</xliff:g> отпечатоци"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Додадовте максимален број на отпечатоци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не може да се додадат повеќе отпечатоци"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Вклучено"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Исклучено"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Надворешен екран"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Користи надворешен екран"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Резолуција на екранот"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Надворешниот екран е исклучен"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Промената на ротацијата или резолуцијата може да ги сопре сите апликации што се извршуваат во моментов"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Вашиот уред мора да биде поврзан со надворешен екран за да го отсликува вашиот екран"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Повеќе опции"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Задржете и повлечете за преуредување на екраните."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Емитување"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"огледало"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Овозможи приказ на безжични мрежи"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Проверете ја лозинката и обидете се повторно"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Контактирајте со производителот на уредот"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Проверете ја врската и обидете се повторно"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Wi‑Fi мрежава не е достапна во моментов"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Се јави проблем со QR-кодов. Обидете се да се поврзете на друг начин."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Изберете мрежа"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"За да го поврзете уредот, изберете мрежа"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Да се додаде уредов на „<xliff:g id="SSID">%1$s</xliff:g>“?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Дознајте повеќе за „Автоматско ротирање“"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Резолуција на екранот"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Висока резолуција"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Полна резолуција"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Полната резолуција троши повеќе батерија. Ако ја смените резолуцијата, некои апликации можеби ќе се рестартираат."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Избрано"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Бои"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природни"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Адаптивни"</string>
     <string name="brightness" msgid="6216871641021779698">"Ниво на осветленост"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Адаптивна осветленост"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"За „Адаптивна осветленост“"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Осветленоста на екранот ќе се приспособува автоматски на вашата околина и активности. Може да го поместите лизгачот рачно за да ѝ помогнете на адаптивната осветленост да научи што ви одговара."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Вклучено"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Исклучена"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Поставки за „Режимот за спиење“"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режимите може да активираат и „Темна тема“}=1{{mode_1} активира и „Темна тема“}=2{{mode_1} и {mode_2} активираат и „Темна тема“}=3{{mode_1}, {mode_2} и {mode_3} активираат и „Темна тема“}one{{mode_1}, {mode_2} и уште # активираат и „Темна тема“}other{{mode_1}, {mode_2} и уште # активираат и „Темна тема“}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Поставки за режими"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Уште потемно"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Дополнително затемнување"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Дозволете уредот да стане потемен од вообичаено"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Исклучување на екранот"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволете апликациите и услугите да скенираат за уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и локациските услуги."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Локациски услуги"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Локациски услуги"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Користи ја локацијата"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Користи локација за часовната зона"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Часовната зона не може да се постави автоматски"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"„Локацијата“ или „Локациските услуги“ се исклучени"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Поставки за локација"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Поправи"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Откажи"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматската временска зона е исклучена"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Не е достапно кога е исклучена автоматската временска зона"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Може да се користи локацијата за да се постави часовната зона"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ако е достапна локацијата на вашиот уред, може да се користи за поставување на часовната зона"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Прикажи правни информации, статус, верзија на софтвер"</string>
     <string name="legal_information" msgid="7509900979811934843">"Правни информации"</string>
     <string name="manual" msgid="3651593989906084868">"Упатство"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Опции"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Пристапност"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физичка тастатура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Игнорирај повторени притискања"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Тастатурата игнорира брзи притискања на истото копче што се повторуваат во <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Тастатурата игнорира брзи притискања на истото копче што се повторуваат"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Праг на игнор. на повт. притискање"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Изберете го времетраењето кога вашата тастатура ги игнорира повторените притискања на копчињата"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 с."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 с."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 с."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Приспособено"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"приспособена вредност"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Бавни копчиња"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Времето за активирање по притискање копче го приспособува на <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Го приспособува времето за да се активира притискање копче"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Лепливи копчиња"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Притискајте ги копчињата за кратенки едно по едно наместо да ги држите копчињата притиснати заедно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Копчиња за глувче"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Користете ја физичката тастатура за да го контролирате глувчето."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Користете ги копчињата за глувче"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Користете ја тастатурата за да го контролирате покажувачот"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обратно лизгање на глувчето"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Лизгајте нагоре за да ја преместите страницата надолу"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Заменете ги местата на левото и десното копче"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Користете го левото копче на глувчето како десно"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Копчиња за глувче за <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Користете ги копчињата <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> за да го движите покажувачот на глувчето"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Користете го копчето <xliff:g id="CLICK_LABEL">%s</xliff:g> за да кликнете на примарното копче на глувчето"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Користете го копчето <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> за да го притиснете и задржите примарното копче на глувчето"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Користете го копчето <xliff:g id="RELEASE_LABEL">%s</xliff:g> за да го отпуштите примарното копче на глувчето"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Користете го копчето <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> за вклучување/исклучување на „Режим на лизгање“. Ова ќе направи копчињата <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> да го лизгаат приказот нагоре, надолу, налево или надесно"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Користете го копчето <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> за да кликнете на секундарното копче на глувчето"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Кратенки на тастатурата"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Прикажи список со кратенки"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Тастатури и алатки за работниот профил"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Стандарден"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Подлога за допир"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Подлога за допир и глувче"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Глувче"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Брзина на покажувачот, движења"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Кликнување со допир"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Влечење со допир"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Кликнете го долниот десен агол"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Кликнете го долниот десен агол од допирната подлога за опции"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Брзина на покажувачот"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Користете допир со три прста"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Боја на покажувачот"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Промена на стил. на покаж. во црн"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Промена на стил. на покаж. во зелен"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Научете движења за подлога за допир"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"подлога на допир, допирна подлога, глувче, курсор, лизгање, повлекување, кликнување со десното копче, клик, покажувач"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"кликнување со десното копче, допир"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Средно кликнување"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Стартувај го „Помошникот“"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Оди на почетната страница"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Прикажи ги неодамнешните апликации"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Оди на почетен екран"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Повлечете нагоре со 3 прсти каде било на подлогата за допир"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Врати се назад"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете ново копче за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Пристапност до физичка тастатура"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"лепливи копчиња, копчиња за игнорирање повторени притискања, копчиња за глувче"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Повторување на копчињата"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Доцнење пред повторување"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Стапка на повторување"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Притиснете и задржете некое копче за да го повторувате неговиот знак додека не го пуштите копчето"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Распоред на <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандардно"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматски: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Преглед"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандардни опции"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Јазик"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Големина на текстот"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Големина на титлови"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил на титловите"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Приспособени опции"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Боја на заднина"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Приспособи употреба на струја"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Вклучени пакети"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Апликациите работат нормално"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Се препорачува замена на батеријата"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Капацитетот на батеријата и изведбата на полнењето се намалени, па се препорачува замена на батеријата."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Нивото на батеријата е слабо"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Вклучете „Штедач на батерија“ за да го продолжи траењето на батеријата"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Подобрете го траењето на батеријата"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Да се исклучи оваа VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекини врска"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Верзија <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Да се замени постојната VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Да се постави „секогаш вклучена“ VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„работни денови, 9:00 – 17:00“"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Настани во календарот"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Активен е {mode_1}}=2{Активни се {mode_1} и {mode_2}}=3{Активни се {mode_1}, {mode_2} и {mode_3}}one{Активни се {mode_1}, {mode_2} и уште #}other{Активни се {mode_1}, {mode_2} и уште #}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режим може да се вклучи автоматски}one{# режим може да се вклучат автоматски}other{# режими може да се вклучат автоматски}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не вознемирувај}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ВКЛУЧЕНО"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Не е поставено"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Оневозможено"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Сфатив"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Известувања"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Времетраење"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Пораки, настани и потсетници"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Кога е вклучен режимот „Не вознемирувај“, звукот на пораките, потсетниците и настаните е исклучен, освен за ставките што сте ги дозволите погоре. Може да ги приспособите поставките за пораки за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Готово"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Поставки"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Без визуелни вознемирувања или звук од известувањата"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Без звук од известувањата"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Нема да гледате ниту да слушате известувања. Повиците од контактите означени со ѕвезда и повторните повикувачи се дозволени."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Тековна поставка)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Да се променат поставките за известувања на режимот „Не вознемирувај“?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Звуци на работниот профил"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Користи звуци од личен профил"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Користи ги истите звуци како на личниот профил"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"По отклучување, оди директно на последниот користен екран. Известувањата нема да се прикажуваат на заклучен екран. Повлечете надолу од врвот за да ги видите."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заклучен екран, прескокни, заобиколи"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"При заклучен работен профил"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Минимализам за известувања на заклучен екран"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Прикажувај помалку известувања на заклучен екран"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Прикажувај само нови известувања на заклучен екран"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Автоматски отстранувај ги претходно прегледаните известувања од заклучениот екран"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Известувања на заклучен екран"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Прикажувај разговори, стандардни и безгласни"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Прикажувај разговори, стандардни и безгласни"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Прикажувај ги сите известувања од работниот профил"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Скриј чувствителни работни содржини"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Кога уредот е заклучен, како сакате да се прикажуваат известувањата на профилот?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Кога ќе добиете многу известувања во краток временски период, уредот ќе го намали звукот и ќе ги минимизира известувањата до 2 минути. Ова не влијае на повиците, алармите и приоритетните разговори. \n\nИзвестувањата добиени додека била вклучена „Подискретни известувања“ може да се најдат со повлекување надолу од горниот дел на екранот."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Примени на работни профили"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Применете на апликациите во работниот профил"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Групирани известувања"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Вклучено"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Исклучено"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Користете групирање на известувањата"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Звукот на известувањата со слични теми ќе се исклучи, а известувањата ќе се групираат за потивко доживување. Групирањето ќе ги отфрли поставките за известувања на апликацијата."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Помошни услуги за VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниедна инсталирана апликација не побара извршување како помошна услуга за VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Да се дозволи пристап до VR-услугата за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"приоритетни разговори"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ниеден"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниеден}=1{1 разговор}one{# разговор}other{# разговори}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Поставки за разговори"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кој може да го прекинува режимот"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Дури и ако апликациите за повици или размена на пораки не можат да ве известуваат, луѓето што овде ќе ги изберете сепак ќе можат да ве добијат преку тие апликации"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Повици"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Сите"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти означени со ѕвезда"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Поставки за контакти"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Поставки за контакти означени со ѕвезда"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ниеден"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ниедна"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Аларми"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (работа)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Се пресметува…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Поставки за апликации"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+ <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволете апликациите да занемаруваат"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Апликации што може да го прекинуваат режимот"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Создајте режим"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Приспособен режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Име на режимот"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Името на режимот не може да биде празно"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Изберете икона"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Настани во календарот"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Рутина за времето за спиење"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"При возење"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Известувања на цел екран"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Дозволи известувања на цел екран од апликацијава"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Дозволете апликацијава да прикажува известувања што го заземаат целиот екран кога уредот е заклучен. Апликациите може да ги користат овие известувања за да ги истакнуваат алармите, дојдовните повици или други итни известувања."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Пишување на системските поставки"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Дозволете апликацијава да ги изменува системските поставки во ваше име"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Оваа дозвола ѝ овозможува на апликацијата да ги изменува основните системски поставки."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Апликации за управување со содржини"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Дозволи апликацијата да управува со аудиовизуелни содржини"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ако е дозволено, апликацијава ќе може да ги менува или брише датотеките со аудиовизуелни содржини создадени со други апликации без да ве праша. Апликацијата мора да има дозвола за да пристапува до датотеките и аудиовизуелните содржини."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Движења"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Брзо отворање на камерата"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"За брзо отворање на камерата, притиснете го копчето за вклучување двапати. Работи од секој екран."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Превртете ја камерата за селфи"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Режим за навигација"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Размена на пораки преку сателит"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Испраќајте и примајте текстуални пораки преку сателит. Опфатено е во вашата сметка."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Испраќајте и примајте текстуални пораки преку сателит. Ова не доаѓа со вашата сметка."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Размена на пораки преку сателит"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"За размена на пораки преку сателит"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Може да испраќате и примате текстуални пораки преку сателит како дел од подобна сметка на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Вашиот пакет од <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Размената на пораки преку сателит е опфатена со вашата сметка"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Размената на пораки преку сателит не е опфатена со вашата сметка"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Дознајте повеќе"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Дознајте како функционира"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Вашиот телефон ќе се поврзе на сателит автоматски. За најдобра врска, погрижете се да имате јасен поглед кон небото."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Откако телефонот ќе ви се поврзе на сателит"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Може да испраќате пораки до сите, меѓу кои и службите за итни случаи. Вашиот телефон повторно ќе се поврзе на мобилна мрежа кога ќе биде достапна."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Размената на пораки преку сателит може да трае подолго и е достапна само во некои области. Временските услови и одредени структури може да влијаат на вашата сателитска врска. Повикувањето преку сателит не е достапно. Итните повици можеби и понатаму ќе се поврзуваат.\n\nМоже да биде потребно некое време за да се прикажат промените на сметката во „Поставки“. Контактирајте со операторот за детали."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Дознајте повеќе за размената на пораки преку сателит"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Не може да се вклучи <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"За да вклучите <xliff:g id="FUNCTION">%1$s</xliff:g>, прво прекинете ја сателитската врска"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Сателитска врска"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Имиња на пристапни точки"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недостапно кога сте поврзани на <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Вие сте во режимот од 16 KB на режимот за компатибилност на мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да се вратите во режим од 4 KB, па да го заклучите вчитувачот на систем на уредот. Ова ќе го ресетира уредот на фабрички поставки повторно и ќе го врати на поставките за работен режим. Откако уредот успешно ќе се подигне во Android, оневозможете го отклучувањето OEM во „Програмерски опции“. Ако уредот не може да се подигне во Android или е нестабилен, преинсталирајте ги најновите фабрички слики на уредот од &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; или користете &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; и изберете „Трајно избриши ги податоците на уредот“, „Заклучи го вчитувачот на системот“ и „Force Flash all partitions“ (Наметни инсталирање на сите партиции)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим за компатибилност со мемориски страници од 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Прочитајте повеќе"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Извршувајте ја апликацијата со „Режим на компатибилност“ со големина на страницата"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Ракувач со извештајот за грешки"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Одредува која апликација ќе ракува со кратенката за извештајот за грешки на уредот."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Лични"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Слушнете го стримот"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Скенирајте го QR-кодот на аудиостримот за да слушате со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Лозинката не може да се измени додека се споделува. За промена на лозинката, прво исклучете го споделувањето аудио."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Вашата лозинка мора да содржи 4 – 16 знаци и да опфаќа само букви, бројки и симболи"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Скенер на QR-кодови"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Ви треба помош?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Пребарувајте низ поставките"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, складирање, сметка"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Складирање контакти"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Само уред"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новите контакти нема да се синхронизираат со сметка"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контактите ќе се зачувуваат на вашиот уред и стандардно ќе се синхронизираат со вашата сметка"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при поставувањето на стандардната сметка"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Нема поставено стандардна сметка"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само уред"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Уред и %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте сметка за да започнете"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Каде да се зачувуваат контактите"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Пребарување со заокружување"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Допрете и задржете го копчето за почетен екран или лентата за навигација за да пребарувате со содржините на екранот."</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index bd207895439..8d30538bef9 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"മഞ്ഞുകട്ട"</item>
     <item msgid="7952183800501346803">"ബീച്ച് കുട"</item>
     <item msgid="799139025758265891">"വർക്ക്‌ഷോപ്പ് ടൂളുകൾ"</item>
-    <item msgid="1330084588359129896">"ടെന്റ്"</item>
+    <item msgid="8112685757657659269">"പിയാനോ"</item>
     <item msgid="3861584909935022342">"ഫിലിം റീൽ"</item>
     <item msgid="5827426100157335512">"പുസ്‌തകം"</item>
     <item msgid="8585828346253128384">"താമരപ്പൂവ്"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0db741ec94e..b503d2ab2d6 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"പുതിയ ഉപകരണം ജോടിയാക്കുക"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"നാളെ സ്വയമേവ ഓണാക്കുക"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth ഓഫാക്കുകയാണെങ്കിൽ, അടുത്ത ദിവസം വീണ്ടും ഓണാകും"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"വലതു ചെവി ജോടിയാക്കൂ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ഇടത് ചെവി ജോടിയാക്കൂ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"അടുത്ത ചെവി ജോടിയാക്കുക"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE ഓഡിയോ പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ഉപകരണം LE ഓഡിയോ ഹാർഡ്‌വെയർ ശേഷികളെ പിന്തുണയ്‌ക്കുന്നുണ്ടെങ്കിൽ Bluetooth LE ഓഡിയോ ഫീച്ചർ പ്രവർത്തനരഹിതമാക്കുന്നു."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE ഓഡിയോ മോഡ്"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE ഓഡിയോ ബ്രോഡ്‌കാസ്റ്റ് UI പ്രിവ്യൂ പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"വ്യക്തിഗത ഓഡിയോ പങ്കിടലും സ്വകാര്യ ബ്രോഡ്‌കാസ്റ്റും ഉൾപ്പെടെ LE ഓഡിയോ പങ്കിടൽ UI പ്രിവ്യൂ പ്രവർത്തനക്ഷമമാക്കുന്നു"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ഉപകരണ വിശദാംശങ്ങളിൽ LE ഓഡിയോ ടോഗിൾ കാണിക്കൂ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE ഓഡിയോ വൈറ്റ്ലിസ്റ്റ് ബൈപാസ് ചെയ്യുക"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE ഓഡിയോ പെരിഫറൽ, വൈറ്റ്ലിസ്റ്റ് മാനദണ്ഡം പാലിക്കുന്നുണ്ടോയെന്ന് പരിശോധിച്ചുറപ്പിച്ചിട്ടില്ലെങ്കിലും ഡിഫോൾട്ടായി LE ഓഡിയോ ഉപയോഗിക്കുക."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ആപ്പ് ഭാഷ"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"നിർദ്ദേശിച്ച ഭാഷകൾ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"എല്ലാ ഭാഷകളും"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"നിർദ്ദേശിക്കുന്നത്"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"എല്ലാ ഭാഷകളും"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"എല്ലാ പ്രദേശങ്ങളും"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"എല്ലാ നമ്പറിംഗ് സിസ്‌റ്റങ്ങളും"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"സിസ്റ്റത്തിന്റെ ഭാഷ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"സിസ്‌റ്റം ഡിഫോൾട്ട്"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ക്രമീകരണത്തിൽ നിന്ന് ഈ ആപ്പിനുള്ള ഭാഷ തിരഞ്ഞെടുക്കാനുള്ള ഓപ്‌ഷൻ ലഭ്യമല്ല."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"മാറ്റുക"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ലഭ്യമല്ല"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ഈ ഭാഷ സിസ്‌റ്റം ഭാഷയായി ഉപയോഗിക്കാനാകില്ല, എന്നാൽ നിങ്ങൾ ഈ ഭാഷയ്ക്കാണ് മുൻഗണന നൽകുന്നതെന്ന് ആപ്പുകളേയും വെബ്‌സൈറ്റുകളേയും അറിയിച്ചു."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"തിരയുക"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ഒരു ഭാഷ ചേർക്കുക"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"മേഖലാ മുൻഗണന"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ഭാഷ ടൈപ്പ് ചെയ്യുക"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"കൂടുതൽ ഭാഷാ ക്രമീകരണം"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"പ്രാദേശിക മുൻഗണനകൾ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"യൂണിറ്റ്, നമ്പർ മുൻഗണനകൾ സജ്ജീകരിക്കുക"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"നിങ്ങളുടെ പ്രാദേശിക മുൻഗണനകൾ ആപ്പുകളെ അറിയിക്കുന്നതിലൂടെ അവയ്ക്ക് നിങ്ങളുടെ അനുഭവം വ്യക്തിപരമാക്കാനാകും."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"സാധ്യമാകുന്നിടത്ത് ആപ്പുകൾ നിങ്ങളുടെ പ്രാദേശിക മുൻഗണനകൾ ഉപയോഗിക്കും."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"പ്രാദേശിക മുൻഗണനകൾ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"താപനില"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ആഴ്‌ചയിലെ ആദ്യ ദിവസം"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"സംഖ്യാ മുൻഗണനകൾ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"റോമിംഗിലാകുമ്പോൾ ഡാറ്റ സേവനങ്ങളുമായി കണ‌ക്റ്റുചെയ്യുക"</string>
     <string name="roaming_disable" msgid="729512894708689604">"റോമിംഗിൽ ഡാറ്റാ സേവനങ്ങളിലേക്ക് കണ‌ക്റ്റ് ചെയ്യുക"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"റോമിംഗ് നിരക്കുകൾ ബാധകമായേക്കാം."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"സമയം സ്വയമേവ സജ്ജീകരിക്കുക"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"സ്വയമേവ സജ്ജീകരിക്കുക"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ഈ ടോഗിൾ ഓണായിരിക്കുമ്പോൾ സമയമേഖല സജ്ജീകരിക്കാൻ ലൊക്കേഷൻ ഉപയോഗിക്കും"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"സ്വയമേവ ഉള്ള തീയതിയും സമയവും"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"നിങ്ങളുടെ നെറ്റ്‌വർക്കും വയർലെസ് സിഗ്‌നലുകളും ഉപയോഗിച്ച് സ്വയമേവ സജ്ജീകരിക്കുക"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"സ്വയമേവ ഉള്ള സമയമേഖല"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"നിങ്ങളുടെ സമീപമുള്ള മൊബൈൽ നെറ്റ്‌വർക്കുകളുടെ അടിസ്ഥാനത്തിൽ സ്വയമേവ സജ്ജീകരിക്കുക"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ലഭ്യമാണെങ്കിൽ, നിങ്ങളുടെ ഉപകരണ ലൊക്കേഷൻ ഉപയോഗിച്ച് സ്വയമേവ സജ്ജീകരിക്കുക"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ഡിഫോൾട്ട് ഭാഷ ഉപയോഗിക്കുക"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-മണിക്കൂർ ഫോർമാറ്റ് ഉപയോഗിക്കുക"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"സമയം"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"വിരൽ ഉയർത്തുക, തുടർന്ന് സെൻസർ വീണ്ടും തൊടുക"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ഫിംഗർപ്രിന്റ് സെൻസർ ഉപയോഗിക്കാനാകുന്നില്ല"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"റിപ്പയർ കേന്ദ്രം സന്ദർശിക്കുക."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"സ്ക്രീൻ ഓഫ് ഫിംഗർപ്രിന്റ് അൺലോക്ക്"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"സ്‌ക്രീൻ ഓഫായിരിക്കുമ്പോൾ പോലും ഫിംഗർപ്രിന്റ് അൺലോക്ക് ഉപയോഗിക്കുക"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"സ്ക്രീൻ ഓഫാക്കൽ, അൺലോക്ക്"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"കൂടുതൽ സുരക്ഷാ ക്രമീകരണം"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ഔദ്യോഗിക പ്രൊഫൈൽ ലോക്ക്, എൻക്രിപ്‌ഷൻ എന്നിവയും മറ്റും"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"എൻക്രിപ്ഷൻ, ക്രെഡൻഷ്യലുകൾ എന്നിവയും മറ്റും"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"സ്വകാര്യ സ്പേസിന് പാറ്റേൺ സജ്ജീകരിക്കൂ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ലോക്ക് ചെയ്യുക"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"മറയ്ക്കുക"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"നിങ്ങളുടെ സ്വകാര്യ സ്പേസ് പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"നിങ്ങളുടെ സ്വകാര്യ സ്പേസ് പിൻ വീണ്ടും നൽകുക"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"നിങ്ങളുടെ സ്വകാര്യ സ്പേസ് പാസ്‌വേഡ് വീണ്ടും നൽകുക"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"നിങ്ങൾക്ക് <xliff:g id="COUNT">%d</xliff:g> ഫിംഗർപ്രിന്റുകൾ വരെ ചേർക്കാം"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"നിങ്ങൾ പരമാവധി എണ്ണം ഫിംഗർപ്രിന്റുകൾ ചേർത്തിട്ടുണ്ട്"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"കൂടുതൽ ഫിംഗർപ്രിന്റുകൾ ചേർക്കാൻ കഴിയില്ല"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ഓണാണ്"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ഓഫാണ്"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ബാഹ്യ ഡിസ്പ്ലേ"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"ബിൽറ്റ് ഇൻ ഡിസ്‌പ്ലേ"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ബാഹ്യ ഡിസ്പ്ലേ ഉപയോഗിക്കുക"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ഡിസ്‌പ്ലേ റെസല്യൂഷൻ"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ബാഹ്യ ഡിസ്പ്ലേ വിച്ഛേദിച്ചിരിക്കുന്നു"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"റൊട്ടേഷൻ അല്ലെങ്കിൽ റെസല്യൂഷൻ മാറ്റുന്നത് നിലവിൽ റൺ ചെയ്യുന്ന ഏത് ആപ്പിന്റെയും പ്രവർത്തനം അവസാനിപ്പിക്കും"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"സ്‌ക്രീൻ മിറർ ചെയ്യാൻ നിങ്ങളുടെ ഉപകരണം ഒരു ബാഹ്യ ഡിസ്‌പ്ലേയിലേക്ക് കണക്റ്റ് ചെയ്യേണ്ടതുണ്ട്"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ഡിസ്പ്ലേകൾ പുനഃക്രമീകരിക്കാൻ വലിച്ചിടുക."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"കാസ്‌റ്റ് ചെയ്യുക"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"മിറർ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"വയർലസ്‌ഡിസ്പ്ലേ സജീവമാക്കൂ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"പാസ്‌വേഡ് പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ഉപകരണ നിർമ്മാതാവുമായി ബന്ധപ്പെടുക"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"കണക്ഷൻ പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ഈ വൈഫൈ നെറ്റ്‌വർക്ക് ഇപ്പോൾ ലഭ്യമല്ല"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ഈ QR കോഡുമായി ബന്ധപ്പെട്ട് ഒരു പ്രശ്നമുണ്ട്. മറ്റൊരു രീതിയിൽ കണക്റ്റ് ചെയ്യാൻ ശ്രമിക്കുക."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"നെറ്റ്‌വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ഉപകരണം കണക്റ്റ് ചെയ്യാൻ, ഒരു നെറ്റ്‌വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"ഈ ഉപകരണം “<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് ചേർക്കണോ?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"സ്വയമേവ തിരിയുക ക്രമീകരണത്തെ കുറിച്ച് കൂടുതലറിയുക"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"സ്ക്രീൻ റെസല്യൂഷൻ"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"കൂടിയ റെസല്യൂഷൻ"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"പൂർണ്ണ റെസല്യൂഷൻ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"പൂർണ്ണ റെസല്യൂഷൻ കൂടുതൽ ബാറ്ററി ചാർജ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ റെസല്യൂഷൻ മാറ്റുന്നത് ചില ആപ്പുകൾ റീസ്റ്റാർട്ട് ചെയ്യാൻ കാരണമായേക്കാം."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"പരമാവധി റെസല്യൂഷൻ"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"പരമാവധി റെസല്യൂഷൻ കൂടുതൽ ബാറ്ററി ചാർജ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ റെസല്യൂഷൻ മാറ്റുന്നത് ചില ആപ്പുകൾ റീസ്റ്റാർട്ട് ചെയ്യാൻ കാരണമായേക്കാം."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"തിരഞ്ഞെടുത്തു"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"നിറങ്ങൾ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"സ്വാഭാവികം"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"അനുയോജ്യമായത്"</string>
     <string name="brightness" msgid="6216871641021779698">"തെളിച്ചനില"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"അനുയോജ്യമായ തെളിച്ചം"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"അനുയോജ്യമായ തെളിച്ചത്തെ കുറിച്ച്"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"നിങ്ങളുടെ ചുറ്റുപാട്, പ്രവർത്തനം എന്നിവ അനുസരിച്ച് സ്‌ക്രീൻ തെളിച്ചം സ്വയമേവ ക്രമീകരിക്കും. നിങ്ങളുടെ താൽപര്യം മനസ്സിലാക്കാൻ അനുയോജ്യമായ തെളിച്ചത്തിനെ സഹായിക്കുന്നതിന് സ്ലൈഡർ നേരിട്ട് നീക്കാം."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ഓണാണ്"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ഓഫ്"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ഉറക്ക സമയ മോഡ് ക്രമീകരണം"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{മോഡുകൾക്ക് ഡാർക്ക് തീം സജീവമാക്കാനും കഴിയും}=1{{mode_1} മോഡ് ഡാർക്ക് തീം സജീവമാക്കുകയും ചെയ്യുന്നു}=2{{mode_1}, {mode_2} മോഡുകൾ ഡാർക്ക് തീം സജീവമാക്കുകയും ചെയ്യുന്നു}=3{{mode_1}, {mode_2}, {mode_3} മോഡുകൾ ഡാർക്ക് തീം സജീവമാക്കുകയും ചെയ്യുന്നു}other{{mode_1}, {mode_2} എന്നിവയും മറ്റ് # മോഡുകളും ഡാർക്ക് തീം സജീവമാക്കുകയും ചെയ്യുന്നു}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"മോഡുകൾ ക്രമീകരണം"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"കൂടുതൽ മങ്ങിയത്"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"കൂടുതൽ ഡിം ചെയ്യൽ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ഉപകരണത്തെ പതിവിൽ കൂടുതൽ മങ്ങാൻ അനുവദിക്കുക"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"സ്ക്രീൻ തെളിഞ്ഞിരിക്കുന്ന സമയപരിധി"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> നിഷ്ക്രിയത്വത്തിന് ശേഷം"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth ഓഫ് ആണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയവും അടുത്തുള്ള ഉപകരണം സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"സമയമേഖലയ്ക്കായി ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"സമയമേഖല സ്വയമേവ സജ്ജീകരിക്കാനാകുന്നില്ല"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ലൊക്കേഷൻ അല്ലെങ്കിൽ ലൊക്കേഷൻ സേവനങ്ങൾ ഓഫാണ്"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ലൊക്കേഷൻ ക്രമീകരണം"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ഇത് പരിഹരിക്കുക"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"റദ്ദാക്കുക"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"സ്വയമേവയുള്ള സമയമേഖല ഓഫാണ്"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"സ്വയമേവയുള്ള സമയമേഖല ഓഫായിരിക്കുമ്പോൾ ലഭ്യമല്ല"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"സമയമേഖല സജ്ജീകരിക്കാൻ ലൊക്കേഷൻ ഉപയോഗിച്ചേക്കാം"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"നിങ്ങളുടെ ഉപകരണ ലൊക്കേഷൻ ലഭ്യമാണെങ്കിൽ, സമയമേഖല സജ്ജീകരിക്കാൻ അത് ഉപയോഗിച്ചേക്കാം"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"നിയമ വിവരം, നില, സോഫ്‌റ്റ്‌വെയർ പതിപ്പ് എന്നിവ കാണുക"</string>
     <string name="legal_information" msgid="7509900979811934843">"നിയമപരമായ വിവരങ്ങൾ"</string>
     <string name="manual" msgid="3651593989906084868">"മാനുവൽ"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ഓപ്‌ഷനുകൾ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ഉപയോഗസഹായി"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ഫിസിക്കൽ കീബോർഡ്"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"ബൗൺസ് കീകൾ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> മില്ലിസെക്കൻഡിനുള്ളിൽ ഒരേ കീ അതിവേഗം ആവർത്തിച്ച് അമർത്തുന്നത് കീബോർഡ് അവഗണിക്കും"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ഒരേ കീ അതിവേഗം ആവർത്തിച്ച് അമർത്തുന്നത് കീബോർഡ് അവഗണിക്കും"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ബൗൺസ് കീ ത്രെഷോൾഡ്"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"നിങ്ങളുടെ കീബോർഡ്, ആവർത്തിച്ചുള്ള കീ അമർത്തലുകൾ അവഗണിക്കേണ്ടതിന്റെ സമയദൈർഘ്യം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 സെക്കൻഡ്"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 സെക്കൻഡ്"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 സെക്കൻഡ്"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ഇഷ്‌ടാനുസൃതം"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ഇഷ്‍ടാനുസൃത മൂല്യം"</string>
     <string name="slow_keys" msgid="2891452895499690837">"സ്ലോ കീകൾ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"കീ പ്രസ്സ് പ്രവർത്തിക്കാൻ എടുക്കുന്ന സമയം <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> മില്ലിസെക്കൻഡ് ആയി ക്രമീകരിക്കും"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"കീ അമർത്തൽ സജീവമാകാൻ എടുക്കുന്ന സമയം ക്രമീകരിക്കുന്നു"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"സ്‌റ്റിക്കി കീകൾ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"കുറുക്കുവഴികൾക്കായി, കീകൾ ഒരുമിച്ച് അമർത്തിപ്പിടിക്കുന്നതിന് പകരം ഒരു സമയം ഒരു കീ അമർത്തുക"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"മൗസ് കീകൾ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"മൗസ് നിയന്ത്രിക്കാൻ, ഫിസിക്കൽ കീബോർഡ് ഉപയോഗിക്കുക."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"മൗസ് കീകൾ ഉപയോഗിക്കുക"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"പോയിന്റർ നിയന്ത്രിക്കാൻ നിങ്ങളുടെ കീബോർഡ് ഉപയോഗിക്കുക"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"മൗസ് വിപരീത ദിശയിൽ സ്‌ക്രോൾ ചെയ്യൽ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"പേജ് താഴേക്ക് നീക്കാൻ മുകളിലേക്ക് സ്ക്രോൾ ചെയ്യുക"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ഇടത്, വലത് ബട്ടണുകൾ സ്വാപ്പ് ചെയ്യുക"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ഇടത് മൗസ് ബട്ടൺ വലത് ബട്ടണായി ഉപയോഗിക്കുക"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> എന്നതിനുള്ള മൗസ് കീകൾ"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"മൗസ് പോയിന്റർ നീക്കാൻ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> കീകൾ ഉപയോഗിക്കുക"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"പ്രാഥമിക മൗസ് ബട്ടൺ ക്ലിക്ക് ചെയ്യാൻ <xliff:g id="CLICK_LABEL">%s</xliff:g> ഉപയോഗിക്കുക"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"മൗസിന്റെ പ്രൈമറി ബട്ടൺ അമർത്തിപ്പിടിക്കാൻ <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> കീ ഉപയോഗിക്കുക"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"മൗസിന്റെ പ്രൈമറി ബട്ടൺ റിലീസ് ചെയ്യാൻ <xliff:g id="RELEASE_LABEL">%s</xliff:g> കീ ഉപയോഗിക്കുക"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"സ്ക്രോൾ മോഡ് ടോഗിൾ ചെയ്യാൻ <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ഉപയോഗിക്കുക. ഇങ്ങനെ ചെയ്യുമ്പോൾ <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> കീകൾ മുകളിലേക്കോ താഴേക്കോ ഇടത്തോട്ടോ വലത്തോട്ടോ കാഴ്‌ച സ്ക്രോൾ ചെയ്യുന്നു"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"മൗസിന്റെ സെക്കൻഡറി ബട്ടൺ അമർത്തിപ്പിടിക്കാൻ <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> കീ ഉപയോഗിക്കുക"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"കീബോഡ് കുറുക്കുവഴികൾ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"കുറുക്കുവഴികളുടെ ലിസ്റ്റ് കാണിക്കുക"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ഔദ്യോഗിക പ്രൊഫൈൽ കീബോർഡുകളും ടൂളുകളും"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ഡിഫോൾട്ട്"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ടച്ച്പാഡ്"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ടച്ച്പാഡും മൗസും"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"മൗസ്"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"പോയിന്റർ വേഗത, ജെസ്ച്ചറുകൾ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ക്ലിക്ക് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ടാപ്പുചെയ്‌ത് വലിച്ചിടൽ"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"താഴെ വലതുവശത്ത് ക്ലിക്ക് ചെയ്യൽ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"കൂടുതൽ ഓപ്ഷനുകൾക്ക് ടച്ച്പാഡിന് താഴെ വലതുമൂല ക്ലിക്ക് ചെയ്യൂ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"പോയിന്റർ വേഗത"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"മൂന്ന് വിരൽ ടാപ്പ് ഉപയോഗിക്കുക"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"പോയിന്റർ നിറം"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"പോയിന്റർ ഫിൽ സ്റ്റൈൽ കറുപ്പാക്കൂ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"പോയിന്റർ ഫിൽ സ്റ്റൈൽ പച്ചയാക്കൂ"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ടച്ച്പാഡ് ജെസ്ച്ചറുകൾ മനസ്സിലാക്കുക"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ട്രാക്ക്പാഡ്, ട്രാക്ക് പാഡ്, മൗസ്, കഴ്‌സർ, സ്ക്രോൾ, സ്വൈപ്പ്, വലത് ക്ലിക്ക്, ക്ലിക്ക്, പോയിന്റർ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"വലത് ക്ലിക്ക്, ടാപ്പ്"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"മിഡിൽ ക്ലിക്ക്"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant ലോഞ്ച് ചെയ്യുക"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ഹോമിലേക്ക് പോകുക"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"മടങ്ങുക"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"അടുത്തിടെയുള്ള ആപ്പുകൾ കാണുക"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ഹോമിലേക്ക് പോകുക"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ടച്ച്‌പാഡിൽ മൂന്ന് വിരൽ കൊണ്ട് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"മടങ്ങുക"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> എന്നതിനായി പുതിയ കീ തിരഞ്ഞെടുക്കൂ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ഫിസിക്കൽ കീബോർഡ് ഉപയോഗസഹായി"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"സ്റ്റിക്കി കീകൾ, ബൗൺസ് കീകൾ, മൗസ് കീകൾ"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ആവർത്തിക്കുന്ന കീകൾ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ആവർത്തിക്കുന്നതിന് മുമ്പുള്ള കാലതാമസം"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ആവർത്തന നിരക്ക്"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"കീ വിടുന്നത് വരെ അതിന്റെ പ്രതീകം ആവർത്തിക്കാൻ കീ അമർത്തിപ്പിടിക്കുക"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ലേഔട്ട്"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ഡിഫോൾട്ട്"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"സ്വയമേവ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"പ്രിവ്യൂ ചെയ്യുക"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"സാധാരണ ഓപ്ഷനുകൾ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ഭാഷ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ടെക്സ്റ്റ് വലുപ്പം"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"സബ്‌ടൈറ്റിലിന്റെ വലുപ്പം"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"അടിക്കുറിപ്പ് സ്റ്റൈൽ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ഇഷ്‌ടാനുസൃത ഓപ്‌ഷനുകൾ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"പശ്ചാത്തല വര്‍ണം"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"പവർ ഉപയോഗം ക്രമീകരിക്കുക"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ഉൾപ്പെടുത്തിയ പാക്കേജുകൾ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ആപ്പുകൾ സാധാരണ രീതിയിൽ റൺ ചെയ്യുന്നു"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ബാറ്ററി മാറ്റാൻ നിർദ്ദേശിക്കുന്നു"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ബാറ്ററി കപ്പാസിറ്റിയും ചാർജിംഗ് പെർഫോമൻസും കുറഞ്ഞു, ബാറ്ററി മാറ്റാൻ നിർദ്ദേശിക്കുന്നു."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ബാറ്ററി നില കുറവാണ്"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ബാറ്ററി ലെെഫ് വർദ്ധിപ്പിക്കാൻ ബാറ്ററി സേവർ ഓണാക്കുക"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ബാറ്ററി ലെെഫ് മെച്ചപ്പെടുത്തുക"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ഈ VPN വിച്ഛേദിക്കണോ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"വിച്ഛേദിക്കുക"</string>
     <string name="vpn_version" msgid="6344167191984400976">"പതിപ്പ്"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"പതിപ്പ് <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN മറക്കുക"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"പ്രവൃത്തിദിവസങ്ങളിൽ 9 AM - 5 PM\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"കലണ്ടർ ഇവന്റുകൾ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} സജീവമാണ്}=2{{mode_1}, {mode_2} എന്നിവ സജീവമാണ്}=3{{mode_1}, {mode_2}, {mode_3} എന്നിവ സജീവമാണ്}other{{mode_1}, {mode_2} എന്നിവയും മറ്റ് # എണ്ണവും സജീവമാണ്}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{ഒരു മോഡിന് സ്വയമേവ ഓണാകാനാകും}other{# മോഡുകൾക്ക് സ്വയമേവ ഓണാകാനാകും}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ശല്യപ്പെടുത്തരുത്}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ഓണാണ്"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"പ്രവർത്തനരഹിതമാക്കി"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"മനസ്സിലായി"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"അറിയിപ്പുകള്‍"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"സമയ ദൈര്‍ഘ്യം"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'ശല്യപ്പെടുത്തരുത്\' ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"പൂർത്തിയാക്കി"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ക്രമീകരണം"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"അറിയിപ്പുകൾക്ക് വിഷ്വലോ ശബ്‌ദമോ വേണ്ട"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"അറിയിപ്പുകൾക്ക് ശബ്‍ദം വേണ്ട"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"നിങ്ങൾ അറിയിപ്പുകൾ കാണുകയോ കേൾക്കുകയോ ഇല്ല. നക്ഷത്രമിട്ടിട്ടുള്ള കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നുമുള്ള കോളുകൾ അനുവദനീയം."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(നിലവിലെ ക്രമീകരണം)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ശല്ല്യപ്പെടുത്തരുത് അറിയിപ്പ് ക്രമീകരണം മാറ്റണോ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"വ്യക്തിപര പ്രൊഫൈൽ ശബ്ദങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"നിങ്ങളുടെ വ്യക്തിപര പ്രൊഫൈൽ ഉപയോഗിക്കുന്ന അതേ ശബ്‌ദങ്ങൾ ഉപയോഗിക്കുക"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"അൺലോക്ക് ചെയ്‌ത്, അവസാനം ഉപയോഗിച്ച സ്‌ക്രീനിലേക്ക് നേരിട്ട് പോകുക. ലോക്ക് സ്‌ക്രീനിൽ അറിയിപ്പ് കാണിക്കില്ല. അവ കാണാൻ മുകളിൽ നിന്ന് താഴോട്ട് സ്വെെപ്പ് ചെയ്യൂ."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ലോക്ക് സ്‌ക്രീൻ, ലോക്ക് സ്‌ക്രീൻ, ഒഴിവാക്കുക, മറികടക്കുക"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ഔദ്യോഗിക പ്രൊഫൈൽ ലോക്ക് ചെയ്‌തിരിക്കുമ്പോൾ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ലോക്ക് സ്‌ക്രീനിൽ അറിയിപ്പ് കുറയ്ക്കാനുള്ള ഓപ്ഷൻ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ലോക്ക് സ്ക്രീനിൽ കുറച്ച് അറിയിപ്പുകൾ മാത്രം കാണിക്കുക"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ലോക്ക് സ്ക്രീനിൽ പുതിയ അറിയിപ്പുകൾ മാത്രം കാണിക്കുക"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ലോക്ക് സ്ക്രീനിൽ നിന്ന് മുമ്പ് കണ്ട അറിയിപ്പുകൾ സ്വയമേവ നീക്കം ചെയ്യുക"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ലോക്ക്‌സ്ക്രീനിലെ അറിയിപ്പുകൾ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ഡിഫോൾട്ടായതും നിശബ്‌ദമായതുമായ സംഭാഷണങ്ങൾ കാണിക്കുക"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ഡിഫോൾട്ടായതും നിശബ്‌ദമായതുമായ സംഭാഷണങ്ങൾ കാണിക്കുക"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"എല്ലാ ഔദ്യോഗിക അറിയിപ്പ് ഉള്ളടക്കങ്ങളും കാണിക്കുക"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"രഹസ്യാത്മകമായ ഔദ്യോഗിക ഉള്ളടക്കം അദൃശ്യമാക്കുക"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"നിങ്ങളുടെ ഉപകരണം ലോക്കുചെയ്തിരിക്കുമ്പോൾ, പ്രൊഫൈൽ അറിയിപ്പുകൾ എങ്ങനെ കാണിക്കാനാണ് നിങ്ങൾ ആഗ്രഹിക്കുന്നത്?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ചെറിയൊരു കാലയളവിൽ നിങ്ങൾക്ക് നിരവധി അറിയിപ്പുകൾ ലഭിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം 2 മിനിറ്റ് വരെ അതിന്റെ ശബ്‌ദം കുറയ്ക്കുകയും മുന്നറിയിപ്പുകൾ ചെറുതാക്കുകയും ചെയ്യും. കോളുകളെയും അലാറങ്ങളെയും മുൻ‌ഗണനയുള്ള സംഭാഷണങ്ങളെയും ബാധിക്കില്ല. \n\nകൂൾഡൗൺ സമയത്ത് ലഭിച്ച അറിയിപ്പുകൾ സ്‌ക്രീനിന്റെ മുകളിൽ നിന്ന് താഴേയ്ക്ക് വലിച്ച് കണ്ടെത്താം."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ഔദ്യോഗിക പ്രൊഫൈലുകളിൽ ബാധകമാക്കുക"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ഔദ്യോഗിക പ്രൊഫൈൽ ആപ്പുകൾക്ക് ബാധകമാക്കുക"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ബണ്ടിൽ ചെയ്‌ത അറിയിപ്പുകൾ"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ഓണാണ്"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ഓഫാണ്"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"അറിയിപ്പ് ബണ്ടിൽ ചെയ്യൽ ഉപയോഗിക്കുക"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"നിശബ്‌ദമായ അനുഭവം നൽകാൻ, സമാന തീമുകളുള്ള അറിയിപ്പുകൾ നിശബ്‌ദമാക്കി ഒരുമിച്ചൊരു ഗ്രൂപ്പായി മാറ്റും. ബണ്ടിൽ ചെയ്യൽ ഒരു ആപ്പിന്റെ സ്വന്തം അറിയിപ്പ് ക്രമീകരണം അസാധുവാക്കും."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR സഹായി സേവനങ്ങൾ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകളൊന്നും VR സഹായി സേവനങ്ങളായി റൺ ചെയ്യുന്നതിന് അഭ്യർത്ഥിച്ചിട്ടില്ല."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്ന സേവനത്തിന് VR സേവന ആക്‌സസ് അനുവദിക്കണോ?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"മുൻഗണനയുള്ള സംഭാഷണങ്ങൾ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ഒന്നും വേണ്ട"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു സംഭാഷണം}other{# സംഭാഷണങ്ങൾ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"സംഭാഷണ ക്രമീകരണം"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"തടസ്സപ്പെടുത്താൻ കഴിയുന്നത് ആർക്ക്"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"സന്ദേശമയയ്ക്കലിനും കോളിംഗിനുമുള്ള ആപ്പുകൾക്ക് അറിയിപ്പുകൾ ലഭ്യമാക്കാൻ കഴിയില്ലെങ്കിലും നിങ്ങൾ ഇവിടെ തിരഞ്ഞെടുക്കുന്ന ആളുകൾക്ക് ആ ആപ്പുകൾ വഴി തുടർന്നും നിങ്ങളെ ബന്ധപ്പെടാനാകും"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"കോളുകൾ"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ആർക്കും വിളിക്കാം"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"നക്ഷത്രചിഹ്നമിട്ടവ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"കോൺടാക്‌റ്റ് ക്രമീകരണം"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകളുടെ ക്രമീകരണം"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ഒന്നും വേണ്ട"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ഒന്നും വേണ്ട"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"അലാറങ്ങൾ"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ഔദ്യോഗികം)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"കണക്കാക്കുന്നു…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ആപ്പ് ക്രമീകരണം"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"അസാധുവാക്കാൻ ആപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"തടസ്സപ്പെടുത്താൻ കഴിയുന്ന ആപ്പുകൾ"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"മോഡ് സൃഷ്ടിക്കുക"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ഇഷ്‍ടാനുസൃത മോഡ്"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"മോഡിന്റെ പേര്"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"മോഡിന്റെ പേര് നൽകാതിരിക്കാനാകില്ല"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ഒരു ഐക്കൺ തിരഞ്ഞെടുക്കുക"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"കലണ്ടർ ഇവന്റുകൾ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ഉറക്ക സമയ ദിനചര്യ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ഡ്രൈവ് ചെയ്യുമ്പോൾ"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"പൂർണ്ണ സ്ക്രീൻ അറിയിപ്പുകൾ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ഈ ആപ്പിൽ നിന്നുള്ള പൂർണ്ണ സ്ക്രീൻ അറിയിപ്പുകൾ അനുവദിക്കുക"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ഉപകരണം ലോക്ക് ചെയ്‌തിരിക്കുമ്പോൾ അറിയിപ്പുകൾ പൂർണ്ണ സ്‌ക്രീനിൽ കാണിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. അലാറങ്ങൾ, ഇൻകമിംഗ് കോളുകൾ അല്ലെങ്കിൽ മറ്റ് അടിയന്തര അറിയിപ്പുകൾ ഹെെലെെറ്റ് ചെയ്യാൻ ആപ്പുകൾ ഇവ ഉപയോഗിച്ചേക്കാം."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"സിസ്റ്റം മുൻഗണനകൾ എഴുതുക"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"നിങ്ങളുടെ താൽപ്പര്യാർത്ഥം സിസ്റ്റം മുൻഗണനകൾ പരിഷ്‌ക്കരിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"പ്രധാന സിസ്റ്റം മുൻഗണനകൾ പരിഷ്‌ക്കരിക്കാൻ ഈ അനുമതി ആപ്പിനെ അനുവദിക്കുന്നു."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"മീഡിയ മാനേജ്‌മെന്റ് ആപ്പുകൾ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"മീഡിയ മാനേജ് ചെയ്യാൻ ആപ്പിനെ അനുവദിക്കുക"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"അനുവദിച്ചാൽ, നിങ്ങളോട് ചോദിക്കാതെ മറ്റ് ആപ്പുകൾ ഉപയോഗിച്ച് സൃഷ്‌ടിച്ച മീഡിയ ഫയലുകൾ പരിഷ്‌ക്കരിക്കാനോ ഇല്ലാതാക്കാനോ ഈ ആപ്പിന് കഴിയും. ഫയലുകളും മീഡിയയും ആക്‌സസ് ചെയ്യാൻ ആപ്പിന് അനുമതി ഉണ്ടായിരിക്കണം."</string>
@@ -4396,6 +4478,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ജെസ്‌ചറുകൾ"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ക്യാമറ അതിവേഗം തുറക്കുക"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ക്യാമറ വേഗത്തിൽ തുറക്കുന്നതിന്, പവർ ബട്ടൺ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക. ഏത് സ്ക്രീനിലും പ്രവർത്തിക്കും."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"പവർ ബട്ടൺ ഡബിൾ ടാപ്പ് ചെയ്യുക"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"ഡബിൾ ടാപ്പ് ചെയ്യൽ ഉപയോഗിക്കുക"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"പവർ ബട്ടൺ ഡബിൾ ടാപ്പ് ചെയ്യുക"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"ക്യാമറ തുറക്കുക"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"ക്യാമറ ആക്സസ് ചെയ്യുക"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Wallet തുറക്കുക"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Wallet ആക്സസ് ചെയ്യുക"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"സെൽഫിക്ക് ക്യാമറ ഫ്ലിപ്പ് ചെയ്യുക"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"നാവിഗേഷൻ മോഡ്"</string>
@@ -4793,11 +4882,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"സാറ്റലൈറ്റ് സന്ദേശമയയ്ക്കൽ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"സാറ്റലൈറ്റ് വഴി ടെക്‌സ്‌റ്റ് മെസേജുകൾ അയയ്ക്കുക, സ്വീകരിക്കുക. നിങ്ങളുടെ അക്കൗണ്ടിൽ ഉൾപ്പെടുത്തിയിരിക്കുന്നു."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"സാറ്റലൈറ്റ് വഴി ടെക്‌സ്‌റ്റ് മെസേജുകൾ അയയ്ക്കുക, സ്വീകരിക്കുക. നിങ്ങളുടെ അക്കൗണ്ടിൽ ഉൾപ്പെടുത്തിയിട്ടില്ല."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"സാറ്റലൈറ്റ് സന്ദേശമയയ്ക്കൽ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"സാറ്റലൈറ്റ് സന്ദേശമയയ്ക്കലിനെ കുറിച്ച്"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"സാറ്റലൈറ്റ് സഹായത്തോടെ സന്ദേശമയയ്ക്കൽ, സാറ്റലൈറ്റ് കണക്റ്റിവിറ്റി"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> എന്നതിനെ കുറിച്ച്"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"യോഗ്യതയുള്ള <xliff:g id="CARRIER_NAME">%1$s</xliff:g> അക്കൗണ്ടിന്റെ ഭാഗമായി, സാറ്റലൈറ്റ് വഴി ടെക്സ്റ്റ് മെസേജുകൾ അയയ്‌ക്കാനും സ്വീകരിക്കാനും നിങ്ങൾക്ക് കഴിയും"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"നിങ്ങളുടെ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> പ്ലാൻ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"നിങ്ങളുടെ അക്കൗണ്ടിൽ സാറ്റലൈറ്റ് സന്ദേശമയയ്‌ക്കൽ ഉൾപ്പെടുത്തിയിട്ടുണ്ട്"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"നിങ്ങളുടെ അക്കൗണ്ടിൽ സന്ദേശമയയ്ക്കൽ ഉൾപ്പെടുത്തിയിട്ടുണ്ട്"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"നിങ്ങളുടെ അക്കൗണ്ടിൽ സാറ്റലൈറ്റ് സന്ദേശമയയ്‌ക്കൽ ഉൾപ്പെടുത്തിയിട്ടില്ല"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"കൂടുതലറിയുക"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ഇത് പ്രവർത്തിക്കുന്നത് എങ്ങനെയാണ്"</string>
@@ -4805,10 +4894,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"നിങ്ങളുടെ ഫോൺ ഒരു സാറ്റലൈറ്റുമായി സ്വയമേവ കണക്‌റ്റ് ചെയ്യും. മികച്ച കണക്ഷൻ ലഭിക്കാൻ, ആകാശം വ്യക്തമായി കാണുന്നിടത്ത് നിൽക്കുക."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"നിങ്ങളുടെ ഫോൺ സാറ്റലൈറ്റുമായി കണക്‌റ്റ് ചെയ്‌തതിന് ശേഷം"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"അടിയന്തര സേവനങ്ങൾക്ക് ഉൾപ്പെടെ ഏതൊരാൾക്കും ടെക്‌സ്‌റ്റ് ചെയ്യാൻ നിങ്ങൾക്ക് കഴിയും. ഒരു മൊബൈൽ നെറ്റ്‌വർക്ക് ലഭ്യമാകുമ്പോൾ നിങ്ങളുടെ ഫോൺ അതിലേക്ക് വീണ്ടും കണക്‌റ്റ് ചെയ്യും."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"സാറ്റലൈറ്റ് സന്ദേശമയയ്ക്കലിന് കൂടുതൽ സമയമെടുത്തേക്കാം, ചില പ്രദേശങ്ങളിൽ മാത്രമേ അത് ലഭ്യമാകൂ. കാലാവസ്ഥയും ചില ഘടനകളും നിങ്ങളുടെ സാറ്റലൈറ്റ് കണക്ഷനെ ബാധിച്ചേക്കാം. സാറ്റലൈറ്റ് വഴി കോളുകൾ ചെയ്യുന്നത് ലഭ്യമല്ല. എമർജൻസി കോളുകൾ തുടർന്നും കണക്റ്റ് ചെയ്‌തേക്കാം.\n\nഅക്കൗണ്ടിലെ മാറ്റങ്ങൾ, ക്രമീകരണത്തിൽ ദൃശ്യമാകാൻ കുറച്ച് സമയമെടുത്തേക്കാം. വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ സേവനദാതാവിനെ ബന്ധപ്പെടുക."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"സാറ്റലൈറ്റ് സന്ദേശമയയ്ക്കലിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> എന്നതിന് കൂടുതൽ സമയമെടുത്തേക്കാം, ചില പ്രദേശങ്ങളിൽ മാത്രമേ അത് ലഭ്യമാകൂ. കാലാവസ്ഥയും ചില ഘടനകളും നിങ്ങളുടെ സാറ്റലൈറ്റ് കണക്ഷനെ ബാധിച്ചേക്കാം. സാറ്റലൈറ്റ് വഴി കോളുകൾ ചെയ്യുന്നത് ലഭ്യമല്ല. എമർജൻസി കോളുകൾ തുടർന്നും കണക്റ്റ് ചെയ്‌തേക്കാം.\n\nഅക്കൗണ്ടിലെ മാറ്റങ്ങൾ, ക്രമീകരണത്തിൽ ദൃശ്യമാകാൻ കുറച്ച് സമയമെടുത്തേക്കാം. വിശദവിവരങ്ങൾക്ക് <xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിനെ ബന്ധപ്പെടുക."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> എന്നതിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ഓണാക്കാനാകുന്നില്ല"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ഓണാക്കാൻ, ആദ്യം സാറ്റലൈറ്റ് കണക്ഷൻ അവസാനിപ്പിക്കുക"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"സാറ്റലൈറ്റ് കണക്റ്റിവിറ്റി"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"സാറ്റലൈറ്റ് കണക്റ്റിവിറ്റി"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"സാറ്റലൈറ്റ് കണക്റ്റിവിറ്റി"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"സാറ്റലൈറ്റ് സഹായത്തോടെ സന്ദേശമയയ്ക്കൽ"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ഡാറ്റയുടെ ഉപയോഗം നിങ്ങളുടെ അക്കൗണ്ടിൽ ഉൾപ്പെടുത്തിയിട്ടുണ്ട്"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"സാറ്റലൈറ്റ് SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"നിങ്ങൾക്ക് മൊബൈൽ അല്ലെങ്കിൽ വൈഫൈ നെറ്റ്‌വർക്കിലേക്ക് കണക്‌റ്റ് ചെയ്യാനാകാതെ വരുമ്പോൾ അടിയന്തര സേവനങ്ങൾ ഉപയോഗിച്ച് സന്ദേശമയയ്ക്കുക"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"സാറ്റലൈറ്റ് SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"സാറ്റലൈറ്റ് SOS-നെ കുറിച്ച്"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"ഒരു മൊബൈലിലേക്കോ വൈഫൈ നെറ്റ്‌വർക്കിലേക്കോ കണക്‌റ്റ് ചെയ്യാനാകാതെ വരുമ്പോൾ, അടിയന്തര സേവനങ്ങൾക്ക് സന്ദേശമയയ്ക്കാനും നിങ്ങളുടെ ലൊക്കേഷൻ പങ്കിടാനും കഴിയും. ഈ സേവനം എല്ലാ സമയത്തും എല്ലാ ലൊക്കേഷനുകളിലും അല്ലെങ്കിൽ എല്ലാ സാഹചര്യങ്ങളിലും ലഭ്യമാകണമെന്നില്ല."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"അടിയന്തര സേവനങ്ങളിലേക്ക് വിളിക്കുകയോ സന്ദേശമയയ്‌ക്കുകയോ ചെയ്യുക"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"അടിയന്തര ഘട്ടത്തെ കുറിച്ചുള്ള ചോദ്യങ്ങൾക്ക് ഉത്തരം നൽകുക"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"സാറ്റലൈറ്റിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ ഇനിപ്പറയുന്ന ഘട്ടങ്ങൾ പാലിക്കുക"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"നിങ്ങൾക്ക് മൊബൈൽ നെറ്റ്‌വർക്ക് ഇല്ലെങ്കിൽ, സാറ്റലൈറ്റ് SOS ഉപയോഗിക്കുന്നതിനുള്ള ഒരു ഓപ്ഷൻ കാണാനാകും"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ശരിയായ തരത്തിലുള്ള സഹായം ലഭിക്കുന്നതിനായി, അടിയന്തര സേവനങ്ങളിലേക്ക് ഉത്തരങ്ങൾ അയയ്ക്കുക"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"കണക്‌റ്റ് ചെയ്‌തുകഴിഞ്ഞാൽ, നിങ്ങൾക്ക് അടിയന്തര സേവനങ്ങളിലേക്ക് സന്ദേശമയയ്‌ക്കാം"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ഡെമോ പരീക്ഷിക്കുക"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"സാറ്റലൈറ്റ് മുഖേന നിങ്ങൾ അടിയന്തര സേവനങ്ങളുമായി കണക്റ്റ് ചെയ്യുമ്പോൾ, നിങ്ങളുടെ പേര്, ഇമെയിൽ, ഫോൺ നമ്പർ, ലൊക്കേഷൻ, ഉപകരണ വിവരങ്ങൾ (IMEI, ഭാഷ, മോഡൽ, ബാറ്ററി ലെവൽ), അടിയന്തര കോൺടാക്റ്റ് വിവരങ്ങൾ എന്നിവ അടിയന്തര സേവനങ്ങളുമായും സാറ്റലൈറ്റ് സേവന ദാതാക്കളുമായും പങ്കിടുന്നു. \n\nസാറ്റലൈറ്റ് SOS ഉപയോഗിക്കുന്നതിന്, Google Messages നിങ്ങളുടെ ഡിഫോൾട്ട് SMS ആപ്പ് ആയിരിക്കണം. \n\nസ്വയമേവയുള്ള നെറ്റ്‌വർക്ക് തിരഞ്ഞെടുക്കൽ ഓഫാണെങ്കിൽ, അത് ഓണാകും, നിങ്ങളുടെ ഉപകരണം ഏത് നെറ്റ്‌വർക്കിലേക്കും സ്വയമേവ കണക്‌റ്റ് ചെയ്യും."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"പങ്കിടലിന്റെ മുൻഗണനകൾ"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"അടിയന്തര കോൺടാക്റ്റുകൾ"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"നിങ്ങളുടെ Google Account"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"അടിയന്തര സേവനങ്ങളുമായി പങ്കിടുന്ന വിവരങ്ങൾ അവലോകനം ചെയ്യുക അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യുക"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ആക്‌സസ് പോയിന്റ് പേരുകൾ"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്‌തിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
@@ -4995,6 +5108,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"നിങ്ങൾ പേജ് വലുപ്പം തിരിച്ചറിയൽ മോഡിന്റെ 16KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്‌വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്‌തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ 4KB മോഡിലേക്ക് തിരികെ മാറുകയും ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം. ഇത് ഉപകരണത്തെ വീണ്ടും ഫാക്‌ടറി റീസെറ്റ് ചെയ്യുകയും പ്രൊഡക്ഷൻ ക്രമീകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കുകയും ചെയ്യും. ഉപകരണം വിജയകരമായി Android-ലേക്ക് ബൂട്ട് ചെയ്ത് കഴിഞ്ഞ്, ഡെവലപ്പർ ഓപ്ഷനുകളിൽ OEM അൺലോക്ക് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക. ഉപകരണം Android-ലേക്ക് ബൂട്ട് ചെയ്യാനായില്ലെങ്കിലോ അസ്ഥിരമാണെങ്കിലോ, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; -ൽ നിന്നുള്ള ഏറ്റവും പുതിയ ഫാക്ടറി ഇമേജുകൾ ഉപയോഗിച്ച് ഉപകരണം വീണ്ടും ഫ്ലാഷ് ചെയ്യുക അല്ലെങ്കിൽ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ഉപയോഗിക്കുക, തുടർന്ന് \'ഉപകരണം തുടച്ചുനീക്കുക\', \'ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുക\', \'എല്ലാ പാർട്ടീഷനുകളും ഫോഴ്‌സ് ഫ്ലാഷ് ചെയ്യുക\' എന്നിവ തിരഞ്ഞെടുക്കുക."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB പേജ്-ആഗ്നോസ്റ്റിക് മോഡ്"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"കൂടുതൽ വായിക്കുക"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"പേജ് വലുപ്പത്തിന് അനുയോജ്യമായ മോഡ് ഉപയോഗിച്ച് ആപ്പ് റൺ ചെയ്യുക"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ബഗ് റിപ്പോർട്ട് ഹാൻഡ്‍ലർ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"നിങ്ങളുടെ ഉപകരണത്തിലെ ബഗ് റിപ്പോർട്ട് കുറുക്കുവഴി കൈകാര്യം ചെയ്യുന്നത് ഏത് ആപ്പാണെന്ന് നിർണ്ണയിക്കുന്നു."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"വ്യക്തിപരം"</string>
@@ -5159,7 +5275,7 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"UWB ഉള്ള സമീപമുള്ള ഉപകരണങ്ങളുടെ ആപേക്ഷിക സ്ഥാനം തിരിച്ചറിയാൻ സഹായിക്കുന്നു"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ഉപയോഗിക്കാൻ ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"നിലവിലെ ലൊക്കേഷനിൽ UWB ലഭ്യമല്ല"</string>
-    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"ത്രെഡ്"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"ത്രെഡ് ഉപയോഗിക്കുക"</string>
     <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"സ്‌മാർട്ട് ‌ഹോം ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യുന്നതിനും കാര്യക്ഷമതയും പ്രകടനശേഷിയും വർദ്ധിപ്പിക്കുന്നതിനും ത്രെഡ് സഹായിക്കുന്നു.\n\nപ്രവർത്തനക്ഷമമാക്കുമ്പോൾ, ഈ ഉപകരണം ത്രെഡ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യാൻ യോഗ്യമാകുന്നു, ഈ ഫോണിലൂടെ Matter പിന്തുണയ്ക്കുന്ന ഉപകരണങ്ങളെ നിയന്ത്രിക്കുന്നതിന് നിങ്ങളെ ഇത് അനുവദിക്കുന്നു."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"ത്രെഡിനെ കുറിച്ച് കൂടുതലറിയുക"</string>
@@ -5433,7 +5549,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"സ്ട്രീം ചെയ്യുന്നത് കേൾക്കുക"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപയോഗിച്ച് കേൾക്കാൻ ഓഡിയോ സ്ട്രീം QR കോഡ് സ്കാൻ ചെയ്യുക"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"പങ്കിടുമ്പോൾ പാസ്‌വേഡ് എഡിറ്റ് ചെയ്യാനാകില്ല. പാസ്‌വേഡ് മാറ്റാൻ, ആദ്യം ഓഡിയോ പങ്കിടൽ ഓഫാക്കുക."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"നിങ്ങളുടെ പാസ്‌വേഡിൽ 4-16 പ്രതീകങ്ങൾ അടങ്ങിയിരിക്കുകയും അക്ഷരങ്ങളും അക്കങ്ങളും ചിഹ്നങ്ങളും മാത്രം ഉപയോഗിച്ചിരിക്കുകയും വേണം"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR കോഡ് സ്കാനർ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"സഹായം ആവശ്യമാണോ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"തിരയൽ ക്രമീകരണം"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"കോൺടാക്റ്റുകൾ, സ്റ്റോറേജ്, അക്കൗണ്ട്"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"കോൺടാക്റ്റുകളുടെ സ്റ്റോറേജ്"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ഉപകരണം മാത്രം"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"പുതിയ കോൺടാക്റ്റുകൾ ഒരു അക്കൗണ്ടുമായി സമന്വയിപ്പിക്കില്ല"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"കോൺടാക്റ്റുകൾ നിങ്ങളുടെ ഉപകരണത്തിൽ സംരക്ഷിക്കുകയും ഡിഫോൾട്ടായി നിങ്ങളുടെ അക്കൗണ്ടിലേക്ക് സമന്വയിപ്പിക്കുകയും ചെയ്യും"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ഡിഫോൾട്ട് അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിൽ പിശക്"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ഡിഫോൾട്ട് ഒന്നും സജ്ജീകരിച്ചിട്ടില്ല"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ഉപകരണം മാത്രം"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ഉപകരണത്തിലും %1$s എന്നതിലും"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ആരംഭിക്കുന്നതിന് ഒരു അക്കൗണ്ട് ചേർക്കുക"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"കോൺടാക്റ്റുകൾ എവിടെ സംരക്ഷിക്കും"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"തിരയാൻ വട്ടം വരയ്ക്കൽ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"നിങ്ങളുടെ സ്ക്രീനിലുള്ള ഉള്ളടക്കം ഉപയോഗിച്ച് തിരയാൻ ഹോം ബട്ടൺ അല്ലെങ്കിൽ നാവിഗേഷൻ ഹാൻഡിൽ സ്‌പർശിച്ചുപിടിക്കുക."</string>
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index d7083c89efb..76bd912338a 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Цасан ширхэг"</item>
     <item msgid="7952183800501346803">"Далайн эргийн шүхэр"</item>
     <item msgid="799139025758265891">"Урлангийн багаж хэрэгсэл"</item>
-    <item msgid="1330084588359129896">"Майхан"</item>
+    <item msgid="8112685757657659269">"Төгөлдөр хуур"</item>
     <item msgid="3861584909935022342">"Зургийн хальс"</item>
     <item msgid="5827426100157335512">"Ном"</item>
     <item msgid="8585828346253128384">"Бадамлянхуа цэцэг"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 65e8312b0da..0886add71d2 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Шинэ төхөөрөмж хослуулах"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Маргааш автоматаар асаах"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Та Bluetooth-г унтраавал энэ нь дараагийн өдөр дахин асна"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Баруун чих хослуулах"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Зүүн чих хослуулах"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Нөгөө чихээ хослуулах"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE аудиог идэвхгүй болгох"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Хэрэв төхөөрөмж LE аудио техник хангамжийн чадамжийг дэмждэг бол Bluetooth LE аудио онцлогийг идэвхгүй болгоно."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Аудио горим"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Аудио аппын нэвтрүүлэх UI-г урьдчилан үзэхийг идэвхжүүлэх"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Хувийн аудио хуваалцах, хувийн байдлаар нэвтрүүлэх зэрэг LE Аудио аппын хуваалцах UI-г урьдчилан үзэхийг идэвхжүүлнэ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Төхөөрөмжийн дэлгэрэнгүйд LE аудионы асаах/унтраахыг харуул"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Аудиогийн зөвшөөрсөн жагсаалтыг алгасах"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Аудиогийн нэмэлт хэрэгслийг Зөвшөөрсөн жагсаалтын шалгуурт нийцэж байгаа эсэхийг баталгаажуулаагүй байсан ч өгөгдмөлөөр LE Аудиог ашиглана уу."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Аппын хэл"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Санал болгосон хэл"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Бүх хэл"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Санал болгосон"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Бүх хэл"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Бүх бүс нутаг"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Бүх тооны систем"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Системийн хэл"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Системийн өгөгдмөл"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Энэ аппын хэлийг Тохиргоо хэсгээс сонгох боломжгүй байна."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Өөрчлөх"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s боломжгүй"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Энэ хэлийг системийн хэлээр ашиглах боломжгүй хэдий ч та аппууд болон вебсайтуудад энэ хэлийг илүүд үзэж байгаагаа мэдэгдсэн."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Хайх"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Хэл нэмэх"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Бүс нутгийн тохиргоо"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Хэлний нэрийг бичнэ үү"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Хэлний бусад тохиргоо"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Бүс нутгийн тохиргоо"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Нэгж болон тооны сонголтыг тохируулна уу"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Аппуудад бүс нутгийн тохиргоогоо мэдэгдсэнээр тэд таны хэрэглээг хувийн болгох боломжтой."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Аппууд боломжтой үедээ таны бүс нутгийн тохиргоог ашиглана."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Бүс нутгийн тохиргоо"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температур"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Долоо хоногийн эхний өдөр"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Тооны сонголт"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Роумингтэй үед дата үйлчилгээнд холбогдох"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Роумингтэй үед дата үйлчилгээнд холбогдох"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Роуминг үйлчилгээний төлбөр тооцогдож болзошгүй."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Цагийг автоматаар тохируулах"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Автоматаар тохируулах"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Энэ асаах/унтраах сэлгүүр асаалттай үед байршлыг цагийн бүс тохируулахад ашиглана"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Автомат огноо болон цаг"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Таны сүлжээ болон утасгүй дохиог ашиглан автоматаар тохируулна"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Автомат цагийн бүс"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Таны ойролцоох хөдөлгөөнт холбооны сүлжээнд үндэслэн автоматаар тохируулна"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Таны төхөөрөмжийн байршил байгаа тохиолдолд тухайн байршлыг ашиглан автоматаар тохируулна"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Бүс нутгийн өгөгдмөлийг ашиглах"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 цагийн формат ашиглах"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Цаг"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Хуруугаа өргөөд мэдрэгч дээр дахин хүрнэ үү."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Хурууны хээ мэдрэгч ашиглах боломжгүй"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Засварын үйлчилгээ үзүүлэгчид зочилно уу."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Дэлгэц унтраалттай, Хурууны хээгээр түгжээ тайлах"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Дэлгэц унтраалттай байсан ч Хурууны хээгээр түгжээ тайлахыг ашиглана уу"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Дэлгэц унтраалттай, түгжээг тайлах"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Аюулгүй байдлын бусад тохиргоо"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Ажлын профайлын түгжээ, шифрлэлт болон бусад"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрлэлт, мандат үнэмлэх болон бусад"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Хувийн орон зайдаа хээ тохируулна уу"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Түгжээ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Нуух"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Хаалттай орон зайн хээгээ баталгаажуулна уу"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Хаалттай орон зайн ПИН-ээ дахин оруулна уу"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Хаалттай орон зайн нууц үгээ дахин оруулна уу"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх хурууны хээ нэмж болно"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Таны зөвшөөрөгдсөн хурууны хээний тоо гүйцсэн байна"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Өөр хурууны хээ нэмэх боломжгүй байна"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Асаалттай"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Унтраалттай"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Гаднын дэлгэц"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Бүрэлдэхүүн дэлгэц"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Гаднын дэлгэц ашиглах"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Дэлгэцийн нягтрал"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Гаднын дэлгэц салсан"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Эргүүлэлт эсвэл нягтралыг өөрчлөх нь одоо ажиллаж буй аливаа аппыг зогсоож магадгүй"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Таны дэлгэцийн тусгалыг үүсгэхийн тулд таны төхөөрөмж гаднын дэлгэцэд холбогдсон байх ёстой"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Бусад сонголт"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Дэлгэцүүдийг дахин эмхлэхийн тулд удаан дараад, чирнэ үү."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Дамжуулах"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"тусгал"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Нууц үгийг шалгаад дахин оролдоно уу"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Төхөөрөмжийн үйлдвэрлэгчтэй холбогдоно уу"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Холболтыг шалгаад дахин оролдоно уу"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Энэ Wi-Fi сүлжээ яг одоо боломжгүй байна"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Энэ QR кодтой холбоотой асуудал гарлаа. Өөр аргаар холбогдож үзнэ үү."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Сүлжээ сонгох"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Төхөөрөмжөө холбохын тулд сүлжээ сонгоно уу"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Энэ төхөөрөмжийг “<xliff:g id="SSID">%1$s</xliff:g>”-д нэмэх үү?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Автоматаар эргүүлэх талаар нэмэлт мэдээлэл авах"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Дэлгэцийн нягтрал"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Өндөр нягтрал"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Бүрэн нягтрал"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Бүрэн нягтрал таны батарейг илүү их ашиглана. Нягтралаа сэлгэх нь зарим аппыг дахин эхлэхэд хүргэж магадгүй."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Дээд нягтрал"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Дээд нягтрал нь таны батарейн цэнэгийг илүү их ашигладаг. Нягтралаа сэлгэх нь зарим аппыг дахин эхлүүлэхэд хүргэж магадгүй."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Сонгосон"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Өнгө"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Байгалийн"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Дасан зохицох"</string>
     <string name="brightness" msgid="6216871641021779698">"Гэрэлтүүлгийн түвшин"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Орчинтой зохицох гэрэлтүүлэг"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Орчинтой зохицох гэрэлтүүлгийн тухай"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Дэлгэцийн гэрэлтүүлэг таны хүрээлэн буй орчин болон үйл ажиллагаанд автоматаар тохирно. Орчинтой зохицох гэрэлтүүлэгт таны тохиргоог мэдэхэд нь туслахын тулд гулсуулагчийг гараараа хөдөлгөх боломжтой."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Асаасан"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Идэвхгүй"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Унтлагын цагийн горимын тохиргоо"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Горим мөн бараан загварыг идэвхжүүлэх боломжтой}=1{{mode_1} мөн бараан загварыг идэвхжүүлнэ}=2{{mode_1} болон {mode_2} мөн бараан загварыг идэвхжүүлнэ}=3{{mode_1}, {mode_2}, {mode_3} мөн бараан загварыг идэвхжүүлнэ}other{{mode_1}, {mode_2} болон өөр # горим мөн бараан загварыг идэвхжүүлнэ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Горимын тохиргоо"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Илүү бүдэг"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Хэт бүүдгэр"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Төхөөрөмжид ердийнхөөс илүү бүдэг болохыг нь зөвшөөрөх"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Дэлгэц автоматаар амрах"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Идэвхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Апп, үйлчилгээнд Bluetooth унтраалттай үед ч ойролцоох төхөөрөмжийг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Байршлын үйлчилгээ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Байршлын үйлчилгээ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Байршлыг ашиглах"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Байршлыг цагийн бүс тохируулахад ашиглах"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Цагийн бүсийг автоматаар тохируулах боломжгүй"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Байршил эсвэл Байршлын үйлчилгээ унтраалттай байна"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Байршлын тохиргоо"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Үүнийг засах"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Цуцлах"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автомат цагийн бүс унтраалттай байна"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Автомат цагийн бүс унтраалттай байхад боломжгүй"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Байршлыг цагийн бүс тохируулахад ашиглаж магадгүй"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Хэрэв таны төхөөрөмжийн байршил боломжтой бол уг байршлыг таны цагийн бүсийг тохируулахад ашиглаж магадгүй"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Хууль эрх зүйн мэдээлэл, статус, программын хувилбарыг харах"</string>
     <string name="legal_information" msgid="7509900979811934843">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="manual" msgid="3651593989906084868">"Гар ажиллагаатай"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Сонголт"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Хандалт"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Биет гар"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Ойх түлхүүрүүд"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Гар нь <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мс доторх нэг товчлуурын шуурхай давтагдсан даралтыг үл хэрэгсэнэ"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Гар нэг товчийн давтагдсан шуурхай даралтыг үл хэрэгсэнэ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ойх товчийн босго"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Таны гар давтагдсан товчийн даралтыг үл хэрэгсэх хугацааг сонгоорой"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 сек"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 сек"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 сек"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Захиалгат"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"захиалгат утга"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Удаан товчнууд"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Товчлуур даралт идэвхжихэд зарцуулах хугацааг <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мс болгож тохируулна"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Товчийн даралт идэвхжихэд зарцуулах хугацааг тохируулна"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Бэхэлсэн түлхүүрүүд"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Товчлолд товчлууруудыг хамтад нь удаан дарахын оронд нэг удаад нэг товчлуур дарна уу"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Хулганын товч"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Хулганыг хянахад биет гарыг ашиглана уу."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Хулганын товчийг ашиглах"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Заагчийг хянахад гараа ашиглана уу"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Хулганыг урвуу гүйлгэх"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Хуудсыг доош зөөхийн тулд дээш гүйлгэнэ үү"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Зүүн, баруун товчнуудыг солих"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Хулганын зүүн товчийг баруун товчоороо ашиглана уу"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>-н хулганын товч"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Хулганын заагчийг хөдөлгөхийн тулд <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> товчийг ашиглана уу"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Хулганын үндсэн товч дээр товшихын тулд <xliff:g id="CLICK_LABEL">%s</xliff:g> товчийг ашиглана уу"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Хулганын үндсэн товчийг удаан дарахын тулд <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> товчийг ашиглана уу"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Хулганын үндсэн товчийг суллахын тулд <xliff:g id="RELEASE_LABEL">%s</xliff:g> товчийг ашиглана уу"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Гүйлгэх горимыг асаах/унтраахын тулд <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> товчийг ашиглана уу. Энэ нь <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> товчийг харагдах байдлыг дээд, доод, зүүн, баруун тийш гүйлгэдэг болгоно"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Хулганын хоёрдогч товч дээр товшихын тулд <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> товчийг ашиглана уу"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Гарын товчлол"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Товчлолын жагсаалтыг харуулах"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Ажлын профайлын гар &amp; хэрэгсэл"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Өгөгдмөл"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Мэдрэгч самбар"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Мэдрэгч самбар, хулгана"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Хулгана"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Заагчийн хурд, зангаа"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Товших"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Товшиж чирэх"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Баруун доор товших"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Бусад сонголтыг харах бол мэдрэгч самбарын баруун доор товш"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Заагчийн хурд"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Гурван хураагаар товшихыг ашиглах"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Заагчийн өнгө"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Заагчийг дүүргэх загварыг хар болго"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Заагчийг дүүргэх загварыг ногоон болго"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Мэдрэгч самбарын зангааг мэдэж авах"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"мэдрэгч самбар, мэдрэгч самбар, хулгана, курсор, гүйлгэх, шудрах, баруун талыг товших, товших, заагч"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"баруун талыг товших, товших"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Голд товших"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Туслахыг эхлүүлэх"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Нүүр хуудас руу очих"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Буцах"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Саяхны аппуудыг харах"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Үндсэн нүүр лүү очих"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Мэдрэгч самбарын аль ч хэсэгт 3 хуруугаараа дээш шударна уу"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Буцах"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-н шинэ товч сонгоно уу:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Биет гарын хандалт"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Бэхэлсэн товч, буцаах товч, хулганын товч"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Товчийг давтах"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Давтахаас өмнөх саатал"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Давтах хурд"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Товчийг суллах хүртэл тэмдгийг нь давтахын тулд тухайн товчин дээр удаан дарна уу"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> бүдүүвч"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Өгөгдмөл"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автомат: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Урьдчилж харах"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандарт сонголтууд"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Хэл"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Текстийн хэмжээ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Тайлбарын хэмжээ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Тайлбарын загвар"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Тусгай сонголтууд"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Дэвсгэр өнгө"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Цэнэг ашиглалтыг тохируулах"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Агуулагдсан багцууд"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Апп хэвийн ажиллаж байна"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Батарейг солихыг зөвлөж байна"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Батарейн багтаамж, цэнэглэх гүйцэтгэл буурсан ба батарейг солихыг зөвлөж байна."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Батарейн түвшин бага байна"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Батарейн ажиллах хугацааг уртасгахын тулд Батарей хэмнэгчийг асаана уу"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Батарейн ажиллах хугацааг сайжруулах"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Энэ VPN-г салгах уу?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Салгах"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Хувилбар"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g>-р хувилбар"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN-г мартах"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Энэ VPN-г солих уу?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN-г тогтмол асаалттайгаар тохируулах уу?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Ажлын өдрүүдэд 09:00 - 17:00\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Календарийн үйл явдал"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} идэвхтэй байна}=2{{mode_1} болон {mode_2} идэвхтэй байна}=3{{mode_1}, {mode_2}, {mode_3} идэвхтэй байна}other{{mode_1}, {mode_2} болон өөр # горим идэвхтэй байна}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 горим автоматаар асах боломжтой}other{# горим автоматаар асах боломжтой}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Бүү саад бол}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"АСААЛТТАЙ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Тохируулаагүй"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Идэвхгүй болгосон"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ойлголоо"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Мэдэгдэл"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Үргэлжлэх хугацаа"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Мессеж, арга хэмжээ &amp; сануулагч"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Бүү саад бол горим асаалттай үед мессеж, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд мессежын тохиргоог өөрчлөх боломжтой."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Дууссан"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Тохиргоо"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Мэдэгдлийн дуу алга"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Та мэдэгдэл харахгүй эсвэл сонгохгүй. Одоор тэмдэглэсэн харилцагч болон дахин дуудлага хийгчийн дуудлагыг зөвшөөрдөг."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Одоогийн тохиргоо)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Бүү саад бол горимын мэдэгдлийн тохиргоог өөрчлөх үү?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Ажлын профайлын ая"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Хувийн профайлын аяыг ашиглах"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Хувийн профайлтайгаа ижил ая ашиглана уу"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Түгжээг тайлсны дараа сүүлд ашигласан дэлгэц рүү шууд очно уу. Түгжээтэй дэлгэцэд мэдэгдэл харуулахгүй. Түүнийг харахын тулд дээрээс доош шударна уу."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Түгжигдсэн дэлгэц, Түгжигдсэн дэлгэц, Алгасах, Тойрох"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Ажлын профайлыг түгжсэн үед"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Түгжээтэй дэлгэцийн мэдэгдлийн минимализм"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Түгжээтэй дэлгэц дээр цөөн мэдэгдэл харуулна"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Түгжигдсэн дэлгэцэд зөвхөн шинэ мэдэгдэл харуулах"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Өмнө нь үзсэн мэдэгдлийг түгжигдсэн дэлгэцээс автоматаар хасах"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Түгжээтэй дэлгэц дээрх мэдэгдэл"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Харилцан яриа, өгөгдмөл болон чимээгүй мэдэгдлийг харуулна"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Харилцан яриа, өгөгдмөл болон чимээгүй мэдэгдлийг харуулна"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Ажлын мэдэгдлийн бүх агуулгыг харуулах"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ажлын эмзэг, хурц агуулгыг нуух"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Таны төхөөрөмж түгжээтэй үед та профайлын мэдэгдлээ хэрхэн харахыг хүсэж байна вэ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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">"Aппын мэдэгдлүүд"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Та богино хугацаанд олон мэдэгдэл хүлээн авсан үед таны төхөөрөмж 2 хүртэлх минутын турш дууны түвшнээ сулруулж, дохиог багасгана. Дуудлага, сэрүүлэг, чухал харилцан ярианд нөлөөлөхгүй. \n\nХөргөлтийн үеэр хүлээн авсан мэдэгдлийг дэлгэцийн дээд талаас доош татаж олох боломжтой."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Ажлын профайлуудад хэрэгжүүлэх"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Ажлын профайлын аппуудад ашиглах"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Багцалсан мэдэгдлүүд"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Асаалттай"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Унтраалттай"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Мэдэгдэл багцлахыг ашиглах"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Илүү чимээгүй хэрэглээнд зориулж төстэй загвартай мэдэгдлүүдийг чимээгүй болгож, хамтад нь бүлэглэнэ. Багцлах нь аппын өөрийн мэдэгдлийн тохиргоог дарна."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR туслагч үйлчилгээ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Суулгасан апп-с VR туслагч үйлчилгээгээр ажиллах хүсэлт гаргаагүй байна."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR үйлчилгээг <xliff:g id="SERVICE">%1$s</xliff:g>-д хандахыг зөвшөөрөх үү?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"чухал харилцан яриа"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Байхгүй"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Байхгүй}=1{1 харилцан яриа}other{# харилцан яриа}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Харилцан ярианы тохиргоо"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хэн тасалдуулж болох вэ"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Мессеж эсвэл дуудлагын аппууд танд мэдэгдэх боломжгүй байсан ч таны энд сонгосон хүмүүс тэдгээр аппаар тантай холбоо барих боломжтой хэвээр байна"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дуудлага"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Дурын хүн"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Харилцагч"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Одоор тэмдэглэсэн харилцагчид"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Харилцагчдын тохиргоо"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Одтой харилцагчийн тохиргоо"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Байхгүй"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Байхгүй"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Сэрүүлэг"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ажил)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Тооцоолж байна…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Аппын тохиргоо"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Аппуудад дарахыг нь зөвшөөрөх"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Тасалдуулах боломжтой аппууд"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Горим үүсгэх"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Захиалгат горим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Горимын нэр"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Горимын нэр хоосон байж болохгүй"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Дүрс тэмдэг сонгох"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Календарийн үйл явдал"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Унтах цагийн хэвшил"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Жолоо барьж байхад"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Бүтэн дэлгэцийн мэдэгдэл"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Энэ аппаас бүтэн дэлгэцийн мэдэгдлийг зөвшөөрөх"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Төхөөрөмжийг түгжээтэй үед энэ аппад бүтэн дэлгэцийг эзлэх мэдэгдэл харуулахыг зөвшөөрнө үү. Сэрүүлэг, ирсэн дуудлага эсвэл бусад яаралтай мэдэгдлийг онцлоход аппууд эдгээрийг ашиглаж магадгүй."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Системийн сонголтыг бичих"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Энэ аппад таны өмнөөс системийн сонголтыг өөрчлөхийг зөвшөөрөх"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Энэ зөвшөөрөл аппад үндсэн системийн сонголтыг өөрчлөхийг зөвшөөрдөг."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Медиа удирдлагын аппууд"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Медиаг удирдахын тулд аппыг зөвшөөрөх"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Зөвшөөрсөн тохиолдолд энэ апп бусад апптай хамт үүсгэсэн медиа файлыг танаас асуухгүйгээр өөрчлөх эсвэл устгах боломжтой. Aпп нь файл болон медиад хандах зөвшөөрөлтэй байх ёстой."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Зангаа"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Камерыг хурдан нээх"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Камерыг хурдан нээхийн тулд асаах товчлуурыг хоёр удаа дарна уу. Дурын дэлгэцээс ажиллана."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Сельфи авахын тулд камерыг далбилзуулах"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Навигацын горим"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Хиймэл дагуулаар мессеж бичих"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Хиймэл дагуулаар мессеж илгээж, хүлээн авна уу. Таны бүртгэлд багтсан."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Хиймэл дагуулаар мессеж илгээж, хүлээн авна уу. Таны бүртгэлд багтаагүй."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Хиймэл дагуулаар мессеж бичих"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Хиймэл дагуулаар мессеж бичих тухай"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Хиймэл дагуулаар дамжин мессеж бичих, хиймэл дагуулын холболт"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g>-н тухай"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Та зохих эрхтэй <xliff:g id="CARRIER_NAME">%1$s</xliff:g> бүртгэлийн нэг хэсэг байдлаар хиймэл дагуулаар мессеж илгээх болон хүлээн авах боломжтой"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Таны <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-н багц"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Хиймэл дагуулаар мессеж бичих нь таны бүртгэлд багтсан"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Таны бүртгэл хиймэл дагуулаар дамжуулан мессеж бичих боломжтой"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Хиймэл дагуулаар мессеж бичих нь таны бүртгэлд багтаагүй"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Нэмэлт мэдээлэл авах"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Энэ хэрхэн ажилладаг вэ?"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Таны утас хиймэл дагуулд автоматаар холбогдоно. Шилдэг холболтыг авах бол тэнгэр тод харагдах газар байгаарай."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Таны утас хиймэл дагуулд холбогдсоны дараа"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Та яаралтай тусламжийн үйлчилгээнүүдийг оруулаад дурын хүн рүү мессеж бичих боломжтой. Таны утас хөдөлгөөнт холбооны сүлжээг боломжтой үед үүнд дахин холбогдоно."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Хиймэл дагуулаар мессеж бичихэд илүү удаж болох ба зөвхөн зарим бүсэд боломжтой. Цаг агаар болон тодорхой байгууламжууд таны хиймэл дагуулын холболтод нөлөөлж болно. Хиймэл дагуулаар дуудлага хийх боломжгүй. Яаралтай дуудлагад холбогдсон хэвээр байж магадгүй.\n\nТаны бүртгэлийн өөрчлөлтүүд Тохиргоонд харагдах хүртэл хэсэг хугацаа зарцуулагдаж болно. Дэлгэрэнгүй мэдээлэл авах бол оператор компанитайгаа холбогдоно уу."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Хиймэл дагуулаар мессеж бичих талаарх нэмэлт мэдээлэл"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> удаж магадгүй ба зөвхөн зарим бүсэд боломжтой. Цаг агаар, тодорхой байгууламжууд таны хиймэл дагуулын холболтод нөлөөлж болно. Хиймэл дагуулаар дуудлага хийх боломжгүй. Яаралтай дуудлагад холбогдсон хэвээр байж магадгүй.\n\nТаны бүртгэлийн өөрчлөлт Тохиргоонд харагдах хүртэл хэсэг хугацаа зарцуулж болно. Дэлгэрэнгүй мэдээлэл авах бол <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-тай холбогдоно уу."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g>-н талаарх дэлгэрэнгүй"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g>-г асаах боломжгүй"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g>-г асаахын тулд эхлээд хиймэл дагуулын холболтыг тасална уу"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Хиймэл дагуулын холболт"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Хиймэл дагуулын холболт"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"хиймэл дагуулын холболт"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"хиймэл дагуулаар дамжин мессеж бичих"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Таны бүртгэл хиймэл дагуулаар дамжуулан өгөгдөл дамжуулах боломжтой"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Хиймэл дагуул SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Та хөдөлгөөнт төхөөрөмж, Wi-Fi сүлжээнд холбогдох боломжгүй үедээ яаралтай тусламжийн үйлчилгээтэй мессеж бичнэ үү"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"хиймэл дагуул sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Хиймэл дагуул SOS-н тухай"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Та хөдөлгөөнт төхөөрөмж, Wi-Fi сүлжээнд холбогдох боломжгүй үедээ яаралтай тусламжийн үйлчилгээтэй мессеж бичих, байршлаа хуваалцах боломжтой. Энэ үйлчилгээ бүх байршил, нөхцөл байдалд үргэлж боломжтой биш байж магадгүй."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Яаралтай тусламжийн үйлчилгээ рүү залгах эсвэл мессеж бичнэ үү"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Яаралтай тусламжийн талаарх асуултуудад хариулна уу"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Хиймэл дагуулд холбогдохын тулд алхмуудыг дагана уу"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Хэрэв танд хөдөлгөөнт холбооны сүлжээ байхгүй бол та Хиймэл дагуул SOS-г ашиглах сонголтыг харна"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Танд тохирох тусламж үзүүлэхийн тулд хариултыг яаралтай тусламжийн үйлчилгээ рүү илгээнэ үү"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Та холбогдсоныхоо дараа яаралтай тусламжийн үйлчилгээтэй мессеж бичих боломжтой."</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Демог туршиж үзэх"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Таныг хиймэл дагуулаар холбогдох үед таны нэр, имэйл, утасны дугаар, байршил, төхөөрөмжийн мэдээлэл (IMEI, хэл, загвар, батарейн түвшин), яаралтай тусламжийн үед холбоо барих харилцагчийн мэдээллийг яаралтай тусламжийн үйлчилгээ, хиймэл дагуулын үйлчилгээ үзүүлэгчидтэй хуваалцана. \n\nХиймэл дагуул SOS-г ашиглахын тулд Google Мессеж таны өгөгдмөл SMS апп байх ёстой. \n\nХэрэв сүлжээний автомат сонголт унтраалттай бол үүнийг асаах бөгөөд таны төхөөрөмж дурын сүлжээнд автоматаар холбогдоно."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Хуваалцах сонголт"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Яаралтай тусламжийн үед холбоо барих харилцагч"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Таны Google Бүртгэл"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Яаралтай тусламжийн үйлчилгээтэй хуваалцах мэдээллийг хянах эсвэл шинэчилнэ үү"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Хандах цэгийн нэрс (APN)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-д холбогдсон үед боломжгүй"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Та хуудасны хэмжээ сэлгэх горимын 16 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та 4 КБ горим руу буцаж сэлгээд, дараа нь төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд дахин шинэчилж, үйлдвэрлэлийн тохиргоо руу сэргээнэ. Тухайн төхөөрөмжийг Android руу амжилттай ачаалсны дараа Хөгжүүлэгчийн тохиргоонд OEM түгжээг тайлахыг идэвхгүй болгоно уу. Хэрэв төхөөрөмжийг Android руу ачаалж чадаагүй эсвэл энэ нь тогтворгүй байвал &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; дээрээс төхөөрөмжийг хамгийн сүүлийн үеийн үйлдвэрийн зургаар солих эсвэл &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;-г ашиглаад, \'Төхөөрөмжийг арчих\', \'Эхэлж ачаалагчийг түгжих\', \'Бүх хуваалтыг хүчээр солих\'-ыг сонгоно уу."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 КБ дурын хэмжээтэй хуудасны (page-agnostic) горим"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Цааш унших"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Хуудасны хэмжээнд тохирох горимоор аппыг ажиллуулах"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Алдааны мэдээний удирдагч"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Алдааны мэдээний товчлолыг таны төхөөрөмж дээр ямар апп удирддаг болохыг тодорхойлдог."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Хувийн"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Дамжуулалтыг сонсох"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-р сонсохын тулд аудио дамжуулалтын QR кодыг скан хийнэ үү"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Хуваалцаж байхад нууц үгийг засах боломжгүй. Нууц үгийг өөрчлөхийн тулд эхлээд аудио хуваалцахыг унтраана уу."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Таны нууц үг 4-16 тэмдэгттэй байх ёстой бөгөөд зөвхөн үсэг, тоо, тэмдэг ашиглана уу"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR код сканнер"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Тусламж хэрэгтэй юү?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Хайлтын тохиргоо"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"харилцагчид, хадгалах сан, бүртгэл"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Харилцагчдын хадгалах сан"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Зөвхөн төхөөрөмж"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Шинэ харилцагчдыг бүртгэлтэй синк хийхгүй"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Харилцагчдыг өгөгдмөлөөр таны төхөөрөмжид хадгалж, бүртгэлд тань синк хийнэ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Үндсэн бүртгэлийг тохируулахад алдаа гарлаа"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Үндсэн бүртгэл тохируулаагүй"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Зөвхөн төхөөрөмж"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Төхөөрөмж, %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Эхлүүлэхийн тулд бүртгэл нэмнэ үү"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Харилцагчдыг хаана хадгалах вэ?"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Тойруулж зураад хай"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Дэлгэц дээрээ байгаа контентыг ашиглан хайхын тулд Нүүр хуудасны товч, навигацын бариулд хүрээд удаан дарна уу."</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index a6ff624d192..08024ff40e7 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"स्नोफ्लेक"</item>
     <item msgid="7952183800501346803">"समुद्रकिनाऱ्यावर वापरली जाणारी छत्री"</item>
     <item msgid="799139025758265891">"कारखान्यातील अवजारे"</item>
-    <item msgid="1330084588359129896">"तंबू"</item>
+    <item msgid="8112685757657659269">"पियानो"</item>
     <item msgid="3861584909935022342">"फिल्म रील"</item>
     <item msgid="5827426100157335512">"पुस्तक"</item>
     <item msgid="8585828346253128384">"कमळाचे फूल"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index af086d30637..dde43147c23 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नवीन डिव्हाइससोबत पेअर करा"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लूटूथ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"उद्या आपोआप सुरू करा"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"तुम्ही ब्लूटूथ बंद केल्यास, ते पुढील दिवशी पुन्हा सुरू होते"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"उजवा कान पेअर करा"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"डावा कान पेअर करा"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"तुमचा दुसरा कान पेअर करा"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ब्लूटूथ LE ऑडिओ बंद करा"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"डिव्हाइसला LE ऑडिओ हार्डवेअरसंबंधित क्षमतांचा सपोर्ट असल्यास, ब्लूटूथ LE ऑडिओ वैशिष्‍ट्य बंद करते."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ब्लूटूथ LE ऑडिओ मोड"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ब्लूटूथ LE ऑडिओ ब्रॉडकास्ट UI पूर्वावलोकन सुरू करा"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"वैयक्तिक ऑडिओ शेअरिंग आणि खाजगी ब्रॉडकास्ट यांच्या समावेशासह LE ऑडिओ शेअरिंग UI पूर्वावलोकन सुरू करते"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"डिव्हाइस तपशील यांत LE ऑडिओ टॉगल दाखवा"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ब्लूटूथ LE ऑडिओ अनुमती सूची बायपास करा"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"अनुमती सूचीच्या निकषांची पूर्तता करण्यासाठी LE ऑडिओ पेरिफेरलची पडताळणी केली नसली, तरीही बाय डीफॉल्ट LE ऑडिओ वापरा."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"अ‍ॅपची भाषा"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"सुचवलेल्या भाषा"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"सर्व भाषा"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"सुचवलेल्या"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"सर्व भाषा"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"सर्व प्रदेश"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"सर्व नंबरिंग सिस्टीम"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"सिस्टीम भाषा"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"सिस्टीम डीफॉल्ट"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"या अ‍ॅपसाठीची भाषा निवडणे हे सेटिंग्ज मध्ये उपलब्ध नाही."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"बदला"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s उपलब्ध नाही"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ही भाषा सिस्टीमची भाषा म्हणून वापरली जाऊ शकत नाही, मात्र तुम्ही या भाषेला प्राधान्य देता हे तुम्ही अ‍ॅप्स आणि वेबसाइटना सांगितले आहे."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"शोध"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"भाषा जोडा"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"प्रदेश प्राधान्य"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"भाषा नाव टाइप करा"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"भाषेसंबंधित आणखी सेटिंग्ज"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"प्रादेशिक प्राधान्ये"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"युनिट आणि नंबर प्राधान्ये सेट करा"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"अ‍ॅप्सना तुमची प्रादेशिक प्राधान्ये सांगा ज्यामुळे ते तुमचा अनुभव पर्सनलाइझ करतील."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"शक्य असेल तेथे ॲप्स तुमची प्रादेशिक प्राधान्ये वापरतील."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"प्रादेशिक प्राधान्ये"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"तापमान"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"आठवड्याचा पहिला दिवस"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"क्रमांकांची प्राधान्ये"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"रोमिंग असताना डेटा सेवांवर कनेक्ट करा"</string>
     <string name="roaming_disable" msgid="729512894708689604">"रोमिंगमध्ये असताना डेटा सेवांना कनेक्ट करा"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"रोमिंग शुल्क आकारले जाऊ शकते."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"वेळ आपोआप सेट करा"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"आपोआप सेट करा"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"हे टॉगल सुरू असताना टाइम झोन सेट करण्यासाठी स्थान वापरले जाईल"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ऑटोमॅटिक तारीख आणि वेळ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"तुमचे नेटवर्क आणि वायरलेस सिग्नल वापरून आपोआप सेट करा"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ऑटोमॅटिक टाइम झोन"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"तुमच्या जवळपासच्या मोबाइल नेटवर्कच्या आधारे आपोआप सेट करा"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"तुमचे डिव्हाइस स्थान उपलब्ध असल्यास, ते वापरून आपोआप सेट करा"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकॅल डीफॉल्ट वापरा"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४ तास फॉरमॅट वापरा"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"वेळ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"बोट उचला, नंतर पुन्हा सेन्सरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"फिंगरप्रिंट सेन्सर वापरू शकत नाही"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"दुरुस्तीच्या सेवा पुरवठादाराला भेट द्या."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"स्क्रीन बंद असताना फिंगरप्रिंट अनलॉक"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"स्क्रीन बंद असतानादेखील फिंगरप्रिंट अनलॉक वापरा"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"स्क्रीन बंद असताना अनलॉक करा"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"आणखी सुरक्षा सेटिंग्ज"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"कार्य प्रोफाइल लॉक, एंक्रिप्शन आणि आणखी बरेच काही"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"एंक्रिप्शन, क्रेडेंशियल आणि आणखी बरेच काही"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"तुमच्या खाजगी स्पेससाठी पॅटर्न सेट करा"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"लॉक"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"लपवा"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"तुमचा खाजगी स्पेस पॅटर्न कन्फर्म करा"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"तुमचा खाजगी स्पेस पिन पुन्हा एंटर करा"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"तुमचा खाजगी स्पेस पासवर्ड पुन्हा एंटर करा"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत फिंगरप्रिंट जोडू शकता"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"तुम्ही जास्तीत जास्त फिंगरप्रिंट जोडले आहेत"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"आणखी फिंगरप्रिंट जोडू शकत नाही"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"सुरू आहे"</string>
     <string name="external_display_off" msgid="5634413756025351374">"बंद आहे"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"बाह्य डिस्प्ले"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"बिल्ट-इन डिस्प्ले"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"बाह्य डिस्प्ले वापरा"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"डिस्प्ले रेझोल्यूशन"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"बाह्य डिस्प्ले डिस्कनेक्ट केला आहे"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"रोटेशन किंवा रेझोल्यूशन बदलल्याने सध्या सुरू असलेली कोणतीही अ‍ॅप्स थांबू शकतात"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"तुमची स्क्रीन मिरर करण्यासाठी तुमचे डिव्हाइस बाह्य डिस्प्लेशी कनेक्ट केलेले असणे आवश्यक आहे"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"आणखी पर्याय"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"डिस्प्ले पुन्हा संगतवार लावण्यासाठी धरून ठेवून ड्रॅग करा."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्‍ट करा"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"मिरर करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस डिस्प्ले सुरू करा"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"पासवर्ड तपासा आणि पुन्हा प्रयत्न करा"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"डिव्हाइसच्या निर्मात्याशी संपर्क साधा"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"कनेक्शन तपासा आणि पुन्हा प्रयत्न करा"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"हे वाय-फाय नेटवर्क सध्या उपलब्ध नाही"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"या QR कोडमध्ये समस्या आहे. दुसऱ्या पद्धतीने कनेक्ट करण्याचा प्रयत्न करा."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"नेटवर्क निवडा"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"तुमच्या डिव्हाइसशी कनेक्ट करण्यासाठी, नेटवर्क निवडा"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"हे डिव्हाइस “<xliff:g id="SSID">%1$s</xliff:g>” वर जोडायचे?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ऑटो-रोटेटबद्दल अधिक जाणून घ्या"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"स्क्रीन रेझोल्यूशन"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"उच्च रेझोल्यूशन"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"पूर्ण रेझाेल्यूशन"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"पूर्ण रेझोल्यूशन तुमची बॅटरी जास्त वापरते. तुमचे रेझोल्यूशन स्विच केल्याने काही ॲप्स रीस्टार्ट होऊ शकतात."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"कमाल रेझोल्यूशन"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"कमाल रेझोल्यूशन तुमची बॅटरी जास्त वापरते. तुमचे रेझोल्यूशन स्विच केल्याने काही ॲप्स रीस्टार्ट होऊ शकतात."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"निवडले"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"नैसर्गिक"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"अडॅप्टिव्ह"</string>
     <string name="brightness" msgid="6216871641021779698">"ब्राइटनेस पातळी"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"अडॅप्टिव्ह ब्राइटनेस"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"अडॅप्टिव्ह ब्राइटनेसबद्दल"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"तुमच्या स्क्रीनचा ब्राइटनेस तुमच्या वातावरण आणि अ‍ॅक्टिव्हिटीशी आपोआप अ‍ॅडजस्ट होईल. अडॅप्टिव्ह ब्राइटनेसला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर मॅन्युअली हलवू शकता."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"सुरू"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"बंद"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"बेडटाइम मोडशी संबंधित सेटिंग्ज"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{मोड गडद थीमदेखील अ‍ॅक्टिव्हेट करू शकतात}=1{{mode_1} गडद थीमदेखील अ‍ॅक्टिव्हेट करतो}=2{{mode_1} आणि {mode_2} हे गडद थीमदेखील अ‍ॅक्टिव्हेट करतात}=3{{mode_1}, {mode_2} आणि {mode_3} हे गडद थीमदेखील अ‍ॅक्टिव्हेट करतात}other{{mode_1}, {mode_2} आणि आणखी # हे गडद थीमदेखील अ‍ॅक्टिव्हेट करतात}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"मोडची सेटिंग्ज"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"आणखी मंद"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"आणखी डिम"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"डिव्हाइसचा प्रकाश नेहमीपेक्षा मंद असू द्या"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रीन टाइमआउट"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"इनॅक्टिव्हिटीच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"स्‍थान सेवा"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"स्‍थान सेवा"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"स्थान वापरा"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"टाइम झोनसाठी स्थान वापरा"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"टाइम झोन आपोआप सेट करू शकत नाही"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"स्थान किंवा स्थान सेवा बंद आहेत"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"स्थान सेटिंग्ज"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"हे दुरुस्त करा"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"रद्द करा"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ऑटोमॅटिक टाइम झोन बंद आहे"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ऑटोमॅटिक टाइम झोन बंद असतो, तेव्हा उपलब्ध नसते"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"टाइम झोन सेट करण्यासाठी स्थान वापरले जाऊ शकते"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"तुमचे डिव्हाइस स्थान उपलब्ध असल्यास, ते तुमचा टाइम झोन सेट करण्यासाठी वापरले जाऊ शकते"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"कायदेशीर माहिती, स्थिती, सॉफ्टवेअर आवृत्ती पहा"</string>
     <string name="legal_information" msgid="7509900979811934843">"कायदेशीर माहिती"</string>
     <string name="manual" msgid="3651593989906084868">"व्यक्तिचलित"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"पर्याय"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"अ‍ॅक्सेसिबिलिटी"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"वास्तविक कीबोर्ड"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"बाउन्स की"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"कीबोर्ड <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> मिसेमध्ये एकच की वारंवार प्रेस करण्याकडे दुर्लक्ष करतो"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"कीबोर्ड एकसारख्या की झटपट वारंवार प्रेस करण्याकडे दुर्लक्ष करतो"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"बाउन्स कीची मर्यादा"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"तुमचा कीबोर्ड वारंवार की प्रेस करण्याकडे दुर्लक्ष करतो तो कालावधी निवडा"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"०.२से"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"०.४से"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"०.६से"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"कस्टम"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"कस्‍टम मूल्य"</string>
     <string name="slow_keys" msgid="2891452895499690837">"स्लो की"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> मिसेपर्यंत अ‍ॅक्टिव्हेट होण्यासाठी की प्रेस करण्याकरिता लागणारा वेळ अ‍ॅडजस्ट करा"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ॲक्टिव्हेट करण्यासाठी की प्रेस करण्याकरिता लागणारा वेळ ॲडजस्ट करतात"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"स्टिकी की"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"की एकत्र धरून ठेवण्याऐवजी शॉर्टकटसाठी एकावेळी एक की प्रेस करा"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस की"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"माउस नियंत्रणासाठी वास्तविक कीबोर्ड वापरा."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"माउस की वापरा"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"पॉइंटर नियंत्रित करण्यासाठी तुमचा कीबोर्ड वापरा"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउस रिव्हर्स स्क्रोलिंग"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज खाली हलवण्यासाठी वरती स्क्रोल करा"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"डावे व उजवे बटण स्वॅप करा"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माऊसच्या डाव्या बटणाला तुमचे उजवे बटण म्हणून वापरा"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> साठी माउस की"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"माउस पॉइंटर हलवण्यासाठी <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> की वापरा"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"प्राथमिक माउस बटणावर क्लिक करण्यासाठी <xliff:g id="CLICK_LABEL">%s</xliff:g> की वापरा"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"प्रेस करण्यासाठी <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> की वापरा आणि प्राथमिक माउस बटण धरून ठेवा"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"प्राथमिक माउस बटण रिलीझ करण्यासाठी <xliff:g id="RELEASE_LABEL">%s</xliff:g> की वापरा"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"स्क्रोल मोड टॉगल करण्यासाठी <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> वापरा. हे <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> की ला वरती, खाली, डावीकडील किंवा उजवीकडील दृश्यावर स्क्रोल करू देईल"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"दुय्यम माउस बटणावर क्लिक करण्यासाठी <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> की वापरा"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"कीबोर्ड शॉर्टकट"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"शॉर्टकटची सूची दाखवा"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"कार्य प्रोफाइल कीबोर्ड आणि टूल"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"डीफॉल्ट"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"टचपॅड"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"टचपॅड आणि माउस"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"माउस"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"पॉइंटर वेग, जेश्चर"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"क्लिक करण्यासाठी टॅप करा"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"टॅप करून ड्रॅग करणे"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"तळाशी उजवीकडे क्लिक करा"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"अधिक पर्यायांसाठी टचपॅडच्या तळाशी उजव्या कोपऱ्यावर क्लिक करा"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"पॉइंटर वेग"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"तीन बोट वापरून टॅप करा"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"पॉइंटरचा रंग"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"पॉइंटर फिलची शैली बदलून काळी करा"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"पॉइंटर फिलची शैली बदलून हिरवी करा"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"टचपॅड जेश्चर जाणून घ्या"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ट्रॅकपॅड, ट्रॅक पॅड, माउस, कर्सर, स्क्रोल करा, स्‍वाइप करा, राइट-क्लिक करा, क्लिक करा, पॉइंटर"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"राइट-क्लिक करा, टॅप करा"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"मध्यभागी क्लिक करा"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant लाँच करा"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"होमवर जा"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"मागे जा"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"अलीकडील अ‍ॅप्स पहा"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"होमवर जा"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"तुमच्या टचपॅडवर कुठेही तीन बोटांनी वरती स्‍वाइप करा"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"मागे जा"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> साठी नवीन की निवडा:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"वास्तविक कीबोर्ड अ‍ॅक्सेसिबिलिटी"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी की, बाउन्स की, माउस की"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"की रिपीट करा"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"रिपीट करण्यापूर्वीचा विलंब"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"रिपीट करण्याचा दर"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"एखादी की रिलीझ करेपर्यंत तिचा वर्ण रिपीट करण्यासाठी ती की धरून ठेवा"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डीफॉल्ट"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ऑटोमॅटिक: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"पूर्वावलोकन"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"मानक पर्याय"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"मजकूर आकार"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"कॅप्शनचा आकार"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"कॅप्शन शैली"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"कस्टम पर्याय"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"बॅकग्राउंडचा रंग"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"समाविष्ट पॅकेज"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"अ‍ॅप्स नेहमीप्रमाणे चालत आहेत"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"बॅटरी बदलण्याची शिफारस केली आहे"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"बॅटरी क्षमता आणि चार्जिंग परफॉर्मन्स कमी झाला असून, बॅटरी बदलण्याची शिफारस केली आहे."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"बॅटरीची पातळी कमी आहे"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"बॅटरी लाइफ वाढवण्यासाठी बॅटरी सेव्हर सुरू करा"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"बॅटरी लाइफ सुधारा"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"हे VPN डिस्कनेक्ट करायचे?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"‍डिस्कनेक्ट करा"</string>
     <string name="vpn_version" msgid="6344167191984400976">"आवृत्ती"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"आवृत्ती <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN विसरा"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"विद्यमान VPN पुनर्स्थित करायचे?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"नेहमी-सुरू VPN सेट करायचे?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"आठवड्यातील दिवस सकाळी ९ - संध्याकाळी ५\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"कॅलेंडर इव्हेंट"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} अ‍ॅक्टिव्ह आहे}=2{{mode_1} आणि {mode_2} अ‍ॅक्टिव्ह आहेत}=3{{mode_1}, {mode_2} आणि{mode_3} अ‍ॅक्टिव्ह आहेत}other{{mode_1}, {mode_2} आणि आणखी # अ‍ॅक्टिव्ह आहेत}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{१ मोड आपोआप सुरू होऊ शकतो}other{# मोड आपोआप सुरू होऊ शकतात}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"सुरू आहे"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"सेट केलेला नाही"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"बंद केला आहे"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"समजले"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"सूचना"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"कालावधी"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"मेसेज, इव्हेंट आणि रिमाइंडर"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"झाले"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"सेटिंग्ज"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"सूचना आल्यावर आवाज नाही"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"तुम्हाला सूचना दिसणार नाहीत किंवा ऐकू येणार नाहीत. तारांकित संपर्कांकडून आलेले कॉल आणि नियमित कॉलरना अनुमती आहे."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(वर्तमान सेटिंग)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"व्यत्यय आणू नका सूचना सेटिंग्ज बदलायच्या?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"कार्य प्रोफाइल आवाज"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"वैयक्तिक प्रोफाइलचा आवाज वापरा"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"तुमच्या वैयक्तिक प्रोफाइलसारखाच आवाज वापरा"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"अनलॉक केल्यानंतर, थेट शेवटच्या वापरलेल्या स्क्रीनवर जा. लॉक स्‍क्रीनवर सूचना दिसणार नाहीत. त्या पाहण्यासाठी, वरपासून खाली स्‍वाइप करा."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, वगळा, बायपास"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"कार्य प्रोफाइल लॉक केली असताना"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"लॉक स्‍क्रीन नोटिफिकेशन मिनिमलिझम"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"लॉक स्‍क्रीनवर काही नोटिफिकेशन दाखवा"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"लॉक स्क्रीनवर फक्त नवीन सूचना दाखवा"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"लॉक स्‍क्रीनवरून आधी पाहिलेल्या सूचना आपोआप हटवा"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"लॉक स्‍क्रीनवरील नोटिफिकेशन"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"संभाषणे, डीफॉल्ट आणि सायलंट असलेल्या सूचना दाखवा"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"संभाषणे, डीफॉल्ट आणि सायलंट असलेल्या सूचना दाखवा"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"सर्व कार्य सूचना आशय दर्शवा"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"संवेदनशील कार्य आशय लपवा"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"तुमचे डिव्हाइस लॉक केले असताना, प्रोफाईल सूचना कशा दर्शविल्या जाव्यात असे तुम्ही इच्छिता?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"तुम्हाला थोड्या कालावधीमध्ये बरीच नोटिफिकेशन मिळतात, तेव्हा तुमचे डिव्हाइस त्याचा व्हॉल्यूम कमी करेल आणि स्क्रीनवरील सूचनांना २ मिनिटांपर्यंत कमी करेल. कॉल, अलार्म आणि प्राधान्य दिलेल्या संभाषणांवर परिणाम होत नाहीत. \n\nकूलडाउनदरम्यान मिळालेली नोटिफिकेशन स्क्रीनच्या वरून खालपर्यंत स्वाइप करून शोधली जाऊ शकतात."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"कार्य प्रोफाइलला लागू करा"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"कार्य प्रोफाइलच्या अ‍ॅप्सना लागू करा"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"बंडल केलेली नोटिफिकेशन"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"सुरू आहे"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"बंद आहे"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"नोटिफिकेशन बंडलिंग वापरा"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"आणखी शांत अनुभवासाठी समान थीम असलेली नोटिफिकेशन सायलंट करून ती एकत्र गटबद्ध केली जातील. बंडलिंग ॲपची स्वतःची नोटिफिकेशन सेटिंग्ज ओव्हरराइड करेल."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR मदतनीस सेवा"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कोणत्याही इंस्टॉल केलेल्या अ‍ॅप्सनी VR मदतनीस सेवा म्हणून चालवण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"प्राधान्य दिलेली संभाषणे"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोणतीही नाहीत"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{काहीही नाही}=1{एक संभाषण}other{# संभाषणे}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"संभाषणे सेटिंग्ज"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"कोण व्यत्यय आणू शकतात"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"मेसेजिंग किंवा कॉलिंग ॲप्स तुम्हाला सूचित करू शकत नसली, तरीही तुम्ही येथे निवडलेले लोक अजूनही त्या ॲप्सद्वारे तुमच्याशी संपर्क साधू शकतात"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोणीही"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"तारांकित संपर्क"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"संपर्क सेटिंग्ज"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"तारांकित केलेले संपर्क सेटिंग्ज"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"कोणतेही नाहीत"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"कोणतेही नाहीत"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्म"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ऑफिस)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"मोजत आहे…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"अ‍ॅप्स सेटिंग्ज"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ॲप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"व्यत्यय आणू शकणारी ॲप्स"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"मोड तयार करा"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोडचे नाव"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"मोडचे नाव रिक्त असू शकत नाही"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"आयकन निवडा"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"कॅलेंडर इव्हेंट"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"झोपतानाचे वेळापत्रक"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ड्राइव्ह करत असताना"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"फुल-स्क्रीन नोटिफिकेशन"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"या ॲपवरील फुल-स्क्रीन नोटिफिकेशनना अनुमती द्या"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"डिव्‍हाइस लॉक असताना या ॲपला फुल स्क्रीन वापरणाऱ्या सूचना दाखवण्‍याची अनुमती द्या. ॲप्स यांचा वापर अलार्म, इनकमिंग कॉल किंवा इतर तातडीच्या सूचना हायलाइट करण्यासाठी करू शकतात."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"सिस्टीमसंबंधित प्राधान्ये राइट करणे"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"या ॲपला सिस्टीमसंबंधित प्राधान्यांमध्ये बदल करण्याची अनुमती द्या"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ही परवानगी ॲपला सिस्टीमसंबंधित मुख्य प्राधान्यांमध्ये बदल करण्याची अनुमती देते."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"मीडिया व्यवस्थापन ॲप्स"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ॲपला मीडिया व्यवस्थापित करण्याची अनुमती द्या"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"अनुमती दिल्यास, हे ॲप तुमची परवानगी न घेता, इतर ॲप्स वापरून तयार केलेल्या मीडिया फाइलमध्ये बदल करू शकते किंवा त्या हटवू शकते. ॲपला फाइल आणि मीडिया अ‍ॅक्सेस करण्याची परवानगी असणे आवश्यक आहे."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"जेश्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"कॅमेरा झटपट उघडा"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"कॅमेरा झटपट उघडण्यासाठी, पॉवर बटण दोनदा प्रेस करा. कोणत्याही स्क्रीनवरून कार्य करते."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"सेल्फीसाठी कॅमेरा फ्लिप करा"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"नेव्हिगेशन मोड"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"उपग्रह मेसेजिंग"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"उपग्रहाद्वारे एसएमएस पाठवा आणि मिळवा. तुमच्या खात्यामध्ये समावेश आहे."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"सॅटेलाइटद्वारे एसएमएस पाठवा आणि मिळवा. तुमच्या खात्यात समाविष्ट नाही."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"उपग्रह मेसेजिंग"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"उपग्रह मेसेजिंगबद्दल"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"सॅटेलाइट मेसेजिंग, सॅटेलाइट कनेक्टिव्हिटी"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> विषयी"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"तुम्ही <xliff:g id="CARRIER_NAME">%1$s</xliff:g> खात्याच्या पात्रतेचा भाग म्हणून उपग्रहाद्वारे एसएमएस पाठवू आणि मिळवू शकता"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"तुमचा <xliff:g id="CARRIER_NAME">%1$s</xliff:g> प्लॅन"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"तुमच्या खात्यामध्ये उपग्रह मेसेजिंगचा समावेश आहे"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"तुमच्या खात्यामध्ये मेसेजिंगचा समावेश केला आहे"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"उपग्रह मेसेजिंगचा तुमच्या खात्यामध्ये समावेश केलेला नाही"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"अधिक जाणून घ्या"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ते कसे काम करते"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"तुमचा फोन उपग्रहाशी ऑटो-कनेक्ट होईल. सर्वोत्तम कनेक्शनसाठी, आकाश स्पष्ट दिसेल अशा ठिकाणी बाहेर उभे रहा."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"तुमचा फोन उपग्रहाशी जोडल्यानंतर"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"आणीबाणी सेवांसह तुम्ही कोणालाही एसएमएस पाठवू शकता. उपलब्ध असेल, तेव्हा तुमचा फोन मोबाइल नेटवर्कशी पुन्हा कनेक्ट होईल."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"उपग्रह मेसेजिंगला जास्त वेळ लागू शकतो आणि ते फक्त काही भागांमध्येच उपलब्ध आहे. हवामान आणि विशिष्ट संरचना तुमच्या उपग्रह कनेक्शनवर परिणाम करू शकतात. उपग्रहाद्वारे कॉल करणे उपलब्ध नाही. आणीबाणी कॉल अजूनही कनेक्ट होऊ शकतात.\n\nखात्यामधील बदल सेटिंग्ज मध्ये दिसण्यासाठी काही वेळ लागू शकतो. तपशिलांसाठी तुमच्या वाहकाशी संपर्क साधा."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"उपग्रह मेसेजिंगबद्दल अधिक"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> ला जास्त वेळ लागू शकतो आणि ते फक्त काही भागांमध्ये उपलब्ध आहे. हवामान आणि विशिष्ट संरचना तुमच्या सॅटेलाइट कनेक्शनवर परिणाम करू शकतात. सॅटेलाइटद्वारे कॉल करणे उपलब्ध नाही. आणीबाणी कॉल अजूनही कनेक्ट होऊ शकतात.\n\nखात्यामधील बदल सेटिंग्ज मध्ये दिसण्यासाठी काही वेळ लागू शकतो. तपशिलांसाठी <xliff:g id="CARRIER_NAME">%1$s</xliff:g> शी संपर्क साधा."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> बद्दल आणखी"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> सुरू करू शकत नाही"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> सुरू करण्यासाठी, सर्वप्रथम उपग्रह कनेक्शन बंद करा"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"सॅटेलाइट कनेक्टिव्हिटी"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"सॅटेलाइट कनेक्टिव्हिटी"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"सॅटेलाइट कनेक्टिव्हिटी"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"सॅटेलाइट मेसेजिंग"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"तुमच्या खात्यामध्ये डेटाच्या वापराचा समावेश केला आहे"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"सॅटेलाइट SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"तुम्ही मोबाइल किंवा वाय-फाय नेटवर्कशी कनेक्ट करू शकत नसाल, तेव्हा आणीबाणीच्या सेवांसोबत मेसेज पाठवा"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"सॅटेलाइट SOS, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"सॅटेलाइट SOS बद्दल"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"तुम्ही मोबाइल किंवा वाय-फाय नेटवर्कशी कनेक्ट करू शकत नाही, तेव्हा तुम्ही आणीबाणीच्या सेवांसोबत मेसेज पाठवू शकता आणि तुमचे स्थान शेअर करू शकता. ही सेवा सर्व ठिकाणी किंवा परिस्थितीमध्ये नेहमीच उपलब्ध नसेल."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"आणीबाणी सेवांना कॉल करा किंवा एसएमएस पाठवा"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"आणीबाणीबद्दलच्या प्रश्नांना उत्तर द्या"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"सॅटेलाइटशी कनेक्ट करण्यासाठी पायऱ्या फॉलो करा"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"तुमच्याकडे मोबाईल नेटवर्क नसल्यास, तुम्हाला सॅटेलाइट SOS वापरण्याचा पर्याय दिसेल"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"तुम्हाला योग्य प्रकारची मदत मिळवून देण्यासाठी आणीबाणी सेवांना उत्तरे पाठवा"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"तुम्ही कनेक्ट झाल्यानंतर, आणीबाणी सेवांना मेसेज पाठवू शकता"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"डेमो वापरून पहा"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"तुम्ही सॅटेलाइटद्वारे आणीबाणी सेवांशी कनेक्ट करता, तेव्हा तुमचे नाव, ईमेल, फोन नंबर, स्थान, डिव्हाइस माहिती (IMEI, भाषा, मॉडेल, बॅटरी पातळी) आणि आणीबाणी संपर्क माहिती या गोष्टी आणीबाणी सेवा व सॅटेलाइट सेवा पुरवठादारांसोबत शेअर केल्या जातात. \n\nसॅटेलाइट SOS वापरण्यासाठी, Google Messages हे तुमचे डीफॉल्ट एसएमएस अ‍ॅप असणे आवश्यक आहे. \n\nऑटोमॅटिक नेटवर्क निवड बंद असल्यास ते सुरू होईल आणि तुमचे डिव्हाइस आपोआप कोणत्याही नेटवर्कशी कनेक्ट होईल."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"शेअर करण्यासंबंधित प्राधान्ये"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"आणीबाणी संपर्क"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"तुमचे Google खाते"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"आणीबाणी सेवांसोबत शेअर केल्या जाणाऱ्या माहितीचे पुनरावलोकन करा किंवा ती अपडेट करा"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"अ‍ॅक्सेस पॉइंट"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"तुम्ही पेज-अ‍ॅग्नॉस्टिक मोडच्या १६KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अ‍ॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला ४KB मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसचा बूटलोडर लॉक करावा लागेल. यामुळे डिव्हाइस पुन्हा फॅक्टरी रीसेट होईल आणि उत्पादन सेटिंग्जवर रिस्टोअर केले जाईल. Android मध्ये डिव्हाइस यशस्वीरीत्या बूट झाल्यानंतर, डेव्हलपर पर्यायांमध्ये OEM अनलॉक करणे हे बंद करा. डिव्हाइस Android मध्ये बूट होत नसल्यास किंवा ते अस्थिर असल्यास, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; येथील नवीनतम फॅक्टरी इमेजच्या मदतीने डिव्हाइस पुन्हा फ्लॅश करा किंवा &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; वापरा आणि \'डिव्हाइस पुसून टाका\', \'बूटलोडर लॉक करा\' व \'सर्व पार्टिशन सक्तीने फ्लॅश करा\' हे निवडा."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"१६KB पेज अज्ञात मोड"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"आणखी वाचा"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"पेज आकार कंपॅटिबिलिटी मोडसह रन करा"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"बग रिपोर्ट हँडलर"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"कोणते ॲप तुमच्या डिव्हाइसवरील बग रिपोर्ट शॉर्टकट हाताळेल हे निर्धारित करते."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"वैयक्तिक"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"स्ट्रीम ऐका"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> वापरून ऐकण्यासाठी ऑडिओ स्ट्रीमचा QR कोड स्कॅन करा"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"शेअर करताना पासवर्ड संपादित करू शकत नाही. पासवर्ड बदलण्यासाठी सर्वप्रथम ऑडिओ शेअरिंग बंद करा."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"तुमच्या पासवर्डमध्ये ४ ते १६ वर्णांचा समावेश असणे आवश्यक आहे आणि फक्त अक्षरे, नंबर व चिन्हे वापरा"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR कोड स्कॅनर"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"मदत हवी आहे का?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"शोध सेटिंग्ज"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"संपर्क, स्टोरेज, खाते"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"संपर्क स्टोरेज"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"केवळ डिव्हाइस"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"खात्यासह नवीन संपर्क सिंक केले जाणार नाहीत"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"संपर्क हे तुमच्या डिव्हाइसमध्ये सेव्ह केले जातील आणि बाय डीफॉल्ट तुमच्या खात्यामध्ये सिंक केले जातील"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"डीफॉल्ट खाते सेट करताना एरर आली"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"कोणतेही डीफॉल्ट अकाउंट सेट केलेले नाही"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"केवळ डिव्हाइस"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिव्हाइस आणि %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरू करण्यासाठी एखादे खाते जोडा"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"संपर्क कुठे सेव्ह करावेत"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"शोधण्यासाठी वर्तुळ करा"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"तुमच्या स्क्रीनवरील आशय वापरून शोधण्यासाठी होम बटण किंवा नेव्हिगेशन हँडल स्‍पर्श करून धरून ठेवा."</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 11c476106b3..9065ddba117 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Emping salji"</item>
     <item msgid="7952183800501346803">"Payung pantai"</item>
     <item msgid="799139025758265891">"Alatan bengkel"</item>
-    <item msgid="1330084588359129896">"Khemah"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Gelendong filem"</item>
     <item msgid="5827426100157335512">"Buku"</item>
     <item msgid="8585828346253128384">"Bunga teratai"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 449fbbf661d..bb796df4385 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Gandingkan peranti baharu"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Hidupkan secara automatik pada hari esok"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth yang dimatikan akan dihidupkan semula hari esoknya"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Gandingkan telinga kanan"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Gandingkan telinga kiri"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Gandingkan telinga lagi satu"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Lumpuhkan Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Melumpuhkan ciri Bluetooth LE Audio jika peranti menyokong keupayaan perkakasan LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Mod Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Dayakan pratonton UI Siaran Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Dayakan pratonton UI Perkongsian LE Audio termasuk perkongsian audio peribadi dan siaran peribadi"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Tunjukkan togol LE Audio pada Butiran Peranti"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Abaikan Senarai Dibenarkan Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Gunakan LE Audio secara lalai walaupun persisian LE Audio belum disahkan sebagai memenuhi kriteria Senarai Dibenarkan."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Bahasa apl"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Bahasa yang dicadangkan"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Semua bahasa"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Dicadangkan"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Semua bahasa"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Semua rantau"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Semua sistem penomboran"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Bahasa sistem"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Lalai sistem"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Pemilihan bahasa untuk apl ini tidak tersedia daripada Tetapan."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Tukar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s tidak tersedia"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bahasa ini tidak boleh digunakan sebagai bahasa sistem, tetapi anda telah membenarkan apl dan laman web menerimanya sebagai bahasa pilihan anda."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Cari"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Tambahkan bahasa"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Pilihan wilayah"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Taipkan nama bahasa"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Lebih banyak tetapan bahasa"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Tetapan wilayah"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Tetapkan pilihan unit dan nombor"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Beritahu apl tetapan wilayah anda supaya apl boleh memeribadikan pengalaman anda."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apl akan menggunakan tetapan wilayah anda jika boleh."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Tetapan wilayah"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Suhu"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Hari pertama dalam minggu"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Pilihan nombor"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Sambung ke perkhidmatan data semasa perayauan"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Sambung ke perkhidmatan data semasa melakukan perayauan"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Caj perayauan mungkin dikenakan."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Tetapkan masa secara automatik"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Tetapkan secara automatik"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Lokasi akan digunakan untuk menetapkan zon waktu apabila suis togol ini dihidupkan"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Tarikh dan masa automatik"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Tetapkan secara automatik menggunakan isyarat rangkaian dan wayarles anda"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Zon waktu automatik"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Tetapkan secara automatik berdasarkan rangkaian mudah alih berdekatan anda"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Tetapkan secara automatik menggunakan lokasi peranti anda, jika tersedia"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan tetapan lalai tempat peristiwa"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Masa"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Angkat jari, kemudian sentuh penderia sekali lagi"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Tidak dapat menggunakan penderia cap jari"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Lawati penyedia pembaikan."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Buka Kunci Cap Jari Semasa Skrin Mati"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Gunakan Buka Kunci Cap Jari walaupun semasa skrin dimatikan"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Skrin dimatikan, Buka kunci"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Lagi tetapan keselamatan"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Kunci profil kerja, penyulitan dan banyak lagi"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Penyulitan, bukti kelayakan dan banyak lagi"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Tetapkan corak untuk ruang peribadi anda"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kunci"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Sembunyikan"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Sahkan corak ruang persendirian anda"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Masukkan semula PIN ruang persendirian anda"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Masukkan semula kata laluan ruang persendirian anda"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> cap jari"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Anda telah menambahkan bilangan maksimum cap jari"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Tidak boleh menambahkan lagi cap jari"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Hidup"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Mati"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Paparan Luaran"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Paparan terbina dalam"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Gunakan paparan luaran"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Peleraian paparan"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Paparan luaran diputuskan sambungan"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Penukaran putaran atau peleraian boleh menghentikan mana-mana apl yang sedang dijalankan"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Peranti anda mestilah disambungkan kepada paparan luaran untuk mencerminkan skrin anda"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Lagi pilihan"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Tahan dan seret untuk menyusun semula paparan."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Dayakan paparan wayarles"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Semak kata laluan, kemudian cuba lagi"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Hubungi pengilang peranti"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Periksa sambungan, kemudian cuba lagi"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Rangkaian Wi-Fi ini tidak tersedia sekarang"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Terdapat masalah dengan kod QR ini. Cuba sambung dengan cara lain."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Pilih rangkaian"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Pilih rangkaian untuk menyambung peranti anda"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Tambahkan peranti ini pada “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Ketahui lebih lanjut tentang autoputar"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Peleraian skrin"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Peleraian tinggi"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Peleraian penuh"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Peleraian penuh menggunakan lebih banyak bateri. Penukaran peleraian mungkin menyebabkan sesetengah apl dimulakan semula."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Peleraian maksimum"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Peleraian maksimum menggunakan lebih banyak bateri anda. Penukaran peleraian anda mungkin menyebabkan sesetengah apl dimulakan semula."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Dipilih"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Asli"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Boleh suai"</string>
     <string name="brightness" msgid="6216871641021779698">"Tahap kecerahan"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Kecerahan boleh suai"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Perihal kecerahan boleh suai"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Kecerahan skrin akan dilaraskan secara automatik dengan persekitaran dan aktiviti anda. Anda boleh mengalihkan peluncur secara manual untuk membantu kecerahan boleh suai mempelajari pilihan anda."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Hidup"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Mati"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Tetapan mod waktu tidur"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Mod juga boleh mengaktifkan tema gelap}=1{{mode_1} turut mengaktifkan tema gelap}=2{{mode_1} dan {mode_2} turut mengaktifkan tema gelap}=3{{mode_1}, {mode_2} dan {mode_3} turut mengaktifkan tema gelap}other{{mode_1}, {mode_2} dan # lagi turut mengaktifkan tema gelap}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Tetapan mod"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Lebih malap"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Amat malap"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Benarkan peranti menjadi lebih malap daripada biasa"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tamat masa skrin"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1623,7 +1647,7 @@
     <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 dan perkhidmatan berasaskan lokasi."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Perkhidmatan lokasi"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Perkhidmatan lokasi"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Gunakan lokasi"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Gunakan lokasi untuk zon waktu"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Tidak dapat menetapkan zon waktu secara automatik"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokasi atau Perkhidmatan Lokasi dimatikan"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Tetapan lokasi"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Betulkan isu ini"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Batal"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Zon waktu automatik dimatikan"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Tidak tersedia apabila zon waktu automatik dimatikan"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokasi mungkin digunakan untuk menetapkan zon waktu"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Jika lokasi peranti anda tersedia, ciri ini mungkin digunakan untuk menetapkan zon waktu anda"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Lihat maklumat undang-undang, status, versi perisian"</string>
     <string name="legal_information" msgid="7509900979811934843">"Maklumat undang-undang"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Pilihan"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Kebolehaksesan"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Papan kekunci fizikal"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Pemilih reka letak papan kekunci fizikal"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Kekunci lantun"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Papan kekunci mengabaikan penekanan kekunci yang sama secara berulang dan cepat dalam masa <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Papan kekunci mengabaikan tekanan kekunci yang sama secara berulang"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ambang kekunci lantun"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pilih tempoh masa papan kekunci anda mengabaikan tekanan kekunci yang berulang"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Tersuai"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"nilai tersuai"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Kekunci perlahan"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Melaraskan masa yang diambil untuk mengaktifkan tekanan kekunci kepada <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Laraskan masa yang diambil untuk mengaktifkan tekanan kekunci"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Kekunci Lekit"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tekan satu kekunci pada satu-satu masa untuk pintasan, bukan menahan beberapa kekunci secara serentak"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Kekunci tetikus"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Gunakan papan kekunci fizikal untuk mengawal tetikus."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Gunakan kekunci tetikus"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gunakan papan kekunci anda untuk mengawal penuding"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Penatalan terbalik tetikus"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Tatal ke atas untuk menggerakkan halaman ke bawah"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Tukar butang kiri ke kanan dan kanan ke kiri"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gunakan butang tetikus kiri sebagai klik kanan anda"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Kekunci tetikus untuk <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Gunakan kekunci <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> untuk menggerakkan penuding tetikus"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Gunakan kekunci <xliff:g id="CLICK_LABEL">%s</xliff:g> untuk mengklik butang tetikus utama"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Gunakan kekunci <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> untuk menekan &amp; menahan butang tetikus utama"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Gunakan kekunci <xliff:g id="RELEASE_LABEL">%s</xliff:g> untuk melepaskan butang tetikus utama"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Gunakan kekunci <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> untuk menogol mod tatal. Fungsi ini akan membolehkan kekunci <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> menatal paparan ke atas, bawah, kiri atau kanan"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Gunakan kekunci <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> untuk mengklik butang tetikus kedua"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pintasan papan kekunci"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tunjukkan senarai pintasan"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Papan kekunci &amp; alatan profil kerja"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Lalai"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Pad sentuh"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Pad sentuh &amp; tetikus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Tetikus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Kelajuan penuding, gerak isyarat"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Ketik untuk klik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Penyeretan ketik"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik bahagian bawah sebelah kanan"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klik penjuru bawah sebelah kanan pad sentuh untuk lagi pilihan"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kelajuan penuding"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Gunakan ketikan tiga jari"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Warna penuding"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Tukar gaya isian penunjuk kepada warna hitam"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Tukar gaya isian penunjuk kepada warna hijau"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Ketahui gerak isyarat pad sentuh"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"pad jejak, pad jejak, tetikus, kursor, tatal, leret, klik kanan, klik, penuding"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"klik kanan, ketik"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Klik tengah"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Lancarkan Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Akses laman utama"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Kembali"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Lihat apl terbaharu"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Pergi ke skrin utama"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Leret ke atas dengan tiga jari di mana-mana sahaja pada pad sentuh anda"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Kembali"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih kunci baharu untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Kebolehaksesan papan kekunci fizikal"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Kekunci lekit, Kekunci lantun, Kekunci tetikus"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Kekunci Berulang"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Lengah sebelum ulang"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Kadar Pengulangan"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Tahan kekunci ke bawah untuk mengulangi aksara tersebut sehingga kekunci tersebut dilepaskan"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Reka letak <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lalai"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pratonton"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Pilihan standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Bahasa"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Saiz teks"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Saiz sari kata"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Gaya sari kata"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Pilihan tersuai"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Warna latar belakang"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Laraskan penggunaan kuasa"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pakej yang disertakan"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apl berjalan seperti biasa"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Penggantian bateri disyorkan"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapasiti bateri dan prestasi pengecasan dikurangkan. Penggantian bateri disyorkan."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Aras bateri rendah"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Hidupkan Penjimat Bateri bagi melanjutkan hayat bateri"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Tingkatkan hayat bateri"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Putuskan sambungan"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versi <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Gantikan VPN yang sedia ada?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Tetapkan VPN sentiasa hidup?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 PG - 5 PTG hari biasa\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Acara kalendar"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} aktif}=2{{mode_1} dan {mode_2} aktif}=3{{mode_1}, {mode_2} dan {mode_3} aktif}other{{mode_1}, {mode_2} dan # lagi aktif}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mod boleh dihidupkan secara automatik}other{# mod boleh dihidupkan secara automatik}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Jangan Ganggu}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"HIDUP"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Tidak ditetapkan"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Dilumpuhkan"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Pemberitahuan"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Tempoh"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mesej, acara &amp; peringatan"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Apabila Jangan Ganggu dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Selesai"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Tetapan"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Tiada visual atau bunyi daripada pemberitahuan"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Tiada bunyi daripada pemberitahuan"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Anda tidak akan melihat atau mendengar pemberitahuan. Panggilan daripada kenalan yang dibintangi dan pemanggil berulang dibenarkan."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Tetapan semasa)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Tukar tetapan pemberitahuan Jangan Ganggu?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Bunyi profil kerja"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Gunakan bunyi profil peribadi"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Gunakan bunyi yang sama untuk profil peribadi"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Selepas buka kunci, terus ke skrin terakhir digunakan. Skrin kunci tidak paparkan pemberitahuan. Leret dari atas ke bawah untuk lihat pemberitahuan."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrin kunci, Langkau, Pintas"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Apabila profil kerja dikunci"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalisme pemberitahuan skrin kunci"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Tunjukkan kurang pemberitahuan pada skrin kunci"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Hanya tunjukkan pemberitahuan baharu pada skrin kunci"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Alih keluar pemberitahuan yang dilihat sebelumnya daripada skrin kunci secara automatik."</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Pemberitahuan pada skrin kunci"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Tunjukkan perbualan, lalai dan senyap"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Tunjukkan perbualan, lalai dan senyap"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Tunjukkan semua kandungan pemberitahuan kerja"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Sembunyikan kandungan kerja yang sensitif"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Apabila peranti anda dikunci, bagaimanakah pemberitahuan profil harus dipaparkan?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Pemberitahuan profil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Pemberitahuan"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Pemberitahuan apl"</string>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Apabila anda menerima banyak pemberitahuan dalam tempoh masa yang singkat, peranti anda akan mengurangkan kelantangan dan meminimumkan makluman hingga 2 minit. Panggilan, penggera dan perbualan keutamaan tidak terjejas. \n\nPemberitahuan yang diterima semasa tempoh bertenang boleh ditemukan dengan menarik ke bawah daripada bahagian atas skrin."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Gunakan pada profil kerja"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Gunakan pada apl profil kerja"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Pemberitahuan terhimpun"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Hidup"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Mati"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Gunakan penghimpunan pemberitahuan"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Pemberitahuan dengan tema serupa akan disenyapkan dan dikumpulkan bersama-sama untuk pengalaman yang lebih senyap. Penghimpunan akan membatalkan tetapan pemberitahuan apl itu sendiri."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Perkhidmatan pembantu VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tiada apl terpasang yang telah meminta untuk dijalankan sebagai perkhidmatan pembantu VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Benarkan akses perkhidmatan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"perbualan keutamaan"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Tiada"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Tiada}=1{1 perbualan}other{# perbualan}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Tetapan perbualan"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Orang yang boleh ganggu"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Biarpun apl pemesejan atau panggilan tidak dapat memaklumi anda, orang yang anda pilih di sini masih boleh menghubungi anda melalui apl tersebut"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan"</string>
@@ -3826,6 +3899,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Tetapan kenalan"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Tetapan kenalan yang dibintangi"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Tiada"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Tiada"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Penggera"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Kerja)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Mengira…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Tetapan apl"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Benarkan apl membatalkan Jangan Ganggu"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apl yang boleh ganggu"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Buat mod"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mod tersuai"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nama mod"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Nama mod tidak boleh dibiarkan kosong"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Pilih ikon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Acara kalendar"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutin waktu tidur"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Semasa memandu"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Pemberitahuan skrin penuh"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Benarkan pemberitahuan skrin penuh daripada apl ini"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Benarkan apl ini untuk memaparkan pemberitahuan menggunakan skrin penuh apabila peranti dikunci. Apl mungkin menggunakan ciri ini untuk menyerlahkan penggera, panggilan masuk atau pemberitahuan mustahak yang lain."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Tulis pilihan sistem"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Benarkan apl ini mengubah suai pilihan sistem bagi pihak anda"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Kebenaran ini membenarkan apl untuk mengubah suai pilihan sistem teras."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apl pengurusan media"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Benarkan apl mengurus media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Jika dibenarkan, apl ini boleh mengubah suai atau memadamkan fail media yang dibuat dengan apl lain tanpa meminta izin anda. Apl mesti mempunyai kebenaran untuk mengakses fail dan media."</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gerak isyarat"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Buka kamera dengan cepat"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Untuk membuka kamera dengan cepat, tekan butang kuasa dua kali. Berfungsi daripada sebarang skrin."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Balikkan kamera untuk mengambil swafoto"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mod navigasi"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Pemesejan satelit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Hantar dan terima mesej teks melalui satelit. Disertakan dengan akaun anda."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Hantar dan terima mesej teks melalui satelit. Tidak disertakan dengan akaun anda."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Pemesejan satelit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Perihal pemesejan satelit"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Permesejan satelit, kesambungan satelit"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Perihal <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Anda boleh menghantar dan menerima mesej teks melalui satelit sebagai sebahagian daripada akaun <xliff:g id="CARRIER_NAME">%1$s</xliff:g> yang layak"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Pelan <xliff:g id="CARRIER_NAME">%1$s</xliff:g> anda"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Pemesejan satelit disertakan dengan akaun anda"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Pemesejan disertakan dengan akaun anda"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Pemesejan satelit tidak disertakan dengan akaun anda"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Ketahui Lebih Lanjut"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cara ciri ini berfungsi"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefon anda akan disambungkan secara automatik kepada satelit. Untuk mendapatkan sambungan terbaik, pastikan anda berada di kawasan dengan pandangan langit yang jelas."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Selepas telefon anda disambungkan kepada satelit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Anda boleh menghantar teks kepada sesiapa sahaja, termasuk perkhidmatan kecemasan. Telefon anda akan disambungkan semula kepada rangkaian mudah alih jika tersedia."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Pemesejan satelit mungkin mengambil masa lebih lama dan tersedia di beberapa kawasan sahaja. Cuaca dan struktur tertentu boleh menjejaskan sambungan satelit anda. Panggilan melalui satelit tidak tersedia. Panggilan kecemasan masih boleh disambungkan.\n\nPerubahan pada akaun mungkin memerlukan sedikit masa untuk dipaparkan dalam Tetapan. Hubungi pembawa anda untuk mendapatkan butiran."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Lagi tentang pemesejan satelit"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> mungkin mengambil masa lebih lama dan tersedia di beberapa kawasan sahaja. Cuaca dan struktur tertentu boleh menjejaskan sambungan satelit anda. Panggilan melalui satelit tidak tersedia. Panggilan kecemasan masih boleh disambungkan.\n\nPerubahan pada akaun mungkin memerlukan sedikit masa untuk dipaparkan dalam Tetapan. Hubungi <xliff:g id="CARRIER_NAME">%1$s</xliff:g> untuk mendapatkan butiran."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Maklumat lanjut tentang <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Tidak dapat menghidupkan <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Untuk menghidupkan <xliff:g id="FUNCTION">%1$s</xliff:g>, tamatkan sambungan satelit dahulu"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Kesambungan satelit"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Kesambungan satelit"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"kesambungan satelit"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"permesejan satelit"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Penggunaan data disertakan dengan akaun anda"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS via Satelit"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Hantar mesej kepada perkhidmatan kecemasan apabila anda tidak dapat bersambung kepada rangkaian mudah alih atau Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS via Satelit, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Perihal SOS via Satelit"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Anda boleh menghantar mesej kepada perkhidmatan kecemasan dan berkongsi lokasi anda apabila anda tidak dapat bersambung kepada rangkaian mudah alih atau Wi-Fi. Perkhidmatan ini mungkin tidak tersedia pada setiap masa di semua lokasi atau keadaan."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Hubungi atau hantar teks kepada perkhidmatan kecemasan"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Jawab beberapa soalan tentang kecemasan"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Ikut langkah penyambungan kepada satelit"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Jika anda tiada rangkaian mudah alih, anda akan melihat pilihan untuk menggunakan SOS via Satelit"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Hantar jawapan kepada perkhidmatan kecemasan untuk mendapatkan jenis bantuan yang betul"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Setelah anda disambungkan, anda boleh menghantar mesej kepada perkhidmatan kecemasan"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Cuba demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Apabila anda disambungkan kepada perkhidmatan kecemasan melalui satelit, nama, e-mel, nombor telefon, lokasi, maklumat peranti (IMEI, bahasa, model, tahap bateri) dan maklumat orang hubungan kecemasan anda akan dikongsi dengan perkhidmatan kecemasan dan penyedia perkhidmatan satelit. \n\nUntuk menggunakan SOS via Satelit, Google Messages mestilah ditetapkan sebagai apl SMS lalai anda. \n\nJika pemilihan rangkaian automatik dimatikan, ciri ini akan dihidupkan dan peranti anda akan disambungkan secara automatik kepada mana-mana rangkaian."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Pilihan perkongsian"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Orang hubungan kecemasan"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google Account Anda"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Semak atau kemas kinikan maklumat yang akan dikongsi dengan perkhidmatan kecemasan"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nama Titik Akses"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia apabila disambungkan ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Anda menggunakan mod 16KB bagi mod halaman agnostik. Integriti perisian tidak boleh dijamin dalam mod ini dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin dalam risiko. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk memasuki semula mod pengeluaran, anda perlu beralih kembali kepada mod 4KB dan mengunci pemuat but peranti. Tindakan ini akan menetapkan semula peranti kepada tetapan kilang dan memulihkan peranti pada tetapan pengeluaran. Selepas peranti berjaya dibut masuk dalam Android, lumpuhkan pembukaan kunci OEM dalam Pilihan pembangun. Jika peranti gagal mengebut masuk dalam Android atau tidak stabil, denyar semula peranti dengan imej kilang terkini daripada &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; dan pilih \'Hapuskan Peranti\', \'Kunci Pemuat But\' dan \'Denyar Paksa semua pemetakan\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Mod Halaman agnostik 16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Baca lebih lanjut"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Jalankan apl dengan mod keserasian saiz halaman"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Pengendali laporan pepijat"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Menentukan apl yang mengendalikan pintasan Laporan Pepijat pada peranti anda."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Peribadi"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Dengar strim"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Imbas kod QR strim audio untuk mendengar dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Tidak dapat mengedit kata laluan semasa perkongsian. Untuk mengubah kata laluan, matikan perkongsian audio dahulu."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Kata laluan anda mestilah mengandungi 4-16 aksara dan hanya menggunakan huruf, nombor dan simbol"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Pengimbas kod QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Perlukan bantuan?"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"Carian Tetapan"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"Cari dalam Tetapan"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kenalan, storan, akaun"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Storan kenalan"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Peranti sahaja"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kenalan baharu tidak akan disegerakkan dengan akaun"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kenalan akan disimpan pada peranti anda dan disegerakkan kepada akaun anda secara lalai"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Ralat semasa menetapkan akaun lalai"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Tiada akaun lalai ditetapkan"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Peranti sahaja"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Peranti dan %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akaun untuk bermula"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Lokasi untuk menyimpan kenalan"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Bulatkan untuk Membuat Carian"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Sentuh dan tahan butang Skrin Utama atau pemegang navigasi untuk membuat carian menggunakan kandungan pada skrin anda."</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index eba1021cbb8..d1ba32bea78 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"နှင်းပွင့်"</item>
     <item msgid="7952183800501346803">"ကမ်းခြေထီး"</item>
     <item msgid="799139025758265891">"အလုပ်ရုံတူးလ်များ"</item>
-    <item msgid="1330084588359129896">"တဲ"</item>
+    <item msgid="8112685757657659269">"စန္ဒရား"</item>
     <item msgid="3861584909935022342">"ဖလင်လိပ်"</item>
     <item msgid="5827426100157335512">"စာအုပ်"</item>
     <item msgid="8585828346253128384">"ကြာပန်း"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index dd509ea6de0..3f9dde4d786 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"စက်အသစ် တွဲချိတ်ရန်"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ဘလူးတုသ်"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"မနက်ဖြန် အလိုအလျောက်ဖွင့်ရန်"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ဘလူးတုသ် ပိတ်လိုက်ပါက ၎င်းသည် နောက်နေ့တွင် ပြန်ပွင့်လာပါမည်"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ညာဘက်ကိုတွဲချိတ်ရန်"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ဘယ်ဘက်ကိုတွဲချိတ်ရန်"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"အခြားတစ်ဖက်တွဲချိတ်ခြင်း"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"‘ဘလူးတုသ် LE Audio’ ပိတ်ရန်"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"စက်က LE Audio ဟာ့ဒ်ဝဲစွမ်းရည်များကို ပံ့ပိုးလျှင် ဘလူးတုသ် LE Audio အင်္ဂါရပ်ကို ပိတ်သည်။"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ဘလူးတုသ် LE Audio မုဒ်"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"‘ဘလူးတုသ် LE Audio ထုတ်လွှင့်ခြင်း UI အစမ်းကြည့်ရှုမှု’ ကို ဖွင့်ရန်"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"ကိုယ်ပိုင်အော်ဒီယိုမျှဝေခြင်းနှင့် သီးသန့်ထုတ်လွှင့်ခြင်းတို့ အပါအဝင် ‘LE Audio မျှဝေခြင်း UI အစမ်းကြည့်ရှုမှု’ ကို ဖွင့်သည်"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"‘စက်အသေးစိတ်’ တွင် LE audio ခလုတ်ပြရန်"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"‘ဘလူးတုသ် LE Audio ခွင့်ပြုစာရင်း’ ကို ရှောင်ကွင်းရန်"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio အရန်ပစ္စည်းကို ‘ခွင့်ပြုစာရင်း’ သတ်မှတ်ချက်နှင့် ကိုက်ညီသည်ဟု အတည်ပြုမထားစေကာမူ LE Audio ကို မူရင်းသတ်မှတ်ချက်အတိုင်း သုံးနိုင်သည်။"</string>
@@ -136,7 +139,7 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"အားလုံး ကြည့်ရန်"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"အားလုံးကြည့်ရန်"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"စတိုင်လပ်စ်"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"စွတ်ကြောင်းခလုတ်ကို နှိပ်လျှင်"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"ခလုတ်နှိပ်ခြင်းကို ခြေရာခံရန်"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (အလုပ်ပရိုဖိုင်)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"စာသားအကွက်များတွင် ရေးရန်"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"စတိုင်လပ်စ်ခလုတ်နှိပ်ခြင်းအားလုံးကို လစ်လျူရှုရန်"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"အက်ပ် ဘာသာစကား"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"အကြံပြုထားသည့် ဘာသာစကားများ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ဘာသာစကားအားလုံး"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"အကြံပြုထားသည်များ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ဘာသာစကားအားလုံး"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ဒေသအားလုံး"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"နံပါတ်စနစ်အားလုံး"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"စနစ်၏ ဘာသာစကား"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"စနစ်မူရင်း"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ဤအက်ပ်အတွက် ‘ဆက်တင်များ’ မှ ဘာသာစကား ရွေးချယ်မှု မရရှိနိုင်ပါ။"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ပြောင်းရန်"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ကိုမရနိုင်ပါ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ဤဘာသာစကားကို စနစ်ဘာသာစကားအဖြစ် မသုံးနိုင်သော်လည်း အက်ပ်နှင့် ဝဘ်ဆိုက်များတွင် ဤဘာသာစကားဖြင့် သုံးလိုကြောင်း သင်က သတ်မှတ်ထားသည်။"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ရှာဖွေရန်"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ဘာသာစကား ထည့်ပါ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ဒေသရွေးချယ်မှု"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ဘာသာစကားအမည် ထည့်ပါ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"နောက်ထပ် ဘာသာစကားဆက်တင်များ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ဒေသဆိုင်ရာ သတ်မှတ်ချက်များ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ယူနစ်နှင့် နံပါတ်သတ်မှတ်ချက်များ ချမှတ်ရန်"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"သင်၏ ဒေသဆိုင်ရာ သတ်မှတ်ချက်များကို အက်ပ်များအား အသိပေးလျှင် သင့်အသုံးပြုမှုကို ပုဂ္ဂိုလ်ရေးသီးသန့်ပြုလုပ်ပေးနိုင်သည်။"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"အက်ပ်များသည် ဖြစ်နိုင်ပါက သင်၏ ဒေသဆိုင်ရာ သတ်မှတ်ချက်များကို သုံးပါမည်။"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ဒေသဆိုင်ရာ သတ်မှတ်ချက်များ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"အပူချိန်"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ရက်သတ္တပတ်၏ ပထမဆုံးနေ့"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"နံပါတ် သတ်မှတ်ချက်များ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ပြင်ပကွန်ရက်သုံးလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ပြင်ပကွန်ရက်သုံးလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်သော အသုံးပြုခများ ကျသင့်နိုင်သည်။"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"အချိန် အလိုအလျောက် သတ်မှတ်ရန်"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"အလိုအလျောက်သတ်မှတ်ရန်"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ဤခလုတ်ကို ဖွင့်ထားလျှင် ဒေသစံတော်ချိန်သတ်မှတ်ရန် တည်နေရာကို သုံးပါမည်"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"အလိုအလျောက် ရက်စွဲနှင့်အချိန်"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"သင့်ကွန်ရက်နှင့် ကြိုးမဲ့အချက်ပြမှုများသုံး၍ အလိုအလျောက်သတ်မှတ်သည်"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"အလိုအလျောက် ဒေသစံတော်ချိန်"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"သင့်အနီးရှိ မိုဘိုင်းကွန်ရက်များပေါ် အခြေခံ၍ အလိုအလျောက်သတ်မှတ်သည်"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ရနိုင်ပါက သင့်စက်တည်နေရာသုံး၍ အလိုအလျောက်သတ်မှတ်သည်"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ဒေသ၏ ဘာသာစကားစနစ်ကို သုံးရန်"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"၂၄-နာရီပုံစံကို အသုံးပြုရန်"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"အချိန်"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"လက်ချောင်းကို မ ပြီး၊ အာရုံခံနေရာကို ထပ်မံထိပါ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"လက်ဗွေ အာရုံခံကိရိယာကို အသုံးပြု၍ မရပါ"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ပြုပြင်ရေး ဝန်ဆောင်မှုပေးသူထံသို့ သွားပါ။"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"စခရင်ပိတ်ထားစဉ် လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"စခရင်ပိတ်ထားလျှင်ပင် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို သုံးနိုင်သည်"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"စခရင်ပိတ်ထားသည်၊ ဖွင့်ရန်"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"နောက်ထပ် လုံခြုံရေးဆက်တင်များ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"အလုပ်ပရိုဖိုင်လော့ခ်၊ အသွင်ဝှက်ခြင်း စသည်"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"အသွင်ဝှက်ခြင်း၊ အထောက်အထားများ စသည်"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"သင့်သီးသန့်နေရာအတွက် ပုံဖော်ခြင်းသတ်မှတ်ပါ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"လော့ခ်ချရန်"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ဖျောက်ထားရန်"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"သင့်သီးသန့်နေရာ ပုံဖော်ခြင်းကို အတည်ပြုပါ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"သင့်သီးသန့်နေရာ ပင်နံပါတ် ပြန်ထည့်ပါ"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"သင့်သီးသန့်နေရာ စကားဝှက် ပြန်ထည့်ပါ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"လက်ဗွေ <xliff:g id="COUNT">%d</xliff:g> ခု အထိ ထည့်နိုင်သည်"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"အများဆုံးထည့်နိုင်သည့် လက်ဗွေရာအရေအတွက်အထိ ထည့်သွင်းပြီးဖြစ်သည်"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"နောက်ထပ်လက်ဗွေရာများ ထည့်၍မရတော့ပါ"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"ဖွင့်"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ပိတ်"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ပြင်ပဖန်သားပြင်"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"ပြင်ပဖန်သားပြင် သုံးရန်"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ဖန်သားပြင် ပုံရိပ်ပြတ်သားကိန်း"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ပြင်ပဖန်သားပြင်နှင့် ချိတ်ဆက်မှုမရှိပါ"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ပုံရိပ်ပြတ်သားကိန်း (သို့) လှည့်ခြင်းကို ပြောင်းလိုက်ပါက လက်ရှိဖွင့်ထားသော အက်ပ်များ ရပ်သွားနိုင်သည်"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"သင့်ဖန်သားပြင်ကို စကရင်ပွားရန် သင့်စက်ကို ပြင်ပဖန်သားပြင်နှင့် ချိတ်ဆက်ထားရမည်"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"နောက်ထပ် ရွေးစရာများ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ပြကွက်များ ပြန်စီရန် ဖိဆွဲပါ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ကာစ်"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"စကရင်ပွားရန်"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"သင့်စကားဝှက်ကို စစ်ပြီး ထပ်စမ်းကြည့်ပါ"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"စက်ပစ္စည်းထုတ်လုပ်သူကို ဆက်သွယ်ပါ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ချိတ်ဆက်မှု စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ဤ Wi‑Fi ကွန်ရက်ကို လောလောဆယ် မရနိုင်ပါ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ဤ QR ကုဒ်တွင် ပြဿနာရှိနေသည်။ နောက်တစ်နည်းဖြင့် ချိတ်ဆက်ကြည့်ပါ။"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ကွန်ရက် ရွေးပါ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"သင့်စက်ကို ချိတ်ဆက်ရန် ကွန်ရက်တစ်ခု ရွေးပါ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"ဤစက်ကို “<xliff:g id="SSID">%1$s</xliff:g>” သို့ ထည့်လိုသလား။"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"အလိုအလျောက်လှည့်ခြင်းအကြောင်း ပိုမိုလေ့လာနိုင်သည်"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"စခရင်ပုံရိပ်ပြတ်သားကိန်း"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ပုံရိပ်ပြတ်သားကိန်းမြင့်"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ပုံရိပ်ပြတ်သားကိန်းအပြည့်"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ပုံရိပ်ပြတ်သားကိန်းအပြည့်သုံးပါက ဘက်ထရီ ပိုသုံးပါမည်။ ပုံရိပ်ပြတ်သားကိန်းကို ပြောင်းခြင်းကြောင့် အချို့အက်ပ်များကို ပြန်စစေနိုင်သည်။"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ရွေးထားသည်"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"အရောင်များ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"သဘာဝ"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"အလိုက်အထိုက်"</string>
     <string name="brightness" msgid="6216871641021779698">"တောက်ပမှု အဆင့်"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"အလိုက်သင့် တောက်ပမှု"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"အလိုက်သင့် တောက်ပမှုအကြောင်း"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"သင်၏ ဖန်သားပြင်တောက်ပမှုသည် ပတ်ဝန်းကျင်နှင့် လုပ်ဆောင်ချက်များကိုလိုက်၍ အလိုအလျောက် ချိန်ညှိသွားပါမည်။ သင့်ရွေးချယ်မှုများကို အလိုက်သင့် တောက်ပမှုပြောင်းလဲခြင်းစနစ်က ပိုမိုလေ့လာနိုင်စေရန် ရွှေ့တုန်းကို သင်ကိုယ်တိုင် ရွှေ့နိုင်ပါသည်။"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ဖွင့်"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ပိတ်"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"အိပ်ချိန်မုဒ် ဆက်တင်များ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{မုဒ်များက အမှောင်နောက်ခံကိုလည်း သုံးနိုင်သည်}=1{{mode_1} က အမှောင်နောက်ခံကိုလည်း သုံးသည်}=2{{mode_1} နှင့် {mode_2} တို့က အမှောင်နောက်ခံကိုလည်း သုံးသည်}=3{{mode_1}၊ {mode_2} နှင့် {mode_3} တို့က အမှောင်နောက်ခံကိုလည်း သုံးသည်}other{{mode_1}၊ {mode_2} နှင့် နောက်ထပ် # ခုတို့က အမှောင်နောက်ခံကိုလည်း သုံးသည်}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"မုဒ်ဆက်တင်များ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"ပို၍ပင် မှိန်စေခြင်း"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ပိုမှိန်ခြင်း"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"စက်ကို ပုံမှန်ထက် ပိုမှိန်ရန် ခွင့်ပြုနိုင်သည်"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ဖန်သားပြင် အချိန်ကုန်သွားခြင်း"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>ကြာ အသုံးပြုမှု မရှိလျှင်"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ဘလူးတုသ်ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုသည်။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"တည်နေရာဝန်ဆောင်မှုများ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"တည်နေရာကို သုံးရန်"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ဒေသစံတော်ချိန်အတွက် တည်နေရာသုံးရန်"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ဒေသစံတော်ချိန်ကို အလိုအလျောက် သတ်မှတ်၍မရပါ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"‘တည်နေရာ’ (သို့) ‘တည်နေရာဝန်ဆောင်မှုများ’ ပိတ်ထားသည်"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"တည်နေရာပြ ဆက်တင်များ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ဤအရာကို ပြင်ရန်"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"မလုပ်တော့"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"အလိုအလျောက် ဒေသစံတော်ချိန်ကို ပိတ်ထားသည်"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"အလိုအလျောက် ဒေသစံတော်ချိန်ကို ပိတ်ထားပါက မရနိုင်ပါ"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ဒေသစံတော်ချိန်သတ်မှတ်ရန် တည်နေရာကို သုံးနိုင်သည်"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"သင့်စက်တည်နေရာ ရနိုင်ပါက ဒေသစံတော်ချိန် သတ်မှတ်ရန် ၎င်းကိုသုံးနိုင်သည်"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
     <string name="legal_information" msgid="7509900979811934843">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
     <string name="manual" msgid="3651593989906084868">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ရွေးစရာများ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"အများသုံးနိုင်မှု"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"စက်၏ ကီးဘုတ်"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"ပြန်ကန်ကီးများ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"ကီးဘုတ်သည် <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms အတွင်း ကီးတစ်ခုတည်း အကြိမ်ကြိမ် အမြန်နှိပ်ခြင်းကို လျစ်လျူရှုသည်"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ကီးဘုတ်သည် ကီးတစ်ခုတည်း အကြိမ်ကြိမ် အမြန်နှိပ်ခြင်းကို လျစ်လျူရှုသည်"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ကြိမ်ထပ်နှိပ်ခြင်းများ သတ်မှတ်ချက်"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ကီးအကြိမ်ကြိမ်နှိပ်ခြင်းကို ကီးဘုတ်က လျစ်လျူရှုမည့်ကြာချိန် ရွေးပါ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"၀.၂ စက္ကန့်"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"၀.၄ စက္ကန့်"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"၀.၆ စက္ကန့်"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"စိတ်ကြိုက်"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"စိတ်ကြိုက်တန်ဖိုး"</string>
     <string name="slow_keys" msgid="2891452895499690837">"အနှေးကီးများ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms ဖွင့်ရန် ခလုတ်နှိပ်ခြင်းအတွက် ကြာချိန်ကို ပြင်နိုင်သည်"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ဖွင့်ရန် ကီးနှိပ်ခြင်းအတွက် ကြာချိန်ကို ပြင်ပေးသည်"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ကပ်ခွာကီးများ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ဖြတ်လမ်းလင့်ခ်များအတွက် ခလုတ်များကို တစ်ပြိုင်တည်းဖိထားမည့်အစား တစ်ကြိမ်လျှင် ခလုတ်တစ်ခု နှိပ်နိုင်သည်"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"မောက်စ်ကီးများ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"မောက်စ်ကို ထိန်းချုပ်ရန် ပကတိကီးဘုတ်ကိုသုံးပါ။"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"မောက်စ်ကီးများ သုံးရန်"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ညွှန်မှတ် ထိန်းချုပ်ရန် သင့်ကီးဘုတ်ကို သုံးပါ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"မောက်စ်ပြောင်းပြန်လှိမ့်ခြင်း"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"စာမျက်နှာအောက်သို့ ရွှေ့ရန်အတွက် အပေါ်သို့လှိမ့်ပါ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ဘယ်နှင့်ညာခလုတ်များ ပြောင်းရန်"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ဘယ်ဘက်မောက်စ်ခလုတ်ကို ညာဘက်ခလုတ်အဖြစ် သုံးနိုင်သည်"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> အတွက် မောက်စ်ကီးများ"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"မောက်စ်ညွှန်မြားရွှေ့ရန် <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ကီးများကို သုံးပါ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ပင်မမောက်စ်ခလုတ်ကို နှိပ်ရန် <xliff:g id="CLICK_LABEL">%s</xliff:g> ကီးကို သုံးပါ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ပင်မမောက်စ်ခလုတ်ကို နှိပ်ထားရန် <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ကီးကို သုံးပါ"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ပင်မမောက်စ်ခလုတ်ကို လွှတ်လိုက်ရန် <xliff:g id="RELEASE_LABEL">%s</xliff:g> ကီးကို သုံးပါ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"လှိမ့်ခြင်းမုဒ်သို့ ပြောင်းရန် <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ကီးကို သုံးပါ။ ၎င်းက <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ကီးများအား မြင်ကွင်းကို အပေါ်၊ အောက်၊ ဘယ် (သို့) ညာဘက်သို့ ရွှေ့စေမည်"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"အရန်မောက်စ်ခလုတ်ကို နှိပ်ရန် <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ကီးကို သုံးပါ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"လက်ကွက်ဖြတ်လမ်းများ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ဖြတ်လမ်းလင့်ခ်များစာရင်း ပြပါ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"အလုပ်ပရိုဖိုင် လက်ကွက်နှင့် တူးလ်များ"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"မူရင်း"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"တာ့ချ်ပက်"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"တာ့ချ်ပက်နှင့် မောက်စ်"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"မောက်စ်"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"မြားရွေ့နှုန်း၊ လက်ဟန်များ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"နှိပ်ရန် တို့ခြင်း"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"တို့၍ ဖိဆွဲခြင်း"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"အောက်ခြေညာဘက်ခလုတ်ကို နှိပ်ခြင်း"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"နောက်ထပ်ရွေးစရာအတွက် တာ့ချ်ပက်၏ အောက်ခြေညာထောင့်ကို နှိပ်နိုင်သည်"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"မြားရွေ့နှုန်း"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"လက်သုံးချောင်းဖြင့်တို့ရန် သုံးခြင်း"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"မြားအရောင်"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"မြား ဖြည့်စွက်ပုံစံကို အမည်း ပြောင်းရန်"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"မြား ဖြည့်စွက်ပုံစံကို အစိမ်း ပြောင်းရန်"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"တာ့ချ်ပက်လက်ဟန်များကို လေ့လာရန်"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"တာ့ချ်ပက်၊ တာ့ချ်ပက်၊ မောက်စ်၊ ကာဆာ၊ လှိမ့်၊ ပွတ်ဆွဲ၊ ညာဘက်ခလုတ်ကို နှိပ်၊ နှိပ်၊ မြား"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ညာဘက်ခလုတ်ကို နှိပ်၊ တို့"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"အလယ်ကလစ်"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant စတင်ရန်"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ပင်မစာမျက်နှာသို့ သွားရန်"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"နောက်သို့"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"လတ်တလောအက်ပ်များ ကြည့်ရန်"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ပင်မစာမျက်နှာသို့ သွားရန်"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"တာ့ချ်ပက် တစ်နေရာရာ၌ လက်သုံးချောင်းဖြင့် အပေါ်ပွတ်ဆွဲပါ"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"နောက်သို့"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> အတွက် ကီးအသစ်ရွေးပါ-"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ပကတိကီးဘုတ် အများသုံးနိုင်မှု"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ကပ်ခွာကီး၊ တစ်ကြိမ်နှိပ်ကီး၊ မောက်စ်ကီး"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ပြန်ကျော့ကီးများ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ပြန်မကျော့မီ ကြန့်ကြာချိန်"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ပြန်ကျော့နှုန်း"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ကီး၏အက္ခရာကို ပြန်ကျော့ရန် ဖိထားပြီးမှ လွှတ်လိုက်ပါ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> အပြင်အဆင်"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"မူရင်း"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"အလိုအလျောက်- <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"အစမ်းကြည့်ရှုရန်"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ပုံမှန်ရွေးချယ်စရာများ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ဘာသာစကား"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ဖောင့်အရွယ်အစား"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"စာတန်းအရွယ်အစား"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"စာတန်းပုံစံ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"စိတ်ကြိုက်ရွေးချယ်စရာများ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"နောက်ခံအရောင်"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ပါဝါအသုံးပြုမှုအား ချိန်တွယ်ခြင်း"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ပါဝင်သော ဆော့ဝဲလ်များ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"အက်ပ်များ ပုံမှန်လုပ်ဆောင်နေပါသည်"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ဘက်ထရီလဲရန် အကြံပြုထားသည်"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ဘက်ထရီသိုလှောင်နိုင်မှု ပမာဏနှင့် အားသွင်းမှုစွမ်းဆောင်ရည်တို့ လျော့ကျသွားပြီဖြစ်၍ ဘက်ထရီလဲရန် အကြံပြုပါသည်။"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ဘက်ထရီ အားနည်းနေသည်"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ဘက်ထရီသက်တမ်းရှည်စေရန် ‘ဘက်ထရီအားထိန်း’ ကို ဖွင့်ပါ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ဘက်ထရီသက်တမ်း ပိုကောင်းအောင်လုပ်ပါ"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ဆက်သွယ်မှု ဖြတ်ရန်"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ဗားရှင်း"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ဗားရှင်း <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ကိုမေ့လိုက်ပါ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ရှိပြီးသား VPN ကိုအစားထိုးမလား။"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"“ကြားရက်များ နံနက် ၉ နာရီ - ညနေ ၅ နာရီ”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ပြက္ခဒိန်အစီအစဉ်များ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ကို အသုံးပြုနေသည်}=2{{mode_1} နှင့် {mode_2} တို့ကို အသုံးပြုနေသည်}=3{{mode_1}၊ {mode_2} နှင့် {mode_3} တို့ကို အသုံးပြုနေသည်}other{{mode_1}၊ {mode_2} နှင့် နောက်ထပ် # ခုတို့ကို အသုံးပြုနေသည်}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{မုဒ် ၁ ခု အလိုအလျောက်ပွင့်နိုင်သည်}other{မုဒ် # ခု အလိုအလျောက်ပွင့်နိုင်သည်}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{မနှောင့်ယှက်ရ}=1{{mode_1}}=2{{mode_1}၊ {mode_2}}other{{mode_1}၊ {mode_2}၊ {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ဖွင့်"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"သတ်မှတ်မထားပါ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ပိတ်ထားသည်"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ရပါပြီ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"အကြောင်းကြားချက်များ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ကြာချိန်"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"မက်ဆေ့ဂျ်၊ အစီအစဉ်နှင့် သတိပေးချက်များ"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ သင်အထက်တွင် ခွင့်ပြုထားသည်များအတွက်မှလွဲ၍ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အားဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ပြီးပါပြီ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ဆက်တင်များ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"အကြောင်းကြားချက်မှ ပုံ/အသံ မဖွင့်ရန်"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"အကြောင်းကြားချက် အသံမဖွင့်ရန်"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"အကြောင်းကြားချက်များကို မြင်ရ သို့မဟုတ် ကြားရမည် မဟုတ်ပါ။ ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များနှင့် အကြိမ်ကြိမ် ခေါ်ဆိုသူများ၏ ဖုန်းခေါ်ဆိုမှုများကိုသာ ခွင့်ပြုပါမည်။"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(လက်ရှိ ဆက်တင်)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\'မနှောင့်ယှက်ရ\' အကြောင်းကြားချက် ဆက်တင်များ ပြောင်းမလား။"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"အလုပ်ပရိုဖိုင် အသံများ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ကိုယ်ပိုင်ပရိုဖိုင်အသံများ သုံးပါ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"သင့်ကိုယ်ပိုင်ပရိုဖိုင်နှင့်တူညီသည့် အသံများကို သုံးရန်"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ဖုန်းဖွင့်ပြီးလျှင် နောက်ဆုံးသုံးခဲ့သောစခရင်သို့ သွားပါ။ လော့ခ်မျက်နှာပြင်တွင် အကြောင်းကြားချက် မပြပါ။ ၎င်းတို့ကို မြင်ရရန် အောက်သို့ပွတ်ဆွဲပါ။"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"လော့ခ်မျက်နှာပြင်၊ လော့ခ်ချမျက်နှာပြင်၊ ကျော်ရန်"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"အလုပ်ပရိုဖိုင်လော့ခ်ချထားချိန်"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"လော့ခ်မျက်နှာပြင် အကြောင်းကြားချက် အနည်းငယ်"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"လော့ခ်မျက်နှာပြင်တွင် အကြောင်းကြားချက် နည်းနည်းသာ ပြပါ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"လော့ခ်မျက်နှာပြင်ပေါ်တွင် အကြောင်းကြားချက်အသစ်များသာ ပြပါ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ယခင်ကြည့်ထားသော အကြောင်းကြားချက်များကို လော့ခ်မျက်နှာပြင်မှ အလိုအလျောက် ဖယ်ရှားသည်"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"လော့ခ်ချထားချိန် အကြောင်းကြားချက်များ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"စကားဝိုင်း၊ မူရင်း၊ အသံတိတ်များ ပြသည်"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"စကားဝိုင်း၊ မူရင်း၊ အသံတိတ်များ ပြရန်"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"အလုပ်အကြောင်းကြားချက် အားလုံးကို ပြပါ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"သတိထားရမည့် အလုပ်အကြောင်းအရာကို ဝှက်ထားရန်"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"သင့်စက်ပစ္စည်းသော့ခတ်ထားလျှင်၊ ပရိုဖိုင်သတိပေးချက်များ ဘယ်လိုပြစေလိုပါသလဲ။"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"အချိန်တိုအတွင်း အကြောင်းကြားချက်များစွာ ရပါက သင့်စက်သည် ၂ မိနစ်ကြာသည်အထိ အသံတိုးပြီး သတိပေးချက်များကို လျှော့ချပါမည်။ ခေါ်ဆိုမှု၊ နှိုးစက်နှင့် ဦးစားပေးစကားဝိုင်းများကို မသက်ရောက်ပါ။ \n\nသတိပေးမှု လျှော့ချစဉ်အချိန်အတွင်း ရရှိသော အကြောင်းကြားချက်များကို ဖန်သားပြင်ထိပ်ပိုင်းမှ အောက်သို့ဆွဲချခြင်းဖြင့် တွေ့နိုင်သည်။"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"အလုပ်ပရိုဖိုင်များတွင် သုံးရန်"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"အလုပ်ပရိုဖိုင်အက်ပ်များတွင် သုံးရန်"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"တူရာစုထားသော အကြောင်းကြားချက်များ"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ဖွင့်"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ပိတ်"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"အကြောင်းကြားချက် တူရာစုခြင်း သုံးပါ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ပိုတိတ်ဆိတ်သော အသုံးပြုမှုအတွက် အလားတူအပြင်အဆင်များပါသော အကြောင်းကြားချက်များကို အသံတိတ်ပြီး အတူတကွ အုပ်စုဖွဲ့ပါမည်။ တူရာစုခြင်းသည် အက်ပ်တစ်ခု၏ ကိုယ်ပိုင်အကြောင်းကြားချက် ဆက်တင်များကို အစားထိုးပါမည်။"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR အထောက်အကူပြု ဝန်ဆောင်မှုများ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်ကိုမျှ VR အထောက်အကူပြု ဝန်ဆောင်မှုများအဖြစ် ဖွင့်ရန် တောင်းဆိုမထားပါ။"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> အတွက် VR ဝန်ဆောင်မှု အသုံးပြုခွင့်ပြုမလား။"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ဦးစားပေးစကားဝိုင်းများ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"မရှိ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{မရှိ}=1{စကားဝိုင်း ၁ ခု}other{စကားဝိုင်း # ခု}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"စကားဝိုင်း ဆက်တင်များ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ကြားဖြတ်နိုင်သူ"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"မက်ဆေ့ဂျ်ပို့သည့် (သို့) ဖုန်းခေါ်သည့် အက်ပ်များက သင့်ကိုအကြောင်းမကြားနိုင်သော်လည်း သင်ရွေးချယ်ထားသူများက ယင်းအက်ပ်များဖြင့် သင့်အားဆက်သွယ်နိုင်သည်"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ခေါ်ဆိုမှုများ"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"မည်သူမဆို"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"အဆက်အသွယ်များ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"အဆက်အသွယ် ဆက်တင်များ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ် ဆက်တင်များ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"မရှိ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"မရှိ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"နှိုးစက်များ"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (အလုပ်သုံး)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"တွက်ချက်နေသည်…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"အက်ပ် ဆက်တင်များ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"အက်ပ်များကို အစားထိုးခွင့်ပြုပါ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ကြားဖြတ်နိုင်သည့် အက်ပ်များ"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"မုဒ် ပြုလုပ်ခြင်း"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"စိတ်ကြိုက်မုဒ်"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"မုဒ်အမည်"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"မုဒ်အမည်ကို အလွတ်ထား၍ မရပါ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"သင်္ကေတရွေးရန်"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ပြက္ခဒိန်အစီအစဉ်"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"အိပ်ရာဝင်ချိန် ပုံမှန်အစီအစဉ်"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ကားမောင်းနေစဉ်"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ဖန်သားပြင်အပြည့် အကြောင်းကြားချက်များ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ဤအက်ပ်မှ ဖန်သားပြင်အပြည့် အကြောင်းကြားချက် ခွင့်ပြုရန်"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"စက်ပစ္စည်းလော့ခ်ချထားစဉ် ဖန်သားပြင်အပြည့် နေရာယူမည့် အကြောင်းကြားချက်များကို ဤအက်ပ်အား ပြသခွင့်ပြုနိုင်သည်။ နှိုးစက်၊ အဝင်ခေါ်ဆိုမှု (သို့) အခြားအရေးတကြီး အကြောင်းကြားချက်များကို မြင်သာအောင်လုပ်ရန် အက်ပ်များက ၎င်းတို့ကို သုံးနိုင်သည်။"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"စနစ်သတ်မှတ်ချက်များ ရေးခြင်း"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ဤအက်ပ်ကို သင့်ကိုယ်စား စနစ်သတ်မှတ်ချက်များ မွမ်းမံခွင့်ပြုခြင်း"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ဤခွင့်ပြုချက်က အက်ပ်ကို ပင်မစနစ်သတ်မှတ်ချက်များ မွမ်းမံခွင့်ပြုသည်။"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"မီဒီယာစီမံခန့်ခွဲမှု အက်ပ်များ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"မီဒီယာကို စီမံရန်အတွက် အက်ပ်ကိုခွင့်ပြုရန်"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ခွင့်ပြုထားပါက ဤအက်ပ်သည် သင့်ထံခွင့်မတောင်းဘဲ အခြားအက်ပ်များဖြင့် ပြုလုပ်ထားသော မီဒီယာဖိုင်များကို ပြင်ဆင်နိုင်သည် (သို့) ဖျက်နိုင်သည်။ ဖိုင်များနှင့် မီဒီယာကို သုံးရန် အက်ပ်တွင် ခွင့်ပြုချက်ရှိရမည်။"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"လက်ဟန်"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ကင်မရာ အမြန်ဖွင့်ခြင်း"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ကင်မရာကို အမြန်ဖွင့်ရန် ဖွင့်ပိတ်ခလုတ်ကို နှစ်ချက်နှိပ်ပါ။ မည်သည့်ဖန်သားပြင်မှမဆို လုပ်ဆောင်နိုင်သည်။"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ဆယ်လ်ဖီရိုက်ရန် ကင်မရာလှည့်ခြင်း"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"လမ်းညွှန်မုဒ်"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်း"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ဂြိုဟ်တုဖြင့် မိုဘိုင်းမက်ဆေ့ဂျ် ပို့နိုင်၊ လက်ခံနိုင်သည်။ သင့်အကောင့်တွင် ပါဝင်သည်။"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ဂြိုဟ်တုဖြင့် မိုဘိုင်းမက်ဆေ့ဂျ် ပို့နိုင်၊ လက်ခံနိုင်သည်။ သင့်အကောင့်တွင် မပါဝင်ပါ။"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်း"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်းအကြောင်း"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"သတ်မှတ်ချက်ပြည့်မီသော <xliff:g id="CARRIER_NAME">%1$s</xliff:g> အကောင့် တစ်စိတ်တစ်ဒေသအဖြစ် သင်သည် ဂြိုဟ်တုဖြင့် မိုဘိုင်းမက်ဆေ့ဂျ် ပို့နိုင်၊ လက်ခံနိုင်သည်"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"သင့် <xliff:g id="CARRIER_NAME">%1$s</xliff:g> အစီအစဉ်"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်းသည် သင့်အကောင့်တွင် ပါဝင်သည်"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်းသည် သင့်အကောင့်တွင် မပါဝင်ပါ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ပိုမိုလေ့လာရန်"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"အလုပ်လုပ်ပုံ"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"သင့်ဖုန်းသည် ဂြိုဟ်တုနှင့် အလိုအလျောက်ချိတ်ဆက်မည်။ အကောင်းဆုံးချိတ်ဆက်မှုအတွက် ကောင်းကင်ကို ရှင်းလင်းစွာမြင်နိုင်အောင် ထားပါ။"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"သင့်ဖုန်းက ဂြိုဟ်တုနှင့် ချိတ်ဆက်ပြီးသည့်အခါ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"အရေးပေါ်ဝန်ဆောင်မှု ဌာနများအပါအဝင် မည်သူ့ထံမဆို စာတိုပို့နိုင်သည်။ ရနိုင်သည့်အခါ သင့်ဖုန်းသည် မိုဘိုင်းကွန်ရက်နှင့် ပြန်ချိတ်ဆက်ပါမည်။"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်းသည် အချိန်ပိုကြာနိုင်ပြီး နေရာအချို့တွင်သာ ရနိုင်သည်။ မိုးလေဝသအခြေအနေနှင့် အဆောက်အအုံအချို့သည် သင့်ဂြိုဟ်တုချိတ်ဆက်မှုအပေါ် သက်ရောက်နိုင်သည်။ ဂြိုဟ်တုဖြင့် ဖုန်းခေါ်ဆို၍ မရနိုင်ပါ။ အရေးပေါ်ဖုန်းခေါ်ခြင်းကို ချိတ်ဆက်နိုင်သေးသည်။\n\nဆက်တင်များတွင် အကောင့်ပြောင်းလဲမှုများကိုပြရန် အချိန်အနည်းငယ် ကြာနိုင်သည်။ အသေးစိတ်အတွက် သင့်ဖုန်းကုမ္ပဏီကို ဆက်သွယ်ပါ။"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ဂြိုဟ်တုမက်ဆေ့ဂျ်ပို့ခြင်းအကြောင်း ပိုမိုသိရှိရန်"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ကို ဖွင့်၍မရပါ"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ကို ဖွင့်ရန် ဂြိုဟ်တုချိတ်ဆက်မှုကို ဦးစွာအဆုံးသတ်ပါ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ဂြိုဟ်တုချိတ်ဆက်နိုင်မှု"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"APN အချိတ်အဆက် အမည်များ"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> တွင် ချိတ်ဆက်ထားသည့်အခါ မရနိုင်ပါ"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၁၆ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် ၄ KB mode မုဒ်သို့ ပြန်ပြောင်းပြီး စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ ၎င်းသည် စက်ကို စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးပြီး ထုတ်ကုန် ဆက်တင်များအတိုင်း ပြန်ပြောင်းပေးပါမည်။ စက်ကို Android သို့ စတင်ပြီးနောက် ‘ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများ’ ရှိ OEM ဖွင့်ခြင်းကို ပိတ်ပါ။ စက်ကို Android သို့ စတင်၍မရပါက သို့မဟုတ် မတည်ငြိမ်ပါက href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&amp;gt မှ နောက်ဆုံးပေါ် စက်ရုံထုတ် မူလပုံများဖြင့် စက်ကို ပြန်မွမ်းမံပါ သို့မဟုတ် &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&amp;gt ကို အသုံးပြုကာ ‘စက်ရှင်းလင်းရန်’၊ ‘စနစ်စတင်မှု လော့ခ်ချရန်’ နှင့် ‘အပိုင်းအားလုံး မဖြစ်မနေ မွမ်းမံရန်’ ကို ရွေးပါ။"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သော ၁၆KB မုဒ်"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"နောက်ထပ်ဖတ်ရန်"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"စာမျက်နှာအရွယ်အစားချုံ့မုဒ်ဖြင့် အက်ပ်ကိုလုပ်ဆောင်ရန်"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ချွတ်ယွင်းချက်အစီရင်ခံစာ စီမံသူ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"သင့်စက်တွင် မည်သည့်အက်ပ်က ချွတ်ယွင်းမှုအစီရင်ခံစာ ဖြတ်လမ်းလင့်ခ်အား ကိုင်တွယ်မည်ဆိုသည်ကို ဆုံးဖြတ်သည်။"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ကိုယ်ပိုင်"</string>
@@ -5161,7 +5313,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB ကို လက်ရှိတည်နေရာတွင် မရနိုင်ပါ"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread သုံးရန်"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread သည် သင့်အဆင့်မြင့် အိမ်သုံးကိရိယာများကို ကူညီချိတ်ဆက်ပေးပြီး ထိရောက်မှုနှင့် စွမ်းဆောင်ရည်တို့ကို မြှင့်တင်ပေးသည်။\n\nဖွင့်ထားသောအခါ ဤစက်သည် Thread ကွန်ရက်တစ်ခုတွင် ပါဝင်နိုင်သဖြင့် Matter ပံ့ပိုးပေးထားသော စက်ပစ္စည်းများကို ဤဖုန်းဖြင့် ထိန်းချုပ်နိုင်သည်။"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread သည် သင့်အဆင့်မြင့် အိမ်သုံးကိရိယာများကို ကူညီချိတ်ဆက်ပေးပြီး ထိရောက်မှုနှင့် စွမ်းဆောင်ရည်တို့ကို မြှင့်တင်ပေးသည်။\n\nဖွင့်ထားသောအခါ ဤစက်သည် Thread ကွန်ရက်တစ်ခုတွင် ပါဝင်ခွင့်ရနိုင်သဖြင့် Matter ပံ့ပိုးပေးထားသော စက်ပစ္စည်းများကို ဤဖုန်းဖြင့် ထိန်းချုပ်နိုင်သည်။"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread အကြောင်း ပိုမိုလေ့လာရန်"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"ကင်မရာသုံးခွင့်"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"မိုက်ခရိုဖုန်းသုံးခွင့်"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ထုတ်လွှင့်မှုကို နားထောင်ရန်"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ဖြင့် နားထောင်ရန် အသံ ထုတ်လွှင့်ခြင်း QR ကုဒ်ကို စကင်ဖတ်နိုင်သည်"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"မျှဝေစဉ် စကားဝှက်ကို ပြင်၍မရပါ။ စကားဝှက် ပြောင်းရန် အော်ဒီယို မျှဝေခြင်းကို ဦးစွာပိတ်ပါ။"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"သင်၏စကားဝှက်တွင် စာလုံး ၄-၁၆ လုံး ပါဝင်ရမည်ဖြစ်ပြီး အက္ခရာ၊ နံပါတ်နှင့် သင်္ကေတများကိုသာ သုံးပါ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR ကုဒ် စကင်ဖတ်စနစ်"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"အကူအညီလိုသလား။"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ဆက်တင်များတွင် ရှာရန်"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"အဆက်အသွယ်များ၊ သိုလှောင်ခန်း၊ အကောင့်"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"အဆက်အသွယ်များ သိုလှောင်ခန်း"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"စက်ပစ္စည်းသီးသန့်"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"အဆက်အသွယ်အသစ်များကို အကောင့်နှင့် စင့်ခ်လုပ်မည်မဟုတ်ပါ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"မူရင်းသတ်မှတ်ချက်အရ အဆက်အသွယ်များကို သင့်စက်တွင်သိမ်းပြီး အကောင့်နှင့် စင့်ခ်လုပ်ပါမည်"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"မူလအကောင့်ကို သတ်မှတ်ရာတွင် အမှားရှိသည်"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"မူလအကောင့် သတ်မှတ်မထားပါ"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"စက်ပစ္စည်းသီးသန့်"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"စက်ပစ္စည်းနှင့် %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"စတင်ရန် အကောင့်ထည့်ပါ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"အဆက်အသွယ်များ သိမ်းမည့်နေရာ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ရှာရန် ကွက်၍ဝိုင်းလိုက်ပါ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"သင့်စခရင်ပေါ်ရှိ အကြောင်းအရာသုံး၍ ရှာရန်အတွက် ပင်မခလုတ် (သို့) လမ်းညွှန်ဘားကို တို့ထိ၍ ဖိထားပါ။"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 3f452625c59..d217ad19987 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snøflak"</item>
     <item msgid="7952183800501346803">"Strandparasoll"</item>
     <item msgid="799139025758265891">"Verktøy på verksted"</item>
-    <item msgid="1330084588359129896">"Telt"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Filmspole"</item>
     <item msgid="5827426100157335512">"Bok"</item>
     <item msgid="8585828346253128384">"Lotusblomst"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4ac8cada8d2..395c0f61819 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Koble til en ny enhet"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Slå på automatisk i morgen"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Hvis du slår av Bluetooth, slås det på igjen dagen etter"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Tilkoble høyre øre"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Tilkoble venstre øre"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Tilkoble det andre øret"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Slå av Bluetooth LE-lyd"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Slår av Bluetooth LE-lydfunksjonen hvis enheten støtter maskinvarefunksjoner for LE-lyd."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE-lydmodus"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Slå på forhåndsvisningen av brukergrensesnittet for kringkasting av Bluetooth LE-lyd"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Slår på forhåndsvisningen av brukergrensesnittet for kringkasting av Bluetooth LE-lyd, inkludert personlig lyddeling og privat kringkasting"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Vis LE-lyd-av/på-bryter i Enhetsdetaljer"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omgå godkjenningsliste for Bluetooth LE-lyd"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Bruk LE-lyd som standard, selv om det ikke er bekreftet at den eksterne LE-lydenheten overholder kriteriene for godkjenningslisten."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Appspråk"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Foreslåtte språk"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alle språk"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Foreslått"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alle språk"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alle regioner"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alle nummereringssystemer"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Systemspråk"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Systemstandard"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Språkvalg for denne appen er ikke tilgjengelig fra innstillingene."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Endre"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s er ikke tilgjengelig"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Du har latt apper og nettsteder vite at du foretrekker dette språket, men det kan ikke brukes som systemspråk."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Søk"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Legg til et språk"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regionsinnstilling"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Skriv inn språknavn"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Flere språkinnstillinger"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionsinnstillinger"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Angi innstillinger for enheter og tall"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"La apper bruke regionsinnstillingene dine til å tilpasse opplevelsen din"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apper bruker regionsinnstillingene dine når det er mulig."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionsinnstillinger"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Første dag i uken"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Tallpreferanser"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roamingavgifter kan påløpe."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Angi klokkeslettet automatisk"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Angi automatisk"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Posisjon blir brukt til å angi tidssonen når denne av/på-knappen er på"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatisk dato og klokkeslett"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Angi automatisk med nettverket og trådløse signaler"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidssone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Angi automatisk basert på mobilnettverk i nærheten"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Angi automatisk med enhetsposisjonen, hvis tilgjengelig"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Bruk lokal standard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Bruk 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tid"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Løft fingeren og legg den på sensoren igjen"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Kan ikke bruke fingeravtrykkssensoren"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Gå til en reparasjonsleverandør."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Opplåsing med fingeravtrykk når skjermen er av"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Bruk opplåsing med fingeravtrykk selv når skjermen er av"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Skjerm av, opplåsing"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Flere sikkerhetsinnstillinger"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Lås for jobbprofil, kryptering med mer"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Kryptering, legitimasjon med mer"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Angi et mønster for det private området"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lås"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Skjul"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Bekreft mønsteret for det private området"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Legg inn PIN-koden for det private området på nytt"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Legg inn passordet for det private området på nytt"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> fingeravtrykk"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har lagt til maksimalt antall fingeravtrykk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan ikke legge til flere fingeravtrykk"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"På"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Av"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ekstern skjerm"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Bruk ekstern skjerm"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Skjermoppløsning"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ekstern skjerm er frakoblet"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Hvis rotasjon eller oppløsning endres, kan apper som kjører nå, stoppe"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Enheten må være koblet til en ekstern skjerm for å speile skjermen din"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Flere alternativer"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Hold og dra for å omorganisere skjermer."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"speil"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Slå på trådløs skjermdeling"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Sjekk passordet og prøv igjen"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakt produsenten av enheten"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Sjekk tilkoblingen og prøv igjen"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Dette wifi-nettverket er ikke tilgjengelig akkurat nå"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Noe er galt med denne QR-koden. Prøv å koble til på en annen måte."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Velg et nettverk"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Velg et nettverk for å koble til enheten din"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Vil du legge til denne enheten i «<xliff:g id="SSID">%1$s</xliff:g>»?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Finn ut mer om automatisk rotasjon"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Skjermoppløsning"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Høy oppløsning"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full oppløsning"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full oppløsning bruker mer batteri. Hvis du endrer oppløsningen, kan det føre til at noen apper starter på nytt."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Valgt"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlig"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Tilpasset"</string>
     <string name="brightness" msgid="6216871641021779698">"Lysstyrkenivå"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Tilpasset lysstyrke"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Om tilpasset lysstyrke"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Lysstyrken på skjermen justeres automatisk etter omgivelser og aktiviteter. Du kan flytte glidebryteren manuelt for lære tilpasset lysstyrke om preferansene dine."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"På"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Av"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Innstillinger for sengetidsmodus"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Moduser kan også slå på mørkt tema}=1{{mode_1} slår også på mørkt tema}=2{{mode_1} og {mode_2} slår også på mørkt tema}=3{{mode_1}, {mode_2} og {mode_3} slår også på mørkt tema}other{{mode_1}, {mode_2} og # til slår også på mørkt tema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Modusinnstillinger"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Enda mørkere"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ekstra dimmet"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"La enheten bli mørkere enn normalt"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skjermsparer"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Posisjonstjenester"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Posisjonstjenester"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Bruk posisjon"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Bruk posisjon for å finne tidssonen"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Kan ikke angi tidssonen automatisk"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Posisjon eller posisjonstjenester er av"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Posisjonsinnstillinger"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Løs dette"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Avbryt"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidssone er av"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ikke tilgjengelig når automatisk tidssone er av"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Posisjonen kan brukes til å angi tidssonen"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Hvis enhetsposisjonen er tilgjengelig, kan den brukes for å angi tidssonen din"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Vis juridisk informasjon, status og programvareversjon"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juridisk informasjon"</string>
     <string name="manual" msgid="3651593989906084868">"Brukerveiledning"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Alternativer"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Tilgjengelighet"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysisk tastatur"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Filtertaster"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastaturet ignorerer raskt gjentatte trykk på samme tast innenfor <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastaturet ignorerer raskt gjentatte trykk på samme tast"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grense for filtertaster"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Velg hvor lenge tastaturet skal ignorere gjentatte tastetrykk"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Egendefinert"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"egendefinert verdi"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hengende taster"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Justerer aktiveringstiden for tastetrykk til <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Justerer tiden det tar før tastetrykk aktiveres"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Trege taster"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Aktiver hurtigtaster ved å trykke på én tast av gangen i stedet for å holde flere taster inne samtidig"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Musetaster"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Bruk det fysiske tastaturet for å kontrollere musen."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Bruk musetaster"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Bruk tastaturet til å kontrollere pekeren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvendt rulling med musen"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rull opp for å flytte siden ned"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Bytt om på venstre og høyre knapp"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Bruk venstre museknapp som høyre"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Musetaster for <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Bruk <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>-tastene for å flytte musepekeren"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Bruk <xliff:g id="CLICK_LABEL">%s</xliff:g>-tasten for å klikke på den primære museknappen"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Bruk <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>-tasten for å trykke og holde på den primære museknappen"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Bruk <xliff:g id="RELEASE_LABEL">%s</xliff:g>-tasten for å frigjøre den primære museknappen"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Bruk <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>-tasten for å slå rullemodus av og på. Da ruller <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g>-tastene visningen opp, ned, til venstre eller til høyre"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Bruk <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>-tasten for å klikke på den sekundære museknappen"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Hurtigtaster"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Vis listen over hurtigtaster"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatur og verktøy i jobbprofilen"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Standard"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Styreflate"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Styreflate og mus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Pekerhastighet, bevegelser"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Trykk for å klikke"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Trykk og dra"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klikk nederst til høyre"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klikk nede til høyre på styreflaten for flere alternativer"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Pekerhastighet"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Bruk trykk med tre fingre"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Pekerfarge"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Endre markørfyllstilen til svart"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Endre markørfyllstilen til grønn"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Lær styreflatebevegelser"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"styreflate, styre flate, mus, markør, rull, sveip, høyreklikk, klikk, peker"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"høyreklikk, trykk"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Midtklikk"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Start Assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Gå til startsiden"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Gå tilbake"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Se nylige apper"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Gå til startsiden"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Sveip opp med tre fingre hvor som helst på styreflaten"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Gå tilbake"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Velg en ny tast for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Tilgjengelighet med fysisk tastatur"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Trege taster, filtertaster, musetaster"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Gjenta taster"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Forsinkelse før gjentakelse"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Gjentakelseshastighet"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold en tast inne for å gjenta tegnet til du slipper opp tasten"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-oppsett"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatisk: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forhåndsvisning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardvalg"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Språk"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tekststørrelse"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tekststørrelse"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Tekststil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tilpassede alternativer"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrunnsfarge"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbruk"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pakker"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Appene kjører som normalt"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Du bør bytte batteriet"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batterikapasiteten og ladeeffekten er redusert, og det anbefales at du bytter batteriet."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Batterinivået er lavt"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Slå på batterisparing for å forlenge batterilevetiden"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Forbedre batterilevetiden"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vil du koble fra dette VPN-et?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Koble fra"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versjon"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Glem VPN-profilen"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vil du erstatte det nåværende VPN-et?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vil du angi alltid på-VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"«9:00–17:00 på hverdager»"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalenderaktiviteter"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} er aktiv}=2{{mode_1} og {mode_2} er aktive}=3{{mode_1}, {mode_2} og {mode_3} er aktive}other{{mode_1}, {mode_2} og # til er aktive}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modus kan slås på automatisk}other{# moduser kan slås på automatisk}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ikke forstyrr}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"PÅ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ikke angitt"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Deaktivert"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Greit"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Varsler"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Varighet"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Meldinger, aktiviteter og påminnelser"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillingene for å la venner, familie eller andre kontakter nå deg."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Ferdig"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Innstillinger"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ingen lyd- eller visuell varsling"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Ingen lydvarsling"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Du verken ser eller hører varsler. Anrop fra stjernemerkede kontakter og gjentatte oppringere tillates."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Gjeldende innstilling)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Vil du endre innstillinger for varsler for «Ikke forstyrr»?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Lyder i jobbprofilen"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Bruk lyder fra personlig profil"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Bruk de samme lydene som for den personlige profilen"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Gå rett til forrige skjerm når enheten låses opp. Varsler vises ikke på låseskjermen. Du kan se dem ved å sveipe ned fra toppen."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskjerm, låseskjerm, hopp over, omgå"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Når jobbprofilen er låst"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimer antall varsler på låseskjermen"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Vis færre varsler på låseskjermen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Bare vis nye varsler på låseskjermen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Fjern automatisk varsler som er sett, fra låseskjermen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Varsler på låseskjermen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Vis samtaler, standard og lydløs"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Vis samtaler, både standard og lydløse"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Vis alt innhold i jobbvarsler"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Skjul sensitivt jobbinnhold"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hvordan vil du at profilvarsler skal vises når enheten er låst?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilvarsler"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Varsler"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Appvarsler"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Når du får mange varsler på kort tid, reduserer enheten volumet og minimerer varsler i opptil 2 minutter. Anrop, alarmer og prioriterte samtaler berøres ikke. \n\nDu kan se varsler du får mens dempingen er aktiv, ved å dra ned fra toppen av skjermen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Bruk for jobbprofiler"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Bruk for apper i jobbprofilen"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupperte varsler"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"På"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Av"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Bruk varselsgruppering"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Varsler med lignende temaer blir dempet og gruppert sammen for å gi deg en roligere opplevelse. Sammenslåing overstyrer en apps egne varslingsinnstillinger."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjelpetjenester for VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen av de installerte appene har bedt om å bli kjørt som hjelpetjeneste for VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillate tjenestetilgang for VR for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriterte samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ingen"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ingen}=1{1 samtale}other{# samtaler}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Samtaleinnstillinger"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan forstyrre?"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Selv om meldings- eller ringeapper ikke kan varsle deg, kan personene du velger her, fremdeles nå deg via disse appene"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrop"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktinnstillinger"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Innstillinger for stjernemerkede kontakter"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ingen"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmer"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 # til kan forstyrre}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (jobb)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Beregner …"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Appinnstillinger"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillat at apper overstyrer"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apper som kan forstyrre"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Lag en modus"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Egendefinert modus"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Modusnavn"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Modusnavnet kan ikke stå tomt"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Velg et ikon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalenderaktiviteter"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Sengetidsrutine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Under kjøring"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Fullskjermvarsler"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Tillat fullskjermvarsler fra denne appen"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"La denne appen vise varsler som fyller hele skjermen, når enheten er låst. Apper kan bruke disse til å fremheve alarmer, innkommende anrop eller andre viktige varsler."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Skriving av systeminnstillinger"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Tillat at denne appen endrer systeminnstillinger på dine vegne"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Med denne tillatelsen kan apper endre viktige systeminnstillinger."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apper for medieadministrering"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Tillat at appen administrerer medier"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Hvis du tillater det, kan denne appen endre eller slette mediefiler som opprettes med andre apper, uten å spørre deg. Appen må ha tilgang til filer og medier."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Bevegelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Åpne kameraet raskt"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Trykk to ganger på på/av-knappen to ganger for å åpne kameraet raskt. Dette fungerer på alle skjermer."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Vend kameraet for å ta selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigasjonsmodus"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellittmeldinger"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Send og motta tekstmeldinger via satellitt. Inkludert med kontoen din."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Send og motta tekstmeldinger via satellitt. Ikke inkludert med kontoen din."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellittmeldinger"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Om satellittmeldinger"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Du kan sende og motta tekstmeldinger via satellitt som en del av en kvalifisert <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-konto"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-abonnementet ditt"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellittmeldinger er inkludert med kontoen din"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellittmeldinger er ikke inkludert med kontoen din"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Finn ut mer"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Slik fungerer det"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonen kobles automatisk til en satellitt. Du får best tilkobling på steder med åpen himmel."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Når telefonen kobles til en satellitt"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Du kan sende melding til hvem som helst, inkludert nødtjenester. Telefonen kobles til et mobilnettverk igjen når det er tilgjengelig."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellittmeldinger kan ta lengre tid og er bare tilgjengelige i noen områder. Været og visse bygninger kan påvirke satellittilkoblingen. Anrop via satellitt er ikke tilgjengelig. Nødanrop kan fortsatt kobles til.\n\nDet kan ta litt tid før kontoendringer vises i innstillingene. Kontakt operatøren din for å få vite mer."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mer om satellittmeldinger"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Kan ikke slå på <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"For å slå på <xliff:g id="FUNCTION">%1$s</xliff:g>, avslutt først satellittilkoblingen"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellittilkobling"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Navn på tilgangspunkt"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgjengelig når du er koblet til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Du er i modusen for 16 kB av den sideagnostiske modusen. I denne modusen kan ikke programvareintegriteten garanteres, og eventuelle data som er lagret på telefonen mens oppstartsinnlasteren er låst opp, kan være i fare. Noen funksjoner deaktiveres i disse modusene, så det er ikke sikkert at alle apper fungerer. For å gå tilbake til produksjonsmodusen må du bytte tilbake til modusen for 4 Kb og låse oppstartsinnlasteren på enheten. Da tilbakestilles enheten til fabrikkstandard, og produksjonsinnstillingene gjenopprettes. Når enheten har startet i Android, kan du deaktivere fjerning av produsentsperre i utvikleralternativene. Hvis enheten ikke starter opp i Android, eller hvis den er ustabil, bør du flashe enheten på nytt med de siste fabrikkavbildningene fra &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; eller bruke &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; og velge «Wipe Device» (visk ut alt på enheten), «Lock Bootloader» (lås oppstartsinnlasteren) og «Force Flash all partitions» (tving gjennom flashing av alle partisjoner)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Sideagnostisk modus for 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Les mer"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Kjør appen i modus for kompatibilitet med sidestørrelse"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Feilrapporthåndtering"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Fastslår hvilken app som håndterer Feilrapport-snarveien på enheten din."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personlig"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Lytt til strømmen"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skann en QR-kode for en lydstrøm for å lytte med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Kan ikke redigere passordet under deling. For å bytte passord, slå først av lyddelingen."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Passordet må inneholde 4–16 tegn og bare bokstaver, tall og symboler"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kodeskanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Trenger du hjelp?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Søk i innstillingene"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakter, lagring, konto"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktlager"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Bare enheten"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nye kontakter synkroniseres ikke med kontoer"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter lagres på enheten og synkroniseres med kontoen din som standard"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Feil ved innstilling av standardkonto"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ingen standard er valgt"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Bare enheten"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"På enheten og %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Legg til en konto for å komme i gang"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvor skal kontakter lagres?"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Trykk og hold på hjemknappen eller navigasjonshåndtaket for å søke med innholdet på skjermen."</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 1314e3ad7a2..91edc4852d2 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"हिमकण"</item>
     <item msgid="7952183800501346803">"समुद्री तटमा प्रयोग गरिने छाता"</item>
     <item msgid="799139025758265891">"वर्कसप प्रयोग गरिने औजारहरू"</item>
-    <item msgid="1330084588359129896">"पाल"</item>
+    <item msgid="8112685757657659269">"पियानो"</item>
     <item msgid="3861584909935022342">"फिल्म रिल"</item>
     <item msgid="5827426100157335512">"पुस्तक"</item>
     <item msgid="8585828346253128384">"कमल फूल"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b9a58793c50..97f8d36d766 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लुटुथ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"भोलि स्वतः अन गर्नुहोस्"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"तपाईंले ब्लुटुथ अफ गर्नुभयो भने यो अर्को दिन फेरि अन हुने छ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"दायाँ भाग कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"बायाँ भाग कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"अर्को भाग कनेक्ट गर्नुहोस्"</string>
@@ -86,7 +87,7 @@
     <string name="bluetooth_ringtone_title" msgid="3177308461256892085">"रिङटोन र अलार्महरू"</string>
     <string name="bluetooth_call_title" msgid="6851464952021874072">"कलमा सुनिने अडियो"</string>
     <string name="bluetooth_media_title" msgid="2878373577382067290">"मिडिया र सिस्टमका आवाजहरू"</string>
-    <string name="bluetooth_notification_title" msgid="8708962394926222039">"सूचनाहरू"</string>
+    <string name="bluetooth_notification_title" msgid="8708962394926222039">"नोटिफिकेसनहरू"</string>
     <string name="bluetooth_audio_routing_footer_summary" msgid="410260713589309293">"अडियो आउटपुट छुट्टाछुट्टै एपअनुसार स्वतः निर्धारण गरिन्छ"</string>
     <string name="bluetooth_audio_codec_default_selection" msgid="4753278792700664175">"सिस्टमको छनौट प्रयोग गर्नुहोस् (डिफल्ट)"</string>
     <string name="bluetooth_device" msgid="2217973503732544291">"बेनामी ब्लुटुथ उपकरण"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"\"ब्लुटुथ लो इनर्जी अडियो\" अफ गर्नुहोस्"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"डिभाइसमा LE अडियो हार्डवेयर चलाउन मिल्छ भने \"ब्लुटुथ लो इनर्जी अडियो\" सुविधा अफ हुन्छ।"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ब्लुटुथ लो इनर्जी अडियो मोड"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ब्लुटुथ लो इनर्जी अडियो ब्रोडकास्ट UI को प्रिभ्यू अन गर्नुहोस्"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"यसले व्यक्तिगत अडियो सेयर गर्ने सुविधा र निजी रूपमा ब्रोडकास्ट गर्ने सुविधा समावेश गरिएको लो इनर्जी अडियो सेयर गर्ने सुविधाको UI प्रिभ्यू अन गर्छ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"डिभाइसको विवरणमा LE अडियोको टगल देखाउनुहोस्"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ब्लुटुथ लो इनर्जी अडियोको श्वेतसूची बाइपास गर्नुहोस्"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE अडियो पेरिफरलले श्वेतसूचीको मापदण्ड पूरा गर्छ भन्ने कुरा पुष्टि नगरिए तापनि LE अडियो डिफल्ट रूपमा प्रयोग गर्नुहोस्।"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"एपको भाषा"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"सिफारिस गरिएका भाषाहरू"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"सबै भाषा"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"सिफारिस गरिएको"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"सबै भाषा"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"सबै क्षेत्रहरू"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"सबै सङ्ख्या प्रणाली"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"सिस्टमको भाषा"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"सिस्टम डिफल्ट"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"सेटिङबाट यो एपका लागि भाषा चयन गर्न मिल्दैन।"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"परिवर्तन गर्नुहोस्"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s उपलब्ध छैन"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"यो भाषालाई सिस्टमको भाषाका रूपमा प्रयोग गर्न सकिँदैन तर तपाईंले एप तथा वेबसाइटलाई तपाईं यो भाषा रुचाउनुहुन्छ भन्ने कुराको जानकारी दिनुभएको छ।"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"खोज"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"भाषा हाल्नुहोस्"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"क्षेत्रको प्राथमिकता"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"भाषाको नाम टाइप गर्नुहोस्"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"भाषासम्बन्धी थप सेटिङ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"क्षेत्रीय प्राथमिकताहरू"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"एकाइ तथा सङ्ख्यासम्बन्धी प्राथमिकताहरू तोक्नुहोस्"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"एपहरूले तपाईंलाई पर्सनलाइज गरिएका सुविधा प्रदान गर्न सकुन् भन्नाका लागि ती एपहरूलाई तपाईंका क्षेत्रीय प्राथमिकताहरू बारेमा जानकारी दिनुहोस्।"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"एपहरूले सम्भव भएसम्म तपाईंले तोकेका क्षेत्रीय प्राथमिकताहरू प्रयोग गर्ने छ।"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"क्षेत्रीय प्राथमिकताहरू"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"तापक्रम"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"हप्ताको पहिलो दिन"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"नम्बरसम्बन्धी प्राथमिकताहरू"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"रोमिङमा हुँदा मोबाइल डेटा प्रयोग गर्नुहोस्"</string>
     <string name="roaming_disable" msgid="729512894708689604">"रोमिङमा हुँदा मोबाइल डेटा प्रयोग गर्नुहोस्"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"रोमिङ शुल्क लाग्न सक्छ।"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"समय स्वतः सेट गर्नुहोस्"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"स्वतः सेट गर्नुहोस्"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"यो टगल अन भएका बेला प्रामाणिक समय तय गर्न लोकेसन प्रयोग गरिने छ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"मिति र समय स्वतः सेट गर्ने सुविधा"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"तपाईंको नेटवर्क र वायरलेस सिग्नल प्रयोग गरेर मिति र समय स्वतः सेट गर्नुहोस्"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"स्वचालित प्रामाणिक समय"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"तपाईंको नजिकै भएका मोबाइल नेटवर्कका आधारमा मिति र समय स्वतः सेट गर्नुहोस्"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"उपलब्ध भएमा आफ्नो डिभाइसको लोकेसन प्रयोग गरेर मिति र समय स्वतः सेट गर्नुहोस्"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकेलको डिफल्ट सेटिङ प्रयोग गर्नुहोस्"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४-घण्टे ढाँचा प्रयोग गर्नुहोस्"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"समय"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"औँला उठाएर फेरि सेंसर छुनुहोस्"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"फिंगरप्रिन्ट सेन्सर प्रयोग गर्न मिल्दैन"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"फिंगरप्रिन्ट सेन्सर मर्मत गर्ने सेवा प्रदायक कम्पनीमा सम्पर्क गर्नुहोस्।"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"स्क्रिन अफ हुँदा फिंगरप्रिन्टले अनलक गर्ने सुविधा"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"स्क्रिन अफ भएका बेलामा पनि फिंगरप्रिन्ट अनलक प्रयोग गर्नुहोस्"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"स्क्रिन अफ हुँदा अनलक गर्ने सुविधा"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"सुरक्षासम्बन्धी थप सेटिङ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"कार्य प्रोफाइलको लक, इन्क्रिप्सन र अन्य कुराहरू"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"इन्क्रिप्सन, युजरनेम, पासवर्ड र अन्य कुराहरू"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"आफ्नो निजी स्पेसका लागि प्याटर्न सेट गर्नुहोस्"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"लक गर्नुहोस्"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"लुकाउनुहोस्"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"आफ्नो निजी स्पेसको प्याटर्न पुष्टि गर्नुहोस्"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"आफ्नो निजी स्पेसको PIN फेरि हाल्नुहोस्"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"आफ्नो निजी स्पेसको पासवर्ड फेरि हाल्नुहोस्"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"तपाईं बढीमा <xliff:g id="COUNT">%d</xliff:g> वटा फिंगरप्रिन्टहरू हाल्न सक्नुहुन्छ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"तपाईंले अधिकतम संख्यामा फिंगरप्रिन्टहरू थप्नुभएको छ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"थप फिंगरप्रिन्टहरू थप्न सकिँदैन"</string>
@@ -792,7 +813,7 @@
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="253673907244112643">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटा मेटाइने छ"</string>
     <string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि # वर्ण समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा वर्ण हुनु पर्छ}}"</string>
     <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{तपाईं सङ्ख्या मात्र प्रयोग गर्दै हुनुहुन्छ भने उक्त सङ्ख्यामा कम्तीमा एउटा अङ्क हुनु पर्छ}other{तपाईं सङ्ख्या मात्र प्रयोग गर्दै हुनुहुन्छ भने उक्त सङ्ख्यामा कम्तीमा # वटा अङ्क हुनु पर्छ}}"</string>
-    <string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{PIN मा अनिवार्य रूपमा कम्तीमा # अङ्क समावेश हुनु पर्छ}other{PIN मा अनिवार्य रूपमा कम्तीमा # वटा अङ्क हुनु पर्छ}}"</string>
+    <string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{PIN मा कम्तीमा पनि # अङ्क समावेश हुनु पर्छ}other{PIN मा कम्तीमा पनि # वटा अङ्क समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{PIN मा अनिवार्य रूपमा कम्तीमा # अङ्क समावेश हुनु पर्छ तर अतिरिक्त सुरक्षाका निम्ति {minAutoConfirmLen} अङ्कको PIN हाल्न सिफारिस गरिन्छ}other{PIN मा अनिवार्य रूपमा कम्तीमा # अङ्क समावेश हुनु पर्छ तर अतिरिक्त सुरक्षाका निम्ति {minAutoConfirmLen} अङ्कको PIN हाल्न सिफारिस गरिन्छ}}"</string>
     <string name="lockpassword_password_too_long" msgid="1940345313260498308">"{count,plural, =1{अनिवार्य रूपमा # भन्दा कम वर्ण हुनु पर्छ}other{अनिवार्य रूपमा # भन्दा कम वर्ण हुनु पर्छ}}"</string>
     <string name="lockpassword_pin_too_long" msgid="1678212054564388576">"{count,plural, =1{अनिवार्य रूपमा # भन्दा कम अङ्क हुनु पर्छ}other{अनिवार्य रूपमा # भन्दा कम अङ्क हुनु पर्छ}}"</string>
@@ -801,7 +822,7 @@
     <string name="lockpassword_password_requires_letters" msgid="7058340182953750553">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि १ अक्षर समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा अक्षर समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_password_requires_lowercase" msgid="3286121470522077547">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि १ लोअरकेस अक्षर समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा लोअरकेस अक्षर समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_password_requires_uppercase" msgid="720312543910397772">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि १ अप्परकेस अक्षर समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा अप्परकेस अक्षर समावेश हुनु पर्छ}}"</string>
-    <string name="lockpassword_password_requires_numeric" msgid="3886918493600507548">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि १ अङ्क समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा अङ्क समावेश हुनु पर्छ}}"</string>
+    <string name="lockpassword_password_requires_numeric" msgid="3886918493600507548">"{count,plural, =1{कम्तीमा पनि १ अङ्क समावेश हुनु पर्छ}other{कम्तीमा पनि # वटा अङ्क समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_password_requires_symbols" msgid="2904870551002210131">"{count,plural, =1{अनिवार्य रूपमा कम्तीमा पनि १ विशेष चिन्ह समावेश हुनु पर्छ}other{अनिवार्य रूपमा कम्तीमा पनि # वटा विशेष चिन्ह समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_password_requires_nonletter" msgid="1185342065898300006">"{count,plural, =1{अनिवार्य रूपमा अक्षरबाहेकका कम्तीमा पनि १ वर्ण समावेश हुनु पर्छ}other{अनिवार्य रूपमा अक्षरबाहेकका कम्तीमा पनि # वर्ण समावेश हुनु पर्छ}}"</string>
     <string name="lockpassword_password_requires_nonnumerical" msgid="389687423482993365">"{count,plural, =1{अनिवार्य रूपमा अङ्कबाहेकका कम्तीमा पनि १ वर्ण समावेश हुनु पर्छ}other{अनिवार्य रूपमा अङ्कबाहेकका कम्तीमा पनि # वटा वर्ण समावेश हुनु पर्छ}}"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"अन छ"</string>
     <string name="external_display_off" msgid="5634413756025351374">"अफ छ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"बाह्य डिस्प्ले"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"बाह्य डिस्प्ले प्रयोग गर्नुहोस्"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"डिस्प्लेको रिजोल्युसन"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"बाह्य डिस्प्ले डिस्कनेक्ट गरिएको छ"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"तपाईंले रोटेसन वा रिजोल्युसन बदल्नुभयो भने हाल चलिरहेका एपहरू बन्द हुन सक्छन्"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"तपाईंको डिभाइस बाह्य डिस्प्लेमा कनेक्ट गरिएको छ भने मात्र डिभाइसको स्क्रिन मिरर गर्न सकिन्छ"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"थप विकल्पहरू"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"डिस्प्लेहरू पुनः मिलाउन होल्ड गरी ड्र्याग गर्नुहोस्।"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रिन मिरर गर्नुहोस्"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"पासवर्डको जाँच गरी फेरि प्रयास गर्नुहोस्"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"यन्रको निर्मातासँग सम्पर्क गर्नुहोस्"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"इन्टरनेटको जाँच गरी फेरि प्रयास गर्नुहोस्"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"यो Wi-Fi नेटवर्क अहिले उपलब्ध छैन"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"यो QR कोडमा कुनै समस्या आएको छ। अर्कै तरिका अपनाएर कनेक्ट गरी हेर्नुहोस्।"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"नेटवर्क छनौट गर्नुहोस्"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"आफ्नो यन्त्र जडान गर्न कुनै नेटवर्क छनौट गर्नुहोस्"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"यो यन्त्रलाई “<xliff:g id="SSID">%1$s</xliff:g>” मा थप्ने हो?"</string>
@@ -1033,7 +1059,7 @@
     <string name="wifi_dpp_could_not_add_device" msgid="6865710911186601933">"यन्त्र थप्न सकिएन"</string>
     <string name="wifi_dpp_device_found" msgid="633646744759830603">"यन्त्र भेटियो"</string>
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"यो सेवामार्फत Wi‑Fi आदान प्रदान गर्दै…"</string>
-    <string name="wifi_dpp_connecting" msgid="2312769193202897589">"जडान गर्दै…"</string>
+    <string name="wifi_dpp_connecting" msgid="2312769193202897589">"कनेक्ट गर्दै…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"हटस्पट सेयर गर्नुहोस्"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"आफ्नो पहिचान पुष्टि गर्नुहोस्"</string>
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi को पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
@@ -1068,7 +1094,7 @@
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"फेरि कहिल्यै नदेखाउनुहोस्"</string>
     <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट गर्नुहोस्"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा कनेक्ट गरियो"</string>
-    <string name="wifi_connecting" msgid="7450277833386859724">"जडान गर्दै…"</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>
     <string name="wifi_forget" msgid="3485573280364015620">"बिर्सनुहोस्"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"अटोरोटेटका बारेमा थप जान्नुहोस्"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"स्क्रिन रिजोल्युसन"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"उच्च रिजोल्युसन"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"फुल रिजोल्युसन"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"फुल रिजोल्युसन प्रयोग गर्दा तपाईंको डिभाइसको ब्याट्री बढी खपत हुन्छ। तपाईंले रोजेको रिजोल्युसन प्रयोग गर्नुभयो भने केही एपहरू रिस्टार्ट हुन सक्छन्।"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"चयन गरियो"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रङ्गहरू"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"प्राकृतिक"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"एड्याप्टिभ"</string>
     <string name="brightness" msgid="6216871641021779698">"चमकको स्तर"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"एड्याप्टिभ ब्राइटनेस"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"अनुकूलनयोग्य चमकका बारेमा"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"स्क्रिनको चमक तपाईंको वातावरण र गतिविधिअनुसार स्वतः समायोजन हुन्छ। तपाईं स्लाइडर सारेर एड्याप्टिभ ब्राइटनेसलाई तपाईंको रूची पहिचान गर्न मद्दत गर्न सक्नुहुन्छ।"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"सक्रिय छ"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"अफ छ"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"बेडटाइम मोडसम्बन्धी सेटिङहरू"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{मोडहरूले अँध्यारो थिम अन गर्न पनि सक्छन्}=1{{mode_1} ले अँध्यारो थिम पनि अन गर्छ}=2{{mode_1} र {mode_2} ले अँध्यारो थिम पनि अन गर्छन्}=3{{mode_1}, {mode_2} र {mode_3} ले अँध्यारो थिम पनि अन गर्छन्}other{{mode_1}, {mode_2} र थप # वटा मोडले अँध्यारो थिम पनि अन गर्छन्}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"मोडहरूसम्बन्धी सेटिङ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"अझ मधुरो"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"अझै मधुरो"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"डिभाइस चमक सदाको भन्दा बढी मधुरो बनाउन दिनुहोस्"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रिन टाइम आउट हुने समय"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>को निष्क्रियतापछि"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ अफ भएको बेलामा पनि) वरपरका डिभाइस खोज्ने अनुमति दिनुहोस्‌। यसलाई लोकेसनमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"लोकेसन सर्भिस"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"लोकेसनसम्बन्धी सेवाहरू"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"लोकेसन प्रयोग गर्नुहोस्"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"प्रामाणिक समयका लागि लोकेसन प्रयोग गर्नुहोस्"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"प्रामाणिक समय स्वतः तय गर्न सकिँदैन"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"लोकेसन वा लोकेसन सेवाहरू अफ छन्"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"लोकेसन सेटिङ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"यसलाई सच्याउनुहोस्"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"रद्द गर्नुहोस्"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"प्रामाणिक समय स्वतः पत्ता लगाउने सुविधा अफ छ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"स्वचालित प्रामाणिक समय अफ हुँदा यो सुविधा उपलब्ध हुँदैन"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"प्रामाणिक समय सेट गर्न लोकेसन प्रयोग गर्न सकिन्छ"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"तपाईंको डिभाइसको लोकेसन उपलब्ध भएका खण्डमा यसलाई तपाईंको प्रामाणिक समय सेट गर्न प्रयोग गरिन सक्छ"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"कानुनी जानकारी, वस्तुस्थिति, सफ्ट्वेयर संस्करण हेर्नुहोस्"</string>
     <string name="legal_information" msgid="7509900979811934843">"कानुनी जानकारी"</string>
     <string name="manual" msgid="3651593989906084868">"म्यानुअल"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"विकल्पहरू"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"एक्सेसिबिलिटी सुविधा"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"फिजिकल किबोर्ड"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"बाउन्स की"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"किबोर्डले <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> मिलिसेकेन्डभित्र एउटै कीमा छिटो छिटो दोहोर्‍याएर थिचिएका खण्डमा बेवास्ता गर्छ"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"एउटै की बारम्बार थिच्दा किबोर्डले तुरुन्तै बेवास्ता गर्छ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"बाउन्स कीको सीमा"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"कति समयसम्म बारम्बार की थिच्दा किबोर्डले बेवास्ता गर्छ भन्ने कुरा छनौट गर्नुहोस्"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"०.२ सेकेन्ड"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"०.४ सेकेन्ड"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"०.६ सेकेन्ड"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"कस्टम"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"कस्टम मान"</string>
     <string name="slow_keys" msgid="2891452895499690837">"स्लो की"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> मिलिसेकेन्डमा एक्टिभेट गर्नका लागि कुनै की थिच्न लाग्ने समय समायोजन गर्छ"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"कुनै की कति समयसम्म थिच्दा एक्टिभेट हुन्छ भन्ने कुरा मिलाउँछ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"स्टिकी की"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"सर्टकट प्राप्त गर्नका लागि कीहरू सँगै थिचिराख्नुको साटो एक पटकमा एउटा की थिच्नुहोस्"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस की"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"माउस नियन्त्रण गर्न भौतिक किबोर्ड प्रयोग गर्नुहोस्।"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"माउसका कीहरू प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"पोइन्टर नियन्त्रण गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउसको विपरीत दिशामा स्क्रोल गर्ने विकल्प"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज सारेर तल लैजान माथितिर स्क्रोल गर्नुहोस्"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"दायाँ र बायाँ बटन अदलबदल गर्नुहोस्"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माउसको बायाँपट्टिको बटनलाई दायाँ बटनका रूपमा प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> का लागि माउस कीहरू"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"माउसको पोइन्टर सार्न <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> कीहरू प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"माउसको मुख्य बटन क्लिक गर्न <xliff:g id="CLICK_LABEL">%s</xliff:g> की प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"माउसको मुख्य बटन थिचिराख्न <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> की प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"माउसको मुख्य बटन क्लिक गर्न छाड्न <xliff:g id="RELEASE_LABEL">%s</xliff:g> की प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"स्क्रोल मोड टगल गर्न <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> की प्रयोग गर्नुहोस्। यसो गर्नुभयो भने <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> कीहरूमार्फत माथि, तल, बायाँ वा दायाँ स्क्रोल गर्न सकिन्छ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"माउसको अर्को बटन क्लिक गर्न <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> की प्रयोग गर्नुहोस्"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"किबोर्डका सर्टकटहरू"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"सर्टकटहरूको सूची देखाउनुहोस्"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"कार्य प्रोफाइल किबोर्ड र उपकरणहरू"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"डिफल्ट"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"टचप्याड"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"टचप्याड र माउस"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"माउस"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"पोइन्टरको गति, जेस्चरहरू"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ट्याप टु क्लिक"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ट्याप गरी ड्रयाग गर्ने सुविधा"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"बटम-राइट क्लिक"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"थप विकल्प हेर्न टचप्याडको पुछारको दायाँ कुनामा क्लिक गर्नुहोस्"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"पोइन्टरको गति"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"तीन औँलाले ट्याप गर्नुहोस्"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"पोइन्टरको रङ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"पोइन्टर फिलको शैली बदलेर कालो बनाउनुहोस्"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"पोइन्टर फिलको शैली बदलेर हरियो बनाउनुहोस्"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"टचप्याड जेस्चरका बारेमा जानकारी"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ट्र्याकप्याड, ट्र्याक प्याड, माउस, कर्सर, स्क्रोल, स्वाइप, राइट क्लिक, क्लिक, पोइन्टर"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"राइट क्लिक, ट्याप"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"बिचमा क्लिक गर्नुहोस्"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"सहायक सुरु गर्नुहोस्"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"होममा जानुहोस्"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"पछाडि जानुहोस्"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"हालसालै चलाइएका एपहरू हेर्नुहोस्"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"होमपेजमा जाने तरिका"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"टचप्याडको जुनसुकै ठाउँमा तीन वटा औँलाले माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"पछाडि जाने तरिका"</string>
@@ -1998,7 +2053,7 @@
     <string name="trackpad_go_home_summary" msgid="2222744701528360887">"तीन वटा औँलाले माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="trackpad_recent_apps_title" msgid="8195970908411585445">"हालसालै चलाइएका एपहरू"</string>
     <string name="trackpad_recent_apps_summary" msgid="2685092851677573794">"तीन वटा औँलाले माथितिर स्वाइप गर्नुहोस्, अनि होल्ड गर्नुहोस्"</string>
-    <string name="trackpad_notifications_title" msgid="3521663305043747880">"सूचनाहरू"</string>
+    <string name="trackpad_notifications_title" msgid="3521663305043747880">"नोटिफिकेसनहरू"</string>
     <string name="trackpad_notifications_summary" msgid="7663647367648690040">"तीन वटा औँलाले तलतिर स्वाइप गर्नुहोस्"</string>
     <string name="trackpad_switch_apps_title" msgid="7342032935377284039">"एउटा एपबाट अर्को एपमा जाने तरिका"</string>
     <string name="trackpad_switch_apps_summary" msgid="9193942041912927440">"चार वटा औँलाले बायाँ वा दायाँतिर स्वाइप गर्नुहोस्"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> को नयाँ की छनौट गर्नुहोस्:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"भौतिक किबोर्डको सर्वसुलभता"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी कीहरू, बाउन्स कीहरू, माउस कीहरू"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"कीहरू दोहोर्‍याउनुहोस्"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"वर्ण दोहोरिनुअघि सम्बन्धित कि कति बेरसम्म थिच्न सकिन्छ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"दोहोरिने दर"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"की नछाड्नुन्जेल कीको वर्ण दोहोर्‍याउन की थिचिराख्नुहोस्"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफल्ट"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"स्वचालित: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"पूर्वावलोकन"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"डिफल्ट विकल्पहरू"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"टेक्स्टको आकार"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"क्याप्सनको आकार"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"क्याप्सनको शैली"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">" कस्टम विकल्प"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"पृष्ठभूमि रङ्ग"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"उर्जा प्रयोग मिलाउनुहोस्"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"सम्मिलित प्याकेजहरू"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"एपहरू सामान्य रूपमा चलिरहेका छन्"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ब्याट्री बदल्न सिफारिस गरिएको छ"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ब्याट्रीको क्षमता र चार्जिङ पर्फर्मेन्स घटेको छ र ब्याट्री बदल्न सिफारिस गरिएको छ।"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ब्याट्री कम छ"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ब्याट्रीको आयु बढाउन ब्याट्री सेभर अन गर्नुहोस्"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ब्याट्रीको आयु सुधार्नुहोस्"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"यो VPN को जडान विच्छेद गर्ने हो?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"डिस्कनेक्ट गर्नुहोस्"</string>
     <string name="vpn_version" msgid="6344167191984400976">"संस्करण"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"संस्करण <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN लाई बिर्सनुहोस्"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"विद्यमान VPN लाई बदल्ने हो?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"सधैँ-सक्रिय VPN लाई सेट गर्ने हो?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"सप्ताहान्तबाहेकका दिन बिहान ९ देखि साँझ ५ बजेसम्म\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"पात्रोमा सेट गरिएका कार्यक्रमहरू"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} सक्रिय छ}=2{{mode_1} र {mode_2} सक्रिय छन्}=3{{mode_1}, {mode_2} र {mode_3} सक्रिय छन्}other{{mode_1}, {mode_2} र अरू # वटा मोड सक्रिय छन्}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{एउटा मोड स्वतः अन हुन सक्छ}other{# वटा मोड स्वतः अन हुन सक्छन्}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Do Not Disturb}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"अन छ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"सेट गरिएको छैन"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"अफ गरिएको छ"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"बुझेँ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"सूचनाहरू"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"अवधि"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"सन्देश, कार्यक्रम तथा रिमाइन्डरहरू"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"सम्पन्न भयो"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"सेटिङहरू"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">" सूचना आउँदा भिजुअल वा साउन्ड नआओस्"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"सूचना आउँदा साउन्ड नआओस्"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"तपाईं सूचनाहरू देख्न वा सुन्न सक्नु हुने छैन। ताराङ्कित सम्पर्क ठेगाना तथा बारम्बार कल गर्ने व्यक्तिका कलहरू।"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(हालको सेटिङ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"बाधा नपुर्याउनुहोस् नामक मोडका सूचनासम्बन्धी सेटिङहरू बदल्ने हो?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"कार्य प्रोफाइलको साउन्ड"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"व्यक्तिगत प्रोफाइलका साउन्डहरूको प्रयोग गर्नुहोस्"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"तपाईंको व्यक्तिगत प्रोफाइलमा सेट गरिएको साउन्ड प्रयोग गरिन्छ"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"अनलक गरेपछि सीधै पछिल्लो पटक प्रयोग गरिएकै स्क्रिनमा पुग्नुहोस्। लक स्क्रिनमा सूचनाहरू देखाइने छैनन्। सूचनाहरू हेर्न सिरानबाट तलतिर स्वाइप गर्नुहोस्।"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लक स्क्रिन, लकस्क्रिन, छाड्नुहोस्, बाइपास गर्नुहोस्"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"कार्य प्रोफाइल लक हुँदा"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"लक स्क्रिनमा थोरै नोटिफिकेसनहरू देखाउने विकल्प"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"लक स्क्रिनमा अझ थोरै नोटिफिकेसनहरू देखाउनुहोस्"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"लक स्क्रिनमा नयाँ सूचनाहरू मात्र देखाउनुहोस्"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"यसअघि हेरिएका सूचनाहरू लक स्क्रिनबाट स्वतः हटाउनुहोस्"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"लक स्क्रिनमा देखाइने सूचनाहरू"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"वार्तालाप, डिफल्ट र साइलेन्ट मोड देखाउनुहोस्"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"सबै वार्तालाप देखाउनुहोस्"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"कार्यसम्बन्धी सबै सूचना देखाउनुहोस्"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"कार्यसम्बन्धी संवेदनशील सामग्री लुकाउनुहोस्"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"तपाईंको यन्त्र लक हुँदा, तपाईं प्रोफाइल सूचनाहरू कसरी देखाउन चाहनुहुन्छ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"तपाईंले छोटो समयमा धेरै नोटिफिकेसन प्राप्त गर्दा तपाईंको डिभाइसले बढीमा २ मिनेटसम्म ती नोटिफिकेसनको साउन्डको भोल्युम घटाउँछ र अलर्टहरू कम देखाउँछ। कल, अलार्म र महत्त्वपूर्ण वार्तालापहरू भने प्रभावित हुँदैनन्। \n\nडिभाइसको स्क्रिनको सिरानबाट तलतिर स्वाइप गरेर कुलडाउनका बेला प्राप्त भएका नोटिफिकेसनहरू हेर्न सकिन्छ।"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"कार्य प्रोफाइलहरूमा लागू गर्नुहोस्"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"कार्य प्रोफाइलका एपहरूमा लागू गर्नुहोस्"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"बन्डल गरिएका नोटिफिकेसनहरू"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"अन छ"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"अफ छ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"सूचनाहरूको बन्डल बनाउने सुविधा प्रयोग गर्नुहोस्"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"मिल्दाजुल्दा थिमहरू भएका सूचनाहरू साइलेन्ट पारिने छन् र अझ शान्त अनुभव प्रदान गर्नका निम्ति तिनलाई एउटै समूहमा राखिने छन्। तपाईंले सूचनाहरूको बन्डल बनाउनुभयो भने एपका नोटिफिकेसन सेटिङ ओभरराइड गरिने छ।"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR का सहायक सेवाहरू"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"इन्स्टल गरिएका कुनै पनि एपहरूले VR का सहायक सेवाहरूको रूपमा चल्ने अनुरोध गरेका छैनन्।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई VR सेवा चलाउने अनुमति दिने हो?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"महत्त्वपूर्ण वार्तालापहरू"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कुनै पनि होइन"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कुनै पनि वार्तालाप होइन}=1{एउटा वार्तालाप}other{# वटा वार्तालाप}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"वार्तालापसम्बन्धी सेटिङ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"यो सेटिङ लागू नहुने व्यक्तिहरू"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"तपाईंले म्यासेजिङ वा कलिङ एपबाट सूचना प्राप्त गर्नुभएन भने पनि तपाईंले रोज्नुभएका मान्छेले ती एपमार्फत तपाईंलाई सम्पर्क भने गरिरहन सक्छन्"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कलहरू"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"जोसुकै"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"कन्ट्याक्टहरू"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ताराङ्कित कन्ट्याक्टहरू"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"कन्ट्याक्टसम्बन्धी सेटिङ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ताराङ्कित कन्ट्याक्टसम्बन्धी सेटिङ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"कुनै पनि होइन"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"कुनै पनि होइन"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्महरू"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (काम)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"हिसाब गरिँदै छ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"एपसम्बन्धी सेटिङ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"एपहरूलाई ओभरराइड गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"अफ गर्न सक्ने एपहरू"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"मोड बनाउनुहोस्"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोडको नाम"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"मोडको नाम खाली छाड्न मिल्दैन"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"कुनै आइकन छनौट गर्नुहोस्"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"पात्रोमा सेट गरिएका कार्यक्रमहरू"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"सुत्ने समयको रुटिन"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"सवारी साधन चलाइरहेका बेला"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"फुल स्क्रिनमा नोटिफिकेसनहरू देखाउने अनुमति"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"यो एपलाई नोटिफिकेसनहरू फुल स्क्रिनमा देखाउने अनुमति दिनुहोस्"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"यो एपलाई डिभाइस लक भएका बेला फुल स्क्रिन ढाक्ने खालका सूचनाहरू देखाउने अनुमति दिनुहोस्। एपहरूले अलार्म, आगमन कल वा अन्य महत्त्वपूर्ण सूचनाहरू हाइलाइट गर्ने प्रयोजनका लागि फुल स्क्रिनमा सूचनाहरू देखाउन सक्छन्।"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"सिस्टमका सेटिङ परिवर्तन गर्ने अनुमति"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"यो एपलाई तपाईंका तर्फबाट सिस्टमका सेटिङ परिवर्तन गर्न दिनुहोस्"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"कुनै एपलाई यो अनुमति दिइएका खण्डमा उक्त एपले सिस्टमका मूलभूत सेटिङ परिवर्तन गर्न पाउँछ।"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"मिडिया व्यवस्थापन गर्ने अनुमति दिइएका एप"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"एपलाई मिडिया व्यवस्थापन गर्ने अनुमति दिनुहोस्"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"तपाईंले यो अनुमति दिनुभयो भने यो एपले तपाईंलाई नसोधिकन अन्य एपमार्फत सिर्जना गरिएका मिडिया फाइलहरूमा फेरबदल गर्न र तिनलाई मेटाउन सक्छ। यो एपलाई फाइल र मिडिया हेर्ने तथा प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ।"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"जेस्चरहरू"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"तुरुन्तै क्यामेरा खोल्ने"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"पावर बटनलाई दुई पटक थिच्दा क्यामेरा द्रुत रूपमा खुलोस्। जुनसुकै स्क्रिन मार्फत यो सुविधाको प्रयोग गर्न सकिन्छ।"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"सेल्फी खिच्न क्यामेरा फ्लिप गर्ने"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"नेभिगेसन मोड"</string>
@@ -4690,7 +4789,7 @@
     <string name="choose_network_title" msgid="5355609223363859430">"नेटवर्क छनौट गर्नुहोस्‌"</string>
     <string name="network_disconnected" msgid="8281188173486212661">"डिस्कनेक्ट गरियो"</string>
     <string name="network_connected" msgid="7637745547242487795">"कनेक्ट भएको छ"</string>
-    <string name="network_connecting" msgid="6856124847029124041">"जडान गर्दै…"</string>
+    <string name="network_connecting" msgid="6856124847029124041">"कनेक्ट गर्दै…"</string>
     <string name="network_could_not_connect" msgid="676574629319069922">"जडान गर्न सकिएन"</string>
     <string name="empty_networks_list" msgid="6519489879480673428">"कुनै पनि नेटवर्क भेटिएन।"</string>
     <string name="network_query_error" msgid="6406348372070035274">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधा"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"स्याटलाइटमार्फत टेक्स्ट म्यासेजहरू पठाउनुहोस् र प्राप्त गर्नुहोस्। यो सुविधा तपाईंको खातामा उपलब्ध छ।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"स्याटलाइटमार्फत टेक्स्ट म्यासेजहरू पठाउनुहोस् र प्राप्त गर्नुहोस्। यो सुविधा तपाईंको खातामार्फत प्रयोग गर्न मिल्दैन।"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधा"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधासम्बन्धी जानकारी"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"तपाईं योग्य <xliff:g id="CARRIER_NAME">%1$s</xliff:g> खाताका भागका रूपमा स्याटलाइटमार्फत टेक्स्ट म्यासेज पठाउन र प्राप्त गर्न सक्नुहुन्छ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सम्बन्धी योजना"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधा तपाईंको खातामा समावेश गरिएको हुन्छ"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधा तपाईंको खातामा समावेश गरिएको हुँदैन"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"थप जान्नुहोस्"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"यसले काम गर्ने तरिका"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"तपाईंको फोन स्याटलाइटमा स्वतः कनेक्ट हुने छ। उत्कृष्ट कनेक्सन प्राप्त गर्न आफ्नो फोन आकाश राम्रोसँग देखिने ठाउँमा राखिराख्नुहोस्।"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"तपाईंको फोन स्याटलाइटमा कनेक्ट भएपछि"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"तपाईं आपत्‌कालीन सेवालगायत सबै जनालाई टेक्स्ट म्यासेज पठाउन सक्नुहुन्छ। तपाईंको फोन मोबाइल नेटवर्क उपलब्ध भएका बेला उक्त नेटवर्कमा रिकनेक्ट हुने छ।"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधा प्रयोग गर्दा सामान्यभन्दा बढी समय लाग्न सक्छ र यो सुविधा केही क्षेत्रहरूमा मात्र उपलब्ध छ। मौसम र निश्चित संरचनाहरूले स्याटलाइट कनेक्सनमा असर गर्न सक्छ। स्याटलाइटमार्फत कल गर्ने सुविधा उपलब्ध छैन। आपत्‌कालीन कल अझै पनि कनेक्ट हुन सक्छ।\n\nतपाईंको खातामा गरिएका परिवर्तनहरू सेटिङमा देखिन केही समय लाग्न सक्छ। यससम्बन्धी थप जानकारी प्राप्त गर्न आफ्नो सेवा प्रदायकलाई सम्पर्क गर्नुहोस्।"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"स्याटलाइटमार्फत म्यासेज पठाउने सुविधाका बारेमा थप जानकारी"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> अन गर्न सकिँदैन"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> अन गर्न सर्वप्रथम स्याटलाइट कनेक्सन अन्त्य गर्नुहोस्।"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"स्याटलाइट कनेक्टिभिटी"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"एक्सेस पोइन्ट नेम"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको १६ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताको ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले ४ के.बि. मोडमा फर्किएर डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यसो गरेपछि डिभाइस फेरि फ्याक्ट्री रिसेट हुने छ र त्यसका सेटिङ रिस्टोर भई प्रोडक्सन सेटिङ कायम हुने छ। डिभाइस Android मा बुट भएपछि विकासकर्ता मोडमा गई OEM अनलक सेटिङ अफ गर्नुहोस्। डिभाइस Android मा बुट भएन वा डिभाइसको पर्फर्मेन्स अस्थिर भयो भने &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; मा भएको नवीनतम फ्याक्ट्री इमेज प्रयोग गरी डिभाइस रिफ्ल्यास गर्नुहोस् वा &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; प्रयोग गर्नुहोस् र \'डिभाइस मेटाउनुहोस्\', \'बुटलोडर लक गर्नुहोस्\' र \'सबै पार्टिसन बलपूर्वक फ्ल्यास गर्नुहोस्\' चयन गर्नुहोस्।"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"१६ के.बि. पेज एग्नोस्टिक मोड"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"थप पढ्नुहोस्"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"यो एप पेज साइज कम्प्याटिबिलिटी मोडमा चलाउनुहोस्"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"बग रिपोर्ट ह्यान्ड्लर"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"तपाईंको डिभाइसमा कुन एपले बग रिपोर्टसम्बन्धी सर्टकट ह्यान्डल गर्दछ भन्ने कुरा निर्धारण गर्दछ।"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"व्यक्तिगत"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"स्ट्रिम सुन्नुहोस्"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग अडियो स्ट्रिम सुन्न उक्त स्ट्रिमको QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"अडियो सेयर गरिरहेका बेला पासवर्ड बदल्न मिल्दैन। पासवर्ड बदल्न सर्वप्रथम अडियो सेयरिङ अफ गर्नुहोस्।"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"तपाईंको पासवर्डमा अनिवार्य रूपमा ४ देखि १६ वर्ण हुनु पर्छ र त्यसमा अक्षर, अङ्क र सङ्केतहरू मात्र प्रयोग गरिनु पर्छ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR कोड स्क्यानर"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"मद्दत चाहिन्छ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"सेटिङ खोज्नुहोस्"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"कन्ट्याक्ट, भण्डारण, खाता"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"कन्ट्याक्टहरूको भण्डारण"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"डिभाइस मात्र"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"नयाँ कन्ट्याक्टहरू खातासँग सिंक गरिने छैनन्"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"डिफल्ट सेटिङअनुसार कन्ट्याक्टहरू तपाईंको डिभाइसमा सेभ गरिने छन् र तपाईंको खातामा सिंक गरिने छन्"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"मुख्य खाता सेट गर्ने क्रममा त्रुटि भयो"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"मुख्य खाता सेट गरिएको छैन"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"डिभाइस मात्र"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिभाइस र %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरु गर्न खाता हाल्नुहोस्"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"तपाईं कन्ट्याक्टहरू कहाँ सेभ गर्न चाहनुहुन्छ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"खोज्न सर्कल बनाउनुहोस्"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"आफ्नो स्क्रिनमा सामग्री प्रयोग गरेर खोज्न होम बटन वा नेभिगेसन ह्यान्डल टच एण्ड होल्ड गर्नुहोस्।"</string>
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 57453ce5a2c..a117e47a93f 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -19,7 +19,7 @@
     <color name="homepage_accessibility_background">#783BE5</color>
     <color name="homepage_support_background">#3F5FBD</color>
     <color name="contextual_card_background">@*android:color/material_grey_900</color>
-    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
+    <color name="search_bar_background">@androidprv:color/materialColorSurfaceBright</color>
     <color name="notification_importance_button_unselected">#5F6368</color>
 
     <!-- Palette list preference colors. -->
@@ -79,5 +79,8 @@
 
     <!-- Pointer fill color setting outline color-->
     <color name="pointer_fill_outline_color">#FFFFFF</color>
+
+    <!-- Connected displays -->
+    <color name="display_topology_background_color">@color/settingslib_color_charcoal</color>
 </resources>
 
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index b8e9c7840dd..3f280ff8103 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Sneeuwvlok"</item>
     <item msgid="7952183800501346803">"Parasol"</item>
     <item msgid="799139025758265891">"Werkplaatsgereedschap"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Filmrol"</item>
     <item msgid="5827426100157335512">"Boek"</item>
     <item msgid="8585828346253128384">"Lotusbloem"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bece8845454..e8da99f9d12 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Nieuw apparaat koppelen"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Morgen automatisch aanzetten"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Als je bluetooth uitzet, gaat het de volgende dag weer aan"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Rechteroor koppelen"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Linkeroor koppelen"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Je andere oor koppelen"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio uitzetten"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Zet de functie voor Bluetooth LE Audio uit als het apparaat hardwaremogelijkheden voor LE Audio ondersteunt"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio-modus"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"UI-voorbeeld voor Bluetooth LE Audio-uitzending aanzetten"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Hiermee wordt het UI-voorbeeld voor LE Audio delen aangezet, waaronder persoonlijke audio delen en privéuitzendingen"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Schakelaar voor LE Audio tonen in Apparaatgegevens"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Toelatingslijst voor Bluetooth LE Audio negeren"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Maak standaard gebruik van LE Audio, ook als niet is geverifieerd of LE Audio-randapparatuur voldoet aan de criteria van de toelatingslijst"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"App-taal"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Voorgestelde talen"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alle talen"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Voorgesteld"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alle talen"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alle regio\'s"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alle nummersystemen"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Systeemtaal"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Systeemstandaard"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Taalselectie voor deze app is niet beschikbaar via Instellingen."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Wijzigen"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s niet beschikbaar"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Deze taal kan niet worden gebruikt als systeemtaal, maar je hebt apps en websites laten weten dat je de voorkeur geeft aan deze taal."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Zoeken"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Een taal toevoegen"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regiovoorkeur"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Typ de naam van een taal"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Meer taalinstellingen"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionale voorkeuren"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Stel voorkeuren voor eenheden en cijfers in"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Stel je regionale voorkeuren in voor apps, zodat ze de functionaliteit kunnen personaliseren."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Apps gebruiken waar mogelijk je regionale voorkeuren."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionale voorkeuren"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatuur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Eerste dag van de week"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Cijfervoorkeuren"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Maak verbinding met dataservices tijdens roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Maak verbinding met dataservices tijdens roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Voor roaming kunnen kosten in rekening worden gebracht."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Tijd automatisch instellen"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Automatisch instellen"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"De locatie wordt gebruikt om de tijdzone in te stellen als deze schakelaar aanstaat"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatische datum en tijd"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatisch instellen met je netwerk- en draadloze signalen"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatische tijdzone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatisch instellen op basis van mobiele netwerken bij jou in de buurt"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Automatisch instellen met apparaatlocatie, indien beschikbaar"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standaardinstelling voor land gebruiken"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-uurs klok gebruiken"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tijd"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Til je vinger op en raak de sensor opnieuw aan"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Kan vingerafdruksensor niet gebruiken"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Ga naar een reparateur."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ontgrendelen met vingerafdruk als het scherm uit is"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Gebruik Ontgrendelen met vingerafdruk als het scherm uitstaat"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Scherm uit, ontgrendelen"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Meer beveiligingsinstellingen"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Werkprofielvergrendeling, versleuteling en meer"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Versleuteling, inloggegevens en meer"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Stel een patroon in voor privégedeelte"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Vergrendelen"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Verbergen"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Bevestig het patroon voor je privégedeelte"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Voer de pincode voor je privégedeelte opnieuw in"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Voer het wachtwoord voor je privégedeelte weer in"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> vingerafdrukken toevoegen"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Je hebt het maximale aantal vingerafdrukken toegevoegd"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan geen extra vingerafdrukken toevoegen"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aan"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Uit"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Extern scherm"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ingebouwd scherm"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Extern scherm gebruiken"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Schermresolutie"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Extern scherm is losgekoppeld"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Als je de rotatie of resolutie wijzigt, kunnen actieve apps worden gestopt"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Je apparaat moet verbonden zijn met een extern scherm om je scherm te mirroren"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Meer opties"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Houd vast en sleep om schermen opnieuw te ordenen."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casten"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroren"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Draadloze weergave aanzetten"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Controleer het wachtwoord en probeer het opnieuw"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Neem contact op met de fabrikant van het apparaat"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Controleer de verbinding en probeer het opnieuw"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Dit wifi-netwerk is op dit moment niet beschikbaar"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Er is een probleem met deze QR-code. Probeer op een andere manier verbinding te maken."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Netwerk kiezen"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Kies een netwerk om je apparaat te verbinden"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Dit apparaat toevoegen aan \'<xliff:g id="SSID">%1$s</xliff:g>\'?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Meer informatie over automatisch draaien"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Schermresolutie"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Hoge resolutie"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Volledige resolutie"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Volledige resolutie gebruikt meer batterijlading. Als je de resolutie wijzigt, worden sommige apps misschien opnieuw opgestart."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maximale resolutie"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"De maximale resolutie gebruikt meer batterijlading. Als je de resolutie wijzigt, worden sommige apps misschien opnieuw opgestart."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Geselecteerd"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kleuren"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natuurlijk"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Aanpasbaar"</string>
     <string name="brightness" msgid="6216871641021779698">"Helderheidsniveau"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Aanpasbare helderheid"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Over aanpasbare helderheid"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Je schermhelderheid wordt automatisch aangepast aan je omgeving en je activiteiten. Je kunt de schuifregelaar handmatig verplaatsen zodat Aanpasbare helderheid je voorkeuren leert kennen."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aan"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Uit"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Instellingen voor Bedtijdmodus"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modi kunnen ook het donkere thema activeren}=1{{mode_1} activeert ook het donkere thema}=2{{mode_1} en {mode_2} activeren ook het donkere thema}=3{{mode_1}, {mode_2} en {mode_3} activeren ook het donkere thema}other{{mode_1}, {mode_2} en nog # activeren ook het donkere thema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Instellingen voor modi"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Nog meer dimmen"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dimmen"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Sta toe dat apparaat nog meer wordt gedimd"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Time-out voor scherm"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Sta apps en services toe altijd te scannen naar apparaten in de buurt, zelfs als bluetooth uitstaat. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Locatieservices"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Locatieservices"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Locatie gebruiken"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Locatie gebruiken voor tijdzone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Kan de tijdzone niet automatisch instellen"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Locatie of locatieservices staan uit"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Locatie-instellingen"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Probleem oplossen"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Annuleren"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatische tijdzone staat uit"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Niet beschikbaar als automatische tijdzone uitstaat"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Tijdzonedetectie op basis van locatie staat uit"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Locatie kan worden gebruikt om tijdzone in te stellen"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Als de locatie van je apparaat beschikbaar is, kan deze worden gebruikt om je tijdzone in te stellen"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Juridische info, status, softwareversie bekijken"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juridische informatie"</string>
     <string name="manual" msgid="3651593989906084868">"Handleiding"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opties"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Toegankelijkheid"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysiek toetsenbord"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Bouncetoetsen"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Het toetsenbord negeert het binnen <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms snel herhaald indrukken van dezelfde toets"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Het toetsenbord negeert snel herhaald indrukken van dezelfde toets"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Drempelwaarde voor stuitertoetsen"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Kies hoelang je toetsenbord herhaald indrukken van toetsen negeert"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Aangepast"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"aangepaste waarde"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Langzame toetsen"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Past de tijd voordat een toetsaanslag wordt geactiveerd aan naar <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Past de tijd voordat een toetsaanslag wordt geactiveerd aan"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Plaktoetsen"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Druk toetsen één voor één in voor snelkoppelingen in plaats van meerdere toetsen tegelijkertijd"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Muisknoppen"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Gebruik het fysieke toetsenbord om de muis te bedienen."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Muistoetsen gebruiken"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gebruik je toetsenbord om de cursor te bedienen"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omgekeerd scrollen met muis"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll omhoog om de pagina omlaag te verplaatsen"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Knoppen links en rechts omwisselen"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gebruik de linkermuisknop als je rechtermuisknop"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Muistoetsen voor <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Gebruik de toetsen <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> om de cursor te verplaatsen"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Gebruik de toets <xliff:g id="CLICK_LABEL">%s</xliff:g> om op de primaire muisknop te klikken"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Gebruik de toets <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> om de primaire muisknop ingedrukt te houden"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Gebruik de toets <xliff:g id="RELEASE_LABEL">%s</xliff:g> om de primaire muisknop los te laten"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Gebruik de toets <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> om de scrollmodus aan of uit te zetten. Hiermee kun je met de toetsen <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> omhoog, omlaag, naar links of naar rechts scrollen."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Gebruik de toets <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> om op de secundaire muisknop te klikken"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Sneltoetsen"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Toon lijst met sneltoetsen"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Toetsenborden en tools van werkprofiel"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Standaard"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad en muis"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Muis"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Snelheid van aanwijzer, gebaren"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tikken om te klikken"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tikken en slepen"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Rechtsonder klikken"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klik rechtsonder op de touchpad voor meer opties"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Snelheid van aanwijzer"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Tikken met 3 vingers gebruiken"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Kleur van aanwijzer"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Vulstijl voor aanwijzer wijzigen in zwart"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Vulstijl voor aanwijzer wijzigen in groen"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Touchpadgebaren leren"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, muis, cursor, aanwijzer, scrollen, swipen, vegen, klikken met de rechtermuisknop, rechtsklikken, klikken, klik"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"klikken met de rechtermuisknop, rechtsklikken, tikken"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Klikken met de middenknop"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistent starten"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Naar startscherm"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Terug"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Recente apps bekijken"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Naar de homepage"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swipe ergens op je touchpad omhoog met 3 vingers"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Terug"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies een nieuwe toets voor <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Toegankelijkheid met fysiek toetsenbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Plaktoetsen, bouncetoetsen, muisknoppen"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Toetsen herhalen"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Vertraging vóór herhaling"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Herhalingssnelheid"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Houd een toets ingedrukt om het bijbehorende teken te herhalen totdat de toets wordt losgelaten"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Indeling: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standaard"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatisch: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Voorbeeld"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standaardopties"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Taal"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Lettergrootte"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Grootte van ondertiteling"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Ondertitelstijl"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Aangepaste opties"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Achtergrondkleur"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Energieverbruik aanpassen"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Bijgeleverde pakketten"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Apps worden normaal uitgevoerd"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Batterijvervanging aanbevolen"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"De batterijcapaciteit en oplaadprestaties zijn verminderd en batterijvervanging wordt aanbevolen."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Laag batterijniveau"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Zet Batterijbesparing aan om de batterijduur te verlengen"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"De batterijduur verbeteren"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Verbinding met dit VPN verbreken?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Verbinding verbreken"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versie"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versie <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN vergeten"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Bestaande VPN vervangen?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Always-on VPN instellen?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\'9:00 - 17:00 uur werkdagen\'"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Agenda-afspraken"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} is actief}=2{{mode_1} en {mode_2} zijn actief}=3{{mode_1}, {mode_2} en {mode_3} zijn actief}other{{mode_1}, {mode_2} en nog # zijn actief}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modus kan automatisch worden aangezet}other{# modi kunnen automatisch worden aangezet}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Niet storen}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AAN"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Niet ingesteld"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Uitgezet"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Meldingen"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duur"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Meldingen, afspraken en herinneringen"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Als \'Niet storen\' aanstaat, wordt het geluid van berichten, herinneringen en afspraken uitgezet, behalve als je ze hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je nog wel kunnen bereiken."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Klaar"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Instellingen"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Geen zichtbare of hoorbare meldingen"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Geen geluid van meldingen"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Je ziet of hoort geen meldingen. Gesprekken met contacten met ster en terugkerende bellers zijn toegestaan."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Huidige instelling)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Instellingen voor meldingen in modus \'Niet storen\' wijzigen?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Geluiden voor werkprofiel"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Geluid persoonlijk profiel gebruiken"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Gebruik dezelfde geluiden als voor je persoonlijke profiel"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Ga na ontgrendeling meteen naar het laatst gebruikte scherm. Meldingen worden niet op het vergrendelscherm getoond. Swipe omlaag om ze te zien."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Scherm vergrendelen, vergrendelscherm, overslaan"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Als werkprofiel is vergrendeld"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Aantal meldingen op het vergrendelscherm minimaliseren"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Minder meldingen tonen op het vergrendelscherm"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Alleen nieuwe meldingen tonen op vergrendelscherm"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Verwijder eerder bekeken meldingen automatisch van het vergrendelscherm"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Meldingen op vergrendelscherm"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Gesprekken tonen (standaard en stil)"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Toon gesprekken (standaard en stil)"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Toon content van alle werkmeldingen"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Verberg gevoelige werkcontent"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hoe moeten profielmeldingen worden getoond als je apparaat is vergrendeld?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profielmeldingen"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Meldingen"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App-meldingen"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Als je in korte tijd veel meldingen krijgt, wordt het volume op je apparaat verlaagd en worden meldingen geminimaliseerd gedurende maximaal 2 minuten. Dit is niet van invloed op gesprekken, wekkers en prioriteitsgesprekken. \n\nDe meldingen die je tijdens de afkoelperiode krijgt, vind je door omlaag te swipen vanaf de bovenkant van het scherm."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Toepassen op werkprofielen"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Pas deze instelling toe op apps in werkprofielen"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Gebundelde meldingen"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aan"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Uit"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Meldingen bundelen gebruiken"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Meldingen met vergelijkbare thema\'s worden op stil gezet en gegroepeerd voor een stillere beleving. Bundelen overschrijft de eigen meldingsinstellingen van een app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperservices"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Er zijn geen geïnstalleerde apps die hebben gevraagd om te worden uitgevoerd als VR-helperservices."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-servicetoegang toestaan voor <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriteitsgesprekken"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekken}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Instellingen voor gesprekken"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie je mag storen"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Zelfs als je hebt ingesteld dat berichten- of bel-apps je geen meldingen mogen sturen, kunnen mensen die je hier kiest je bereiken via die apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepen"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Instellingen voor contacten"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Instellingen voor contacten met ster"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Geen"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Geen"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Wekkers"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Apps mogen je niet storen}=1{{app_1} mag je storen}=2{{app_1} en {app_2} mogen je storen}=3{{app_1}, {app_2} en {app_3} mogen je storen}other{{app_1}, {app_2} en nog # mogen je storen}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (werk)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Berekenen…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Instellingen voor apps"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Apps toestaan dit te negeren"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps die je mogen storen"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Modus maken"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Aangepaste modus"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Naam van modus"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"De naam van de modus mag niet leeg zijn"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Kies een icoon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Agenda-afspraken"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Bedtijdroutine"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Tijdens het autorijden"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Meldingen op volledig scherm"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Meldingen op volledig scherm van deze app toestaan"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Sta toe dat deze app meldingen op het volledige scherm toont als het apparaat is vergrendeld. Apps kunnen zo wekkers, inkomende gesprekken of andere urgente meldingen onder de aandacht brengen."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Systeemvoorkeuren schrijven"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Toestaan dat deze app namens jou systeemvoorkeuren aanpast"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Met dit recht kan een app de belangrijkste systeemvoorkeuren aanpassen."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps voor mediabeheer"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Toestaan dat app media beheert"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Als je dit toestaat, kan deze app ongevraagd mediabestanden bewerken of verwijderen die met andere apps zijn gemaakt. De app heeft toegangsrechten nodig voor bestanden en media."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gebaren"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Camera snel openen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Druk 2 keer op de aan/uit-knop om de camera snel te openen. Werkt vanuit elk scherm."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Camera omdraaien voor selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigatiemodus"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellietberichten"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Stuur en ontvang tekstberichten per satelliet. Inbegrepen bij je account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Stuur en krijg tekstberichten per satelliet. Niet inbegrepen bij je account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellietberichten"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Over satellietberichten"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satellietberichten, satellietverbinding"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Over <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Je kunt tekstberichten via satelliet sturen en ontvangen als onderdeel van een geschikt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Je <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-abonnement"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellietberichten zijn inbegrepen bij je account"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Berichten sturen is inbegrepen bij je account"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellietberichten zijn niet inbegrepen bij je account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Meer informatie"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Hoe het werkt"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Je telefoon maakt automatisch verbinding met een satelliet. Voor de beste verbinding moet je vrij zicht op de lucht houden."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Nadat je telefoon verbinding maakt met een satelliet"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Je kunt iedereen een tekstbericht sturen, ook hulpdiensten. Je telefoon maakt opnieuw verbinding met een mobiel netwerk zodra het beschikbaar is."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellietberichten kunnen langer duren en zijn alleen in bepaalde gebieden beschikbaar. Het weer en bepaalde constructies kunnen je satellietverbinding beïnvloeden. Bellen via satelliet is niet beschikbaar. Noodoproepen kunnen nog steeds worden verbonden.\n\nHet kan even duren voordat accountwijzigingen in Instellingen worden getoond. Neem contact op met je provider voor meer informatie."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Meer informatie over satellietberichten"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> kunnen langer duren en zijn alleen in bepaalde gebieden beschikbaar. Het weer en bepaalde constructies kunnen je satellietverbinding beïnvloeden. Bellen via satelliet is niet beschikbaar. Noodoproepen kunnen nog steeds worden verbonden.\n\nHet kan even duren voordat accountwijzigingen in Instellingen worden getoond. Neem voor informatie contact op met <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Meer over <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Kan <xliff:g id="FUNCTION">%1$s</xliff:g> niet aanzetten"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Als je <xliff:g id="FUNCTION">%1$s</xliff:g> wilt aanzetten, verbreek je eerst de satellietverbinding"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellietverbinding"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Satellietverbinding"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"satellietverbinding"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satellietberichten"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Gebruik van gegevens is inbegrepen bij je account"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS via satelliet"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Je kunt berichten naar de hulpdiensten sturen als je geen verbinding kunt maken met een mobiel of wifi-netwerk"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos via satelliet, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Over SOS via satelliet"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Je kunt berichten naar de hulpdiensten sturen en je locatie delen als je geen verbinding kunt maken met een mobiel of wifi-netwerk. Deze service is niet altijd en overal onder alle omstandigheden beschikbaar."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Bel de hulpdiensten of stuur ze een bericht"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Beantwoord vragen over het noodgeval"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Volg de stappen om verbinding te maken met de satelliet"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Als je geen mobiel netwerk hebt, zie je de optie om SOS via satelliet te gebruiken"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Stuur antwoorden naar de hulpdiensten zodat je het juiste soort hulp krijgt"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Zodra je verbonden bent, kun je tekstberichten naar de hulpdiensten sturen"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Demo proberen"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Als je verbinding maakt met de hulpdiensten via satelliet, worden je naam, e-mailadres, telefoonnummer, locatie, apparaatinformatie (IMEI, taal, model, batterijniveau) en contactinformatie voor noodgevallen gedeeld met de hulpdiensten en satellietserviceproviders. \n\nAls je SOS via satelliet wilt gebruiken, moet Google Berichten je standaard sms-app zijn. \n\nAls automatische netwerkselectie uitstaat, wordt dit aangezet en maakt je apparaat automatisch verbinding met elk netwerk."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Voorkeuren voor delen"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Contacten voor noodgevallen"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Je Google-account"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Check of update informatie die met de hulpdiensten wordt gedeeld"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Toegangspuntnamen"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niet beschikbaar wanneer verbonden met <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Je zit in de 16 KB-modus van de niet-paginagebonden modus. In deze modus kan de software-integriteit niet worden gegarandeerd en kunnen alle gegevens die op de telefoon zijn opgeslagen terwijl de bootloader is ontgrendeld, gevaar lopen. Sommige functies worden in deze modi uitgezet, dus sommige apps werken misschien niet. Als je wilt terugkeren naar de productiemodus, moet je teruggaan naar de 4 KB-modus en daarna de bootloader van het apparaat vergrendelen. Hierdoor worden de fabrieksinstellingen teruggezet en worden de productie-instellingen hersteld op het apparaat. Nadat het apparaat succesvol is opgestart in Android, zet je OEM-ontgrendeling uit via Ontwikkelaarsopties. Als het apparaat niet opstart in Android of instabiel is, flash het apparaat dan opnieuw met de nieuwste fabrieksimages van &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; of gebruik &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; en selecteer Apparaat wissen, Bootloader vergrendelen en Alle partities geforceerd flashen."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Niet-paginagebonden 16 KB-modus"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Meer lezen"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"App uitvoeren met compatibiliteitsmodus voor paginagrootte"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"App voor verwerking bugrapport"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Hierdoor wordt bepaald welke app de snelkoppeling voor het bugrapport verwerkt op je apparaat."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Privé"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Luisteren naar stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scan de QR-code van een audiostream om mee te luisteren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Kan wachtwoord niet bewerken tijdens het delen. Als je het wachtwoord wilt wijzigen, zet je audio delen eerst uit."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Je wachtwoord moet 4-16 tekens bevatten en mag alleen letters, cijfers en symbolen bevatten"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-codescanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Hulp nodig?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Zoeken in Instellingen"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacten, opslag, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Opslag voor contacten"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Alleen apparaat"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nieuwe contacten worden niet gesynchroniseerd met een account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacten worden standaard opgeslagen op je apparaat en gesynchroniseerd met je account"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Fout bij instellen van het standaardaccount"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Geen standaard ingesteld"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Alleen apparaat"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Apparaat en %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg een account toe om aan de slag te gaan"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Waar contacten moeten worden opgeslagen"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Houd je vinger op de startknop of de navigatiehandgreep om te zoeken op basis van de content op je scherm."</string>
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 133c6cf0fc6..c003c2d94bc 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ସ୍ନୋଫ୍ଲେକ"</item>
     <item msgid="7952183800501346803">"ବେଳାଭୂମିରେ ଛତା"</item>
     <item msgid="799139025758265891">"ୱାର୍କସପ ଟୁଲ"</item>
-    <item msgid="1330084588359129896">"ଟେଣ୍ଟ"</item>
+    <item msgid="8112685757657659269">"ପିଆନୋ"</item>
     <item msgid="3861584909935022342">"ଫିଲ୍ମ ରିଲ"</item>
     <item msgid="5827426100157335512">"ବହି"</item>
     <item msgid="8585828346253128384">"ପଦ୍ମ ଫୁଲ"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index b68bfb823ea..2bd94650eb0 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ନୂଆ ଡିଭାଇସକୁ ପେୟାର କରନ୍ତୁ"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ବ୍ଲୁଟୁଥ୍"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ଆସନ୍ତାକାଲି ସ୍ୱତଃ ଚାଲୁ ହେବ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ଯଦି ଆପଣ ବ୍ଲୁଟୁଥକୁ ବନ୍ଦ କରନ୍ତି, ତେବେ ପରଦିନ ଏହା ପୁଣି ଚାଲୁ ହୁଏ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ଡାହାଣ କାନକୁ ପେୟାର କର"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ବାମ କାନକୁ ପେୟାର କର"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ଅନ୍ୟ କାନକୁ ପେୟାର କରନ୍ତୁ"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ବ୍ଲୁଟୁଥ LE ଅଡିଓକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ଯଦି ଡିଭାଇସ LE ଅଡିଓ ହାର୍ଡୱେର କ୍ଷମତାକୁ ସମର୍ଥନ କରେ ତେବେ ଏହା ବ୍ଲୁଟୁଥ LE ଅଡିଓ ଫିଚରକୁ ଅକ୍ଷମ କରେ।"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"ବ୍ଲୁଟୁଥ LE ଅଡିଓ ମୋଡ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"ବ୍ଲୁଟୁଥ LE ଅଡିଓ ବ୍ରଡକାଷ୍ଟ UI ପ୍ରିଭ୍ୟୁକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"ବ୍ୟକ୍ତିଗତ ଅଡିଓ ସେୟାରିଂ ଏବଂ ପ୍ରାଇଭେଟ ବ୍ରଡକାଷ୍ଟ ସମେତ LE ଅଡିଓ ସେୟାରିଂ UI ପ୍ରିଭ୍ୟୁକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ଡିଭାଇସ ବିବରଣୀରେ LE ଅଡିଓ ଟୋଗଲ ଦେଖାନ୍ତୁ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ବାଇପାସ ବ୍ଲୁଟୁଥ LE ଅଡିଓ ଆଲାଉଲିଷ୍ଟ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ଆଲାଉଲିଷ୍ଟ ମାନଦଣ୍ଡ ପୂରଣ କରିବାକୁ LE ଅଡିଓ ପେରିଫେରାଲକୁ ଯାଞ୍ଚ କରାଯାଇନଥିଲେ ମଧ୍ୟ ଡିଫଲ୍ଟ ଭାବେ LE ଅଡିଓ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ଆପ ଭାଷା"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ପ୍ରସ୍ତାବିତ ଭାଷାଗୁଡ଼ିକ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ସମସ୍ତ ଭାଷା"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"ପ୍ରସ୍ତାବିତ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ସମସ୍ତ ଭାଷା"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ସମସ୍ତ ଅଞ୍ଚଳ"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ସମସ୍ତ ନମ୍ବରିଂ ସିଷ୍ଟମ"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ସିଷ୍ଟମ ଭାଷା"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ସିଷ୍ଟମ ଡିଫଲ୍ଟ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ସେଟିଂସରୁ ଏହି ଆପ ପାଇଁ ଭାଷା ଚୟନ ଉପଲବ୍ଧ ନାହିଁ।"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ଏହି ଭାଷାକୁ ଏକ ସିଷ୍ଟମ ଭାଷା ଭାବେ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ, କିନ୍ତୁ ଆପଣ ଏହି ଭାଷାକୁ ପସନ୍ଦ କରୁଛନ୍ତି ବୋଲି ଆପ୍ସ ଏବଂ ୱେବସାଇଟଗୁଡ଼ିକୁ ଜଣାଇଛନ୍ତି।"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ଏକ ଭାଷା ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ପସନ୍ଦର ଅଞ୍ଚଳ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ଭାଷାର ନାମ ଟାଇପ କରନ୍ତୁ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ଅଧିକ ଭାଷା ସେଟିଂସ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ଆଞ୍ଚଳିକ ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ୟୁନିଟ ଏବଂ ସଂଖ୍ୟାର ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟ କରନ୍ତୁ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ଆପ୍ସକୁ ଆପଣଙ୍କ ଆଞ୍ଚଳିକ ପସନ୍ଦଗୁଡ଼ିକ ଜଣାନ୍ତୁ ଯାହା ଫଳରେ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ ଅନୁଭୂତିକୁ ପର୍ସନାଲାଇଜ କରିପାରିବ।"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ସମ୍ଭବ ସ୍ଥଳେ ଆପ୍ସ ଆପଣଙ୍କ ଆଞ୍ଚଳିକ ପସନ୍ଦଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିବ।"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ଆଞ୍ଚଳିକ ପସନ୍ଦ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ତାପମାତ୍ରା"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ସପ୍ତାହର ପ୍ରଥମ ଦିନ"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ନମ୍ବର ପସନ୍ଦଗୁଡ଼ିକ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ରୋମିଙ୍ଗରେ ଥିବାବେଳେ ଡାଟା ସେବା ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ରୋମିଂ ବେଳେ ଡାଟା ସେବାଗୁଡିକୁ କନେକ୍ଟ କରନ୍ତୁ"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ରୋମିଂ ଚାର୍ଜ୍ ଲାଗୁ ହୋଇପାରେ।"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ସ୍ୱତଃ ସମୟ ସେଟ କରନ୍ତୁ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ସ୍ୱତଃ ସେଟ କରନ୍ତୁ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ଏହି ଟୋଗଲ ଚାଲୁ ଥିବା ବେଳେ ଟାଇମ ଜୋନକୁ ସେଟ କରିବା ପାଇଁ ଲୋକେସନକୁ ବ୍ୟବହାର କରାଯିବ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ସ୍ୱତଃ ତାରିଖ ଏବଂ ସମୟ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ଆପଣଙ୍କ ନେଟୱାର୍କ ଏବଂ ୱାୟାରଲେସ ସିଗନାଲକୁ ବ୍ୟବହାର କରି ସ୍ୱତଃ ସେଟ କରନ୍ତୁ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ସ୍ୱତଃ ଟାଇମ ଜୋନ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ଆପଣଙ୍କ ନିକଟରେ ଥିବା ମୋବାଇଲ ନେଟୱାର୍କ ଆଧାରରେ ସ୍ୱତଃ ସେଟ କରନ୍ତୁ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ଯଦି ଉପଲବ୍ଧ ଥାଏ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନକୁ ବ୍ୟବହାର କରି ସ୍ୱତଃ ସେଟ ହୋଇଥାଏ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ଡିଫଲ୍ଟ ସ୍ଥାନର ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ଘଣ୍ଟିଆ ଫର୍ମାଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ସମୟ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ଆଙ୍ଗୁଠିକୁ ଉଠାନ୍ତୁ ଓ ତା’ପରେ ସେନ୍ସରକୁ ପୁଣିଥରେ ଛୁଅଁନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ଟିପଚିହ୍ନ ସେନ୍ସରକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ଏକ ମରାମତି କେନ୍ଦ୍ରକୁ ଭିଜିଟ କରନ୍ତୁ।"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ସ୍କ୍ରିନ-ବନ୍ଦ ଥିବା ବେଳେ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ସ୍କ୍ରିନ ବନ୍ଦ ଥିବା ବେଳେ ମଧ୍ୟ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ସ୍କ୍ରିନ-ବନ୍ଦ ଅଛି, ଅନଲକ କରନ୍ତୁ"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ଅଧିକ ସୁରକ୍ଷା ସେଟିଂସ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ୱାର୍କ ପ୍ରୋଫାଇଲ ଲକ, ଏନକ୍ରିପସନ ଏବଂ ଆହୁରି ଅନେକ କିଛି"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ଏନକ୍ରିପ୍ସନ, କ୍ରେଡେନ୍ସିଆଲ ଏବଂ ଆହୁରି ଅନେକ କିଛି"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ନିଜ ପ୍ରାଇଭେଟ ସ୍ପେସ ପାଇଁ ଏକ ପାଟର୍ନ ସେଟ କର"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ଲକ କରନ୍ତୁ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ଲୁଚାନ୍ତୁ"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସ ପାଟର୍ନ ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସ PIN ପୁଣି ଲେଖନ୍ତୁ"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସ ପାସୱାର୍ଡ ପୁଣି ଲେଖନ୍ତୁ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g> ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ଆପଣ ସର୍ବାଧିକ ସଂଖ୍ୟାର ଆଙ୍ଗୁଠି ଚିହ୍ନ ଯୋଡିଛନ୍ତି"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ଆଉ ଅଧିକ ଟିପଚିହ୍ନ ଯୋଡିପାରିବ ନାହିଁ"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"ଚାଲୁ ଅଛି"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ବନ୍ଦ ଅଛି"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେ"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ଡିସପ୍ଲେ ରିଜୋଲ୍ୟୁସନ"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେକୁ ଡିସକନେକ୍ଟ କରାଯାଇଛି"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ରୋଟେସନ କିମ୍ବା ରିଜୋଲ୍ୟୁସନକୁ ପରିବର୍ତ୍ତନ କରିବା ଫଳରେ ଏହା ବର୍ତ୍ତମାନ ଚାଲୁଥିବା ଯେ କୌଣସି ଆପ୍ସକୁ ବନ୍ଦ କରିପାରେ"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ମିରର କରିବା ପାଇଁ ଆପଣଙ୍କର ଡିଭାଇସକୁ ଏକ ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେ ସହ କନେକ୍ଟ କରାଯିବା ଆବଶ୍ୟକ"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ଅଧିକ ବିକଳ୍ପ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ଡିସପ୍ଲେ ପୁଣି ସଜାଇବା ପାଇଁ ହୋଲ୍ଡ କରି ଟାଣନ୍ତୁ।"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"କାଷ୍ଟ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ମିରର୍"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ୱେୟାରଲେସ୍‌ ପ୍ରଦର୍ଶନ ସକ୍ଷମ କରନ୍ତୁ"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ପାସ୍‍ୱାର୍ଡର ଯାଞ୍ଚ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ଡିଭାଇସର ନିର୍ମାତାଙ୍କ ସହିତ କଣ୍ଟାକ୍ଟ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ସଂଯୋଗ ଯାଞ୍ଚ କରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ଏହି ୱାଇ-ଫାଇ ନେଟୱାର୍କ ବର୍ତ୍ତମାନ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ଏହି QR କୋଡରେ ଏକ ସମସ୍ୟା ଅଛି। ଅନ୍ୟ ଏକ ଉପାୟରେ କନେକ୍ଟ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ନେଟୱାର୍କ ବାଛନ୍ତୁ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ସହ ସଂଯୋଗ କରିବାକୁ, ଏକ ନେ‍ଟ୍‍ୱର୍କ ବାଛନ୍ତୁ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"“<xliff:g id="SSID">%1$s</xliff:g>”ରେ ଏହି ଡିିିିଭାଇସ୍‍ ଯୋଗ କରିିିବେ?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ଅଟୋ-ରୋଟେଟ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ସ୍କ୍ରିନ ରିଜୋଲ୍ୟୁସନ"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ଉଚ୍ଚ ରିଜୋଲ୍ୟୁସନ"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ପୂର୍ଣ୍ଣ ରିଜୋଲ୍ୟୁସନ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ପୂର୍ଣ୍ଣ ରିଜୋଲ୍ୟୁସନ ଆପଣଙ୍କ ବେଟେରୀକୁ ଅଧିକ ବ୍ୟବହାର କରେ। ଆପଣଙ୍କ ରିଜୋଲ୍ୟୁସନକୁ ସ୍ୱିଚ କରିବା ଫଳରେ କିଛି ଆପ୍ସ ରିଷ୍ଟାର୍ଟ ହୋଇପାରେ।"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ଚୟନ କରାଯାଇଛି"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ରଙ୍ଗ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ପ୍ରାକୃତିକ"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ଆଡେପ୍ଟିଭ"</string>
     <string name="brightness" msgid="6216871641021779698">"ଉଜ୍ଜ୍ୱଳତା ସ୍ତର"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ଆଡେପ୍ଟିଭ ଉଜ୍ଜ୍ୱଳତା"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"ଆଡେପ୍ଟିଭ ଉଜ୍ଜ୍ୱଳତା ବିଷୟରେ"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ଉଜ୍ଜ୍ଵଳତା ଆପଣଙ୍କ ପରିବେଶ ଓ କାର୍ଯ୍ୟକଳାପ ଅନୁସାରେ ସ୍ୱତଃ ଆଡଜଷ୍ଟ ହେବ। ଆପଣ ସ୍ଲାଇଡରକୁ ମାନୁଆଲି ମୁଭ କରି ଆଡେପ୍ଟିଭ ଉଜ୍ଜ୍ୱଳତାକୁ ଆପଣଙ୍କ ପସନ୍ଦଗୁଡ଼ିକ ଜାଣିବାରେ ସାହାଯ୍ୟ କରିପାରିବେ।"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ଚାଲୁ"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ବନ୍ଦ"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ଶୋଇବା ସମୟ ମୋଡ ସେଟିଂସ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ମୋଡଗୁଡ଼ିକ ମଧ୍ୟ ଡାର୍କ ଥିମକୁ ସକ୍ରିୟ କରିପାରିବ}=1{{mode_1} ମଧ୍ୟ ଡାର୍କ ଥିମକୁ ସକ୍ରିୟ କରିପାରିବ}=2{{mode_1} ଏବଂ {mode_2} ମଧ୍ୟ ଡାର୍କ ଥିମକୁ ସକ୍ରିୟ କରିପାରିବ}=3{{mode_1}, {mode_2} ଏବଂ {mode_3} ମଧ୍ୟ ଡାର୍କ ଥିମକୁ ସକ୍ରିୟ କରିପାରିବ}other{{mode_1}, {mode_2} ଏବଂ ଅଧିକ # ମଧ୍ୟ ଡାର୍କ ଥିମକୁ ସକ୍ରିୟ କରିପାରିବ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ମୋଡ ସେଟିଂସ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"ଆହୁରି ଡିମ"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ଅତିରିକ୍ତ ଡିମ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ସାଧାରଣ ଅପେକ୍ଷା ଅଧିକ ଡିମ ହେବା ପାଇଁ ଡିଭାଇସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ସ୍କ୍ରିନ ଟାଇମଆଉଟ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ନିଷ୍କ୍ରିୟତାର <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ପରେ"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ବ୍ଲୁଟୁଥ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଯେ କୌଣସି ସମୟରେ ଆପ୍ସ ଓ ସେବାଗୁଡ଼ିକୁ ଆଖପାଖରେ ଥିବା ଡିଭାଇସଗୁଡ଼ିକ ସ୍କାନ କରିବାକୁ ଦିଅନ୍ତୁ। ଲୋକେସନ ଆଧାରିତ ଫିଚର ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପରି ବିଷୟଗୁଡ଼ିକ ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ଲୋକେସନ ସେବା"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ଲୋକେସନ ସେବା"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ଲୋକେସନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ଟାଇମ ଜୋନ ପାଇଁ ଲୋକେସନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ସ୍ୱଚାଳିତ ଭାବେ ଟାଇମ ଜୋନକୁ ସେଟ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ଲୋକେସନ କିମ୍ବା ଲୋକେସନ ସେବାଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ଲୋକେସନ ସେଟିଂସ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ଏହାକୁ ଠିକ କରନ୍ତୁ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ବାତିଲ କରନ୍ତୁ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ସ୍ୱଚାଳିତ ଟାଇମ୍ ଜୋନ୍ ବନ୍ଦ ଅଛି"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ସ୍ୱତଃ ଟାଇମ ଜୋନ ବନ୍ଦ ଥିବା ବେଳେ ଉପଲବ୍ଧ ହୁଏ ନାହିଁ"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ଟାଇମ ଜୋନ ସେଟ କରିବାକୁ ଲୋକେସନ ବ୍ୟବହାର କରାଯାଇପାରେ"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ଯଦି ଆପଣଙ୍କ ଡିଭାଇସ ଲୋକେସନ ଉପଲବ୍ଧ ଅଛି, ତେବେ ଏହାକୁ ଆପଣଙ୍କ ଟାଇମ ଜୋନ ସେଟ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ଆଇନଗତ ସୂଚନା, ଷ୍ଟେଟସ୍, ସଫ୍ଟୱେର୍‌ ଭର୍ସନ୍‌ ଦେଖନ୍ତୁ"</string>
     <string name="legal_information" msgid="7509900979811934843">"ଆଇନଗତ ସୂଚନା"</string>
     <string name="manual" msgid="3651593989906084868">"ମାନୁଆଲ୍‌"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ଆକ୍ସେସିବିଲିଟୀ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ଫିଜିକାଲ୍ କୀବୋର୍ଡ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"ବାଉନ୍ସ କୀଗୁଡ଼ିକ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"କୀବୋର୍ଡ <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms ମଧ୍ୟରେ ସମାନ କୀ ଶୀଘ୍ର ବାରମ୍ବାର ଦବାଇବାକୁ ଅଣଦେଖା କରେ"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"କୀବୋର୍ଡ ସମାନ କୀ ଶୀଘ୍ର ବାରମ୍ବାର ଦବାଇବାକୁ ଅଣଦେଖା କରେ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ବାଉନ୍ସ କୀ ଥ୍ରେସହୋଲ୍ଡ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ଆପଣଙ୍କ କୀବୋର୍ଡ ବାରମ୍ବାର କୀ ଦବାଇବାକୁ ଅଣଦେଖା କରୁଥିବା ସମୟ ଅବଧି ବାଛନ୍ତୁ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2ସେ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4ସେ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6ସେ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"କଷ୍ଟମ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"କଷ୍ଟମ ମୂଲ୍ୟ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ଶ୍ଲୋ କୀଗୁଡ଼ିକ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> msକୁ ସକ୍ରିୟ କରିବାକୁ ଏକ କୀ ଦବାଇବା ପାଇଁ ଲାଗୁଥିବା ସମୟକୁ ଏହା ଆଡଜଷ୍ଟ କରେ"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ସକ୍ରିୟ କରିବାକୁ ଏକ କୀ ଦବାଇବା ପାଇଁ ଲାଗୁଥିବା ସମୟକୁ ଏହା ଆଡଜଷ୍ଟ କରେ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ଷ୍ଟିକି କୀଗୁଡ଼ିକ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ଏକାଠି କୀଗୁଡ଼ିକୁ ଦବାଇ ଧରିବା ପରିବର୍ତ୍ତେ ସର୍ଟକର୍ଟଗୁଡ଼ିକ ପାଇଁ ଥରକେ ଗୋଟିଏ କୀ ଦବାନ୍ତୁ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ମାଉସ କୀଗୁଡ଼ିକ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ମାଉସକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ଫିଜିକାଲ କୀବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ମାଉସ କୀଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିବା"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ପଏଣ୍ଟରକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ଆପଣଙ୍କ କୀବୋର୍ଡକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ମାଉସ ରିଭର୍ସ ସ୍କ୍ରୋଲିଂ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ପୃଷ୍ଠାକୁ ତଳକୁ ମୁଭ କରିବା ପାଇଁ ଉପରକୁ ସ୍କ୍ରୋଲ କରନ୍ତୁ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ବାମ ଏବଂ ଡାହାଣ ବଟନକୁ ସ୍ୱାପ କରନ୍ତୁ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ମାଉସର ବାମ ବଟନକୁ ଆପଣଙ୍କ ଡାହାଣ ବଟନ ଭାବେ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> ପାଇଁ ମାଉସ କୀ"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ମାଉସ ପଏଣ୍ଟରକୁ ମୁଭ କରିବା ପାଇଁ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> କୀଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ପ୍ରାଥମିକ ମାଉସ ବଟନରେ କ୍ଲିକ କରିବା ପାଇଁ <xliff:g id="CLICK_LABEL">%s</xliff:g> କୀ\'କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ପ୍ରାଥମିକ ମାଉସ ବଟନରେ କ୍ଲିକ କରିବା ପାଇଁ <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> କୀ\'କୁ ଦବାଇ ଧରି ରଖନ୍ତୁ"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ପ୍ରାଥମିକ ମାଉସ ବଟନକୁ ରିଲିଜ କରିବା ପାଇଁ <xliff:g id="RELEASE_LABEL">%s</xliff:g> କୀ\'କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ସ୍କ୍ରୋଲ ମୋଡକୁ ଟୋଗଲ କରିବା ପାଇଁ <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> କୀ\'କୁ ବ୍ୟବହାର କରନ୍ତୁ। ଏହା ଫଳରେ <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> କୀ\'ଗୁଡ଼ିକ ଭ୍ୟୁକୁ ଉପର, ତଳ, ବାମ କିମ୍ବା ଡାହାଣକୁ ସ୍କ୍ରୋଲ କରିବ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ଦ୍ୱିତୀୟ ମାଉସ ବଟନରେ କ୍ଲିକ କରିବା ପାଇଁ <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> କୀ\'କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"କୀବୋର୍ଡ଼ ସର୍ଟକଟଗୁଡ଼ିକ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ସର୍ଟକଟଗୁଡ଼ିକର ତାଲିକା ଦେଖାନ୍ତୁ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ୱର୍କ ପ୍ରୋଫାଇଲ୍ କୀବୋର୍ଡ &amp; ଟୁଲ୍‌ଗୁଡ଼ିକ"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ଡିଫଲ୍ଟ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ଟଚପେଡ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ଟଚପେଡ ଓ ମାଉସ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ମାଉସ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ପଏଣ୍ଟରର ସ୍ପିଡ, ଜେଶ୍ଚର"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"କ୍ଲିକ ପାଇଁ ଟାପ କରନ୍ତୁ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ଟାପ କରି ଡ୍ରାଗ କରିବା"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ନିମ୍ନରେ ଡାହାଣପଟେ କ୍ଲିକ କରନ୍ତୁ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ଅଧିକ ବିକଳ୍ପ ପାଇଁ ଟଚପେଡର ନିମ୍ନ ଡାହାଣ କୋଣରେ କ୍ଲିକ କରନ୍ତୁ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ପଏଣ୍ଟରର ସ୍ପିଡ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ତିନି ଆଙ୍ଗୁଠି ଟାପ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ପଏଣ୍ଟରର ରଙ୍ଗ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ପଏଣ୍ଟର ଫିଲ ଷ୍ଟାଇଲକୁ କଳାରେ ବଦଳାନ୍ତୁ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ପଏଣ୍ଟର ଫିଲ ଷ୍ଟାଇଲକୁ ସବୁଜରେ ବଦଳାନ୍ତୁ"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ଟଚପେଡର ଜେଶ୍ଚରଗୁଡ଼ିକ ବିଷୟରେ ଜାଣନ୍ତୁ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ଟ୍ରାକପେଡ ଟ୍ରାକ ପେଡ, ମାଉସ, କର୍ସର, ସ୍କ୍ରୋଲ, ସ୍ୱାଇପ, ଡାହାଣ କ୍ଲିକ, କ୍ଲିକ, ପଏଣ୍ଟର"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ଡାହାଣ କ୍ଲିକ, ଟାପ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ମଝି ବଟନ କ୍ଲିକ କରନ୍ତୁ"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant ଲଞ୍ଚ କରନ୍ତୁ"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ହୋମକୁ ଯାଆନ୍ତୁ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ବର୍ତ୍ତମାନର ଆପ୍ସ ଭ୍ୟୁ କରନ୍ତୁ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ହୋମକୁ ଯାଆନ୍ତୁ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ଟଚପେଡରେ ଯେ କୌଣସି ସ୍ଥାନରେ ତିନୋଟି ଆଙ୍ଗୁଠିରେ ଉପରକୁ ସ୍ୱାଇପ କର"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ପଛକୁ ଫେରନ୍ତୁ"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ପାଇଁ ଏକ ନୂଆ କୀ ବାଛନ୍ତୁ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ଫିଜିକାଲ କୀବୋର୍ଡ ଆକ୍ସେସିବିଲିଟୀ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ଷ୍ଟିକି କୀ, ବାଉନ୍ସ କୀ, ମାଉସ କୀ"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"କୀଗୁଡ଼ିକୁ ରିପିଟ କରନ୍ତୁ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ରିପିଟ ପୂର୍ବରୁ ହେବା ବିଳମ୍ବ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ରିପିଟ ରେଟ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"କୀ ରିଲିଜ ନହେବା ପର୍ଯ୍ୟନ୍ତ ଏହାର କେରେକ୍ଟରକୁ ରିପିଟ କରିବା ପାଇଁ ଗୋଟିଏ କୀ\'କୁ ଦବାଇ ଧରନ୍ତୁ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ଲେଆଉଟ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ସ୍ୱତଃ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ପ୍ରିଭ୍ୟୁ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ଷ୍ଟାଣ୍ଡାର୍ଡ ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ଭାଷା"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ଟେକ୍ସଟର ଆକାର"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"କେପ୍ସନ ସାଇଜ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"କେପ୍ସନର ଷ୍ଟାଇଲ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"କଷ୍ଟମ୍‌ ବିକଳ୍ପଗୁଡିକ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ପୃଷ୍ଠପଟ ରଙ୍ଗ"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ପାୱାର୍‌ ବ୍ୟବହାର ଆଡ୍‌ଜଷ୍ଟ କରନ୍ତୁ"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ଅନ୍ତର୍ଭୁକ୍ତ ଥିବା ପ୍ୟାକେଜ୍‌‌ଗୁଡିକ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ଆପ୍ସ ଠିକ୍‌ ଭାବେ ଚାଲୁଛି"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ବେଟେରୀ ରିପ୍ଲେସମେଣ୍ଟ ପାଇଁ ସୁପାରିଶ କରାଯାଇଛି"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ବେଟେରୀ କ୍ଷମତା ଏବଂ ଚାର୍ଜିଂ ପରଫରମାନ୍ସ ହ୍ରାସ ପାଇଥାଏ ଏବଂ ବେଟେରୀ ରିପ୍ଲେସମେଣ୍ଟ ପାଇଁ ସୁପାରିଶ କରାଯାଏ।"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ବ୍ୟାଟେରୀ ସ୍ତର କମ୍ ଅଛି"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ବ୍ୟାଟେରୀ ଲାଇଫକୁ ବଢ଼ାଇବା ପାଇଁ ବ୍ୟାଟେରୀ ସେଭରକୁ ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ବ୍ୟାଟେରୀ ଲାଇଫକୁ ଉନ୍ନତ କରନ୍ତୁ"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ଡିସକନେକ୍ଟ କରନ୍ତୁ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ସଂସ୍କରଣ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ଭର୍ସନ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNକୁ ଭୁଲିଯାଅ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 AM - 5 PM କାର୍ଯ୍ୟ ଦିବସଗୁଡ଼ିକ\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"କେଲେଣ୍ଡର ଇଭେଣ୍ଟ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ସକ୍ରିୟ ଅଛି}=2{{mode_1} ଏବଂ {mode_2} ସକ୍ରିୟ ଅଛି}=3{{mode_1}, {mode_2} ଏବଂ {mode_3} ସକ୍ରିୟ ଅଛି}other{{mode_1}, {mode_2} ଏବଂ # ଅଧିକ ସକ୍ରିୟ ଅଛି}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ମୋଡ ସ୍ୱତଃ ଚାଲୁ ହୋଇପାରିବ}other{# ମୋଡ ସ୍ୱତଃ ଚାଲୁ ହୋଇପାରିବ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ଚାଲୁ ଅଛି"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ସେଟ କରାଯାଇନାହିଁ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ଅକ୍ଷମ କରାଯାଇଛି"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ବୁଝିଗଲି"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ଅବଧି"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ମେସେଜ୍, ଇଭେଣ୍ଟ ଓ ରିମାଇଣ୍ଡର୍"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ଯେତେବେଳେ \"ବିରକ୍ତି କରନ୍ତୁ ନାହିଁ\" ଅନ ଥାଏ, ସେତେବେଳେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଉପରୋକ୍ତ ଆଇଟମ ବ୍ୟତୀତ ମେସେଜ, ରିମାଇଣ୍ଡର ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ଆପଣଙ୍କର ସାଙ୍ଗ, ପରିବାର କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ମେସେଜ ସେଟିଂସ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ହୋ‍ଇଗଲା"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ସେଟିଂସ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନହେଉ"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ଆପଣ ବିଜ୍ଞପ୍ତିକୁ ଦେଖି କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ। ତାରାଙ୍କିତ ଯୋଗାଯୋଗରୁ ଆସିଥିବା କଲ୍ ଏବଂ ପୁଣି କଲ୍ କରୁଥିବା କଲର୍‍ଙ୍କୁ ଅନୁମତି ଦିଆଯାଇଛି।"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ସାମ୍ପ୍ରତିକ ସେଟିଙ୍ଗ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିଜ୍ଞପ୍ତି ସେଟିଂସକୁ ବଦଳାଇବେ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ୱାର୍କ୍ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲରେ ବ୍ୟବହାର କରାଯାଉଥିବା ସମାନ ସାଉଣ୍ଡଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ଅନଲକ କରିବା ପରେ, ସିଧାସଳଖ ଗତ ଥର ବ୍ୟବହାର କରାଯାଇଥିବା ସ୍କ୍ରିନକୁ ଯାଆନ୍ତୁ। ଲକ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତି ଦେଖାଯିବ ନାହିଁ। ସେଗୁଡ଼ିକ ଦେଖିବାକୁ ଉପରୁ ତଳକୁ ସ୍ୱାଇପ କରନ୍ତୁ।"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ଲକ୍ ସ୍କ୍ରିନ୍, ଲକ୍‌ସ୍କ୍ରିନ୍, ବାଦ୍ ଦିଅନ୍ତୁ, ବାଏପାସ୍"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ୱାର୍କ ପ୍ରୋଫାଇଲ ଲକ ଥିବାବେଳେ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ଲକ ସ୍କ୍ରିନ ବିଜ୍ଞପ୍ତି ମିନିମାଲିଜମ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ଲକ ସ୍କ୍ରିନରେ କମ ବିଜ୍ଞପ୍ତି ଦେଖାନ୍ତୁ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ଲକ ସ୍କ୍ରିନରେ କେବଳ ନୂଆ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ଲକ ସ୍କ୍ରିନରୁ ପୂର୍ବରୁ ଦେଖାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ୱତଃ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ଲକ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ବାର୍ତ୍ତାଳାପ, ଡିଫଲ୍ଟ ଏବଂ ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ବାର୍ତ୍ତାଳାପ, ଡିଫଲ୍ଟ ଏବଂ ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ସମସ୍ତ ୱାର୍କ ବିଜ୍ଞପ୍ତି ବିଷୟବସ୍ତୁ ଦେଖାନ୍ତୁ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ସମ୍ବେଦନଶୀଳ ୱାର୍କ ବିଷୟବସ୍ତୁକୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ଲକ୍‌ ଥିବା ବେଳେ, ପ୍ରୋଫାଇଲ୍‌ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ କେଉଁପରି ଦେଖାଇବାକୁ ଆପଣ ଚାହାଁନ୍ତି?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ଆପଣ ଅଳ୍ପ ସମୟ ମଧ୍ୟରେ ଅନେକ ବିଜ୍ଞପ୍ତି ପାଇଲେ, ଆପଣଙ୍କ ଡିଭାଇସ ଏହାର ଭଲ୍ୟୁମକୁ କମ କରି 2 ମିନିଟ ପର୍ଯ୍ୟନ୍ତ ଆଲର୍ଟକୁ ହ୍ରାସ କରିବ। କଲ, ଆଲାରାମ ଏବଂ ପ୍ରାଥମିକତା ଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପ୍ରଭାବିତ ହୁଏ ନାହିଁ। \n\nକୁଲଡାଉନ ସମୟରେ ପାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ସ୍କ୍ରିନର ଉପରୁ ତଳକୁ ଟାଣି ପାଇପାରିବେ।"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ୱାର୍କ ପ୍ରୋଫାଇଲରେ ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ୱାର୍କ ପ୍ରୋଫାଇଲ ଆପ୍ସରେ ଲାଗୁ କରନ୍ତୁ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ବଣ୍ଡଲ ହୋଇଥିବା ବିଜ୍ଞପ୍ତି"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ଚାଲୁ ଅଛି"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ବନ୍ଦ ଅଛି"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ବିଜ୍ଞପ୍ତି ବଣ୍ଡଲିଂ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ଏକ ଶାନ୍ତ ଅନୁଭୂତି ପାଇଁ ସମାନ ଥିମଗୁଡ଼ିକ ଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନୀରବ ଏବଂ ଏକାଠି ଗ୍ରୁପ୍ କରାଯିବ। ବଣ୍ଡଲିଂ ଏକ ଆପର ନିଜସ୍ୱ ବିଜ୍ଞପ୍ତି ସେଟିଂସକୁ ଓଭରରାଇଡ କରିବ।"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ସାହାଯ୍ୟକାରୀ ସେବାଗୁଡ଼ିକ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ସାହାଯ୍ୟକାରୀ ସେବାଗୁଡ଼ିକ ଭାବରେ ଚଲାଯିବା ପାଇଁ, ଇନଷ୍ଟଲ ହୋଇଥିବା କୌଣସି ଆପ୍ସ ଅନୁରୋଧ କରିନାହିଁ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ VR ସେବା ଆକ୍ସେସକୁ ଅନୁମତି ଦେବେ?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ପ୍ରାଥମିକତା ଥିବା ବାର୍ତ୍ତାଳାପ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"କିଛି ନାହିଁ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ବାର୍ତ୍ତାଳାପ}other{#ଟି ବାର୍ତ୍ତାଳାପ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"ବାର୍ତ୍ତାଳାପ ସେଟିଂସ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"କିଏ ବାଧା ସୃଷ୍ଟି କରିପାରିବ"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ଯଦିଓ ମେସେଜିଂ କିମ୍ବା କଲିଂ ଆପ୍ସ ଆପଣଙ୍କୁ ସୂଚିତ କରିପାରିବ ନାହିଁ, ଆପଣ ଏଠାରେ ବାଛିଥିବା ଲୋକମାନେ ଏବେ ବି ସେହି ଆପ୍ସ ମାଧ୍ୟମରେ ଆପଣଙ୍କ ସହ ଯୋଗାଯୋଗ କରିପାରିବେ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"କଲ"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ଯେ କୌଣସି ବ୍ୟକ୍ତି"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"କଣ୍ଟାକ୍ଟ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ତାରାଙ୍କିତ କଣ୍ଟାକ୍ଟ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"କଣ୍ଟାକ୍ଟ ସେଟିଂସ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ଷ୍ଟାରଯୁକ୍ତ କଣ୍ଟାକ୍ଟ ସେଟିଂସ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"କିଛି ନାହିଁ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"କିଛି ନାହିଁ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ଆଲାରାମ"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ୱାର୍କ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ଗଣନା କରାଯାଉଛି…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ଆପ୍ସ ସେଟିଂସ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ନିଷ୍କ୍ରିୟ କରିବାକୁ ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ଆପଗୁଡ଼ିକ"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ଏକ ମୋଡ ତିଆରି କରନ୍ତୁ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"କଷ୍ଟମ ମୋଡ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ମୋଡର ନାମ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ମୋଡ ନାମ ଖାଲି ରହିପାରିବ ନାହିଁ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ଏକ ଆଇକନ ବାଛନ୍ତୁ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"କେଲେଣ୍ଡର ଇଭେଣ୍ଟଗୁଡ଼ିକ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ଶୋଇବା ସମୟ ରୁଟିନ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ଡ୍ରାଇଭିଂ କରିବା ସମୟରେ"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ପୂର୍ଣ୍ଣ-ସ୍କ୍ରିନ ବିଜ୍ଞପ୍ତି"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ଏହି ଆପରୁ ପୂର୍ଣ୍ଣ-ସ୍କ୍ରିନ ବିଜ୍ଞପ୍ତିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ଡିଭାଇସ ଲକ ହେଲେ ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନରେ ଦେଖାଯାଉଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାଇବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଆଲାରାମ, ଇନକମିଂ କଲ କିମ୍ବା ଅନ୍ୟ ଜରୁରୀ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ହାଇଲାଇଟ କରିବା ପାଇଁ ଆପ୍ସ ଏଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିପାରେ।"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"ସିଷ୍ଟମ ପସନ୍ଦଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ଆପଣଙ୍କ ତରଫରୁ ସିଷ୍ଟମ ପସନ୍ଦଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ଏହି ଅନୁମତି ମୁଖ୍ୟ ସିଷ୍ଟମ ପସନ୍ଦଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏକ ଆପକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"ମିଡିଆ ମେନେଜମେଣ୍ଟ ଆପ୍ସ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ମିଡିଆକୁ ପରିଚାଳନା କରିବାକୁ ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଏହି ଆପ୍ ଆପଣଙ୍କୁ ନପଚାରି ଅନ୍ୟ ଆପଗୁଡ଼ିକ ସହ ତିଆରି କରାଯାଇଥିବା ମିଡିଆ ଫାଇଲଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କିମ୍ବା ଡିଲିଟ୍ କରିପାରିବ। ଫାଇଲ୍ ଏବଂ ମିଡିଆକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପର ଅନୁମତି ରହିବା ଆବଶ୍ୟକ।"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ଜେଶ୍ଚର"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ଶୀଘ୍ର କେମେରା ଖୋଲନ୍ତୁ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"କେମେରା ଶୀଘ୍ର ଖୋଲିବା ପାଇଁ ପାୱାର ବଟନକୁ ଦୁଇଥର ଦବାନ୍ତୁ। ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଏହା କାମ କରେ।"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ସେଲଫି ପାଇଁ କେମେରା ଫ୍ଲିପ କରନ୍ତୁ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ନାଭିଗେସନ ମୋଡ"</string>
@@ -4794,11 +4893,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ସେଟେଲାଇଟ ମେସେଜିଂ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ସେଟେଲାଇଟ ମାଧ୍ୟମରେ ଟେକ୍ସଟ ମେସେଜଗୁଡ଼ିକ ପଠାନ୍ତୁ ଏବଂ ପାଆନ୍ତୁ। ଆପଣଙ୍କ ଆକାଉଣ୍ଟରେ ଅନ୍ତର୍ଭୁକ୍ତ।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ସେଟେଲାଇଟ ମାଧ୍ୟମରେ ଟେକ୍ସଟ ମେସେଜଗୁଡ଼ିକ ପଠାନ୍ତୁ ଏବଂ ପାଆନ୍ତୁ। ଆପଣଙ୍କ ଆକାଉଣ୍ଟ ସହ ଅନ୍ତର୍ଭୁକ୍ତ ନାହିଁ।"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ସେଟେଲାଇଟ ମେସେଜିଂ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"ସେଟେଲାଇଟ ମେସେଜିଂ ବିଷୟରେ"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"ଆପଣ ଏକ ଯୋଗ୍ୟ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ଆକାଉଣ୍ଟର ଅଂଶ ଭାବରେ ସେଟେଲାଇଟ ମାଧ୍ୟମରେ ଟେକ୍ସଟ ମେସେଜ ପଠାଇପାରିବେ ଓ ପାଇପାରିବେ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"ଆପଣଙ୍କ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ପ୍ଲାନ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ଆପଣଙ୍କ ଆକାଉଣ୍ଟ ସହ ସେଟେଲାଇଟ ମେସେଜିଂ ଅନ୍ତର୍ଭୁକ୍ତ"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ଆପଣଙ୍କ ଆକାଉଣ୍ଟ ସହ ସେଟେଲାଇଟ ମେସେଜିଂ ଅନ୍ତର୍ଭୁକ୍ତ ନୁହେଁ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ଏହା କିପରି କାମ କରେ"</string>
@@ -4806,10 +4908,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ଆପଣଙ୍କ ଫୋନ ଏକ ସେଟେଲାଇଟ ସହ ସ୍ୱତଃ-କନେକ୍ଟ ହେବ। ସର୍ବୋତ୍ତମ କନେକ୍ସନ ପାଇଁ ଆକାଶର ଏକ ସ୍ପଷ୍ଟ ଭ୍ୟୁ ରଖନ୍ତୁ।"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ଆପଣଙ୍କ ଫୋନ ଏକ ସେଟେଲାଇଟରେ କନେକ୍ଟ ହେବା ପରେ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"ଜରୁରୀକାଳୀନ ସେବାଗୁଡ଼ିକ ସମେତ ଆପଣ ଯେ କୌଣସି ବ୍ୟକ୍ତିଙ୍କୁ ଟେକ୍ସଟ କରିପାରିବେ। ଉପଲବ୍ଧ ଥିଲେ ଆପଣଙ୍କ ଫୋନ ଏକ ମୋବାଇଲ ନେଟୱାର୍କ ସହ ପୁଣି କନେକ୍ଟ କରିବ।"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ସେଟେଲାଇଟ ମେସେଜିଂ ପାଇଁ ଅଧିକ ସମୟ ଲାଗିପାରେ ଏବଂ ଏହା କେବଳ କିଛି ଏରିଆରେ ଉପଲବ୍ଧ ଅଟେ। ପାଣିପାଗ ଏବଂ ନିର୍ଦ୍ଦିଷ୍ଟ ଷ୍ଟ୍ରକଚରଗୁଡ଼ିକ ଆପଣଙ୍କ ସେଟେଲାଇଟ କନେକ୍ସନକୁ ପ୍ରଭାବିତ କରିପାରେ। ସେଟେଲାଇଟ ମାଧ୍ୟମରେ କଲିଂ ଉପଲବ୍ଧ ନାହିଁ। ଜରୁରୀକାଳୀନ କଲଗୁଡ଼ିକ ଏବେ ବି କନେକ୍ଟ ହୋଇପାରେ।\n\nସେଟିଂସରେ ଆକାଉଣ୍ଟ ପରିବର୍ତ୍ତନଗୁଡ଼ିକ ଦେଖାଯିବା ପାଇଁ କିଛି ସମୟ ଲାଗିପାରେ। ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ କେରିଅର ସହ କଣ୍ଟାକ୍ଟ କରନ୍ତୁ।"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ସେଟେଲାଇଟ ମେସେଜିଂ ବିଷୟରେ ଅଧିକ"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g>କୁ ଚାଲୁ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g>କୁ ଚାଲୁ କରିବା ପାଇଁ ପ୍ରଥମେ ସେଟେଲାଇଟ କନେକ୍ସନକୁ ସମାପ୍ତ କରନ୍ତୁ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ସେଟେଲାଇଟ କନେକ୍ଟିଭିଟି"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ଆକ୍ସେସ ପଏଣ୍ଟ ନାମ"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
@@ -4996,6 +5145,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 16KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ 4KB ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଏହା ଡିଭାଇସକୁ ପୁଣି ଫେକ୍ଟୋରୀ ରିସେଟ କରି ପ୍ରଡକ୍ସନ ସେଟିଂସରେ ରିଷ୍ଟୋର କରିବ। Androidରେ ସଫଳତାର ସହ ଡିଭାଇସ ବୁଟ ହେବା ପରେ ଡେଭେଲପର ବିକଳ୍ପରେ OEM ଅନଲକିଂକୁ ଅକ୍ଷମ କରନ୍ତୁ। ଯଦି ଡିଭାଇସ Androidରେ ବୁଟ ହେବାରେ ବିଫଳ ହୁଏ କିମ୍ବା ଏହା ଅସ୍ଥିର ଅଟେ, ତେବେ &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;ରୁ ନବୀନତମ ଫେକ୍ଟୋରୀ ଇମେଜଗୁଡ଼ିକ ସହ ଡିଭାଇସକୁ ପୁଣି-ଫ୍ଲାସ କରନ୍ତୁ କିମ୍ବା &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ବ୍ୟବହାର କରନ୍ତୁ ଏବଂ \'ଡିଭାଇସକୁ ୱାଇପ କରନ୍ତୁ\', \'ବୁଟଲୋଡରକୁ ଲକ କରନ୍ତୁ\' ଓ \'ସବୁ ପାର୍ଟିସନକୁ ଫୋର୍ସ ଫ୍ଲାସ କରନ୍ତୁ\'କୁ ଚୟନ କରନ୍ତୁ।"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ଅଧିକ ପଢ଼ନ୍ତୁ"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ପୃଷ୍ଠା ସାଇଜ କମ୍ପାଟିବଲିଟୀ ମୋଡ ସହ ଆପକୁ ଚଲାନ୍ତୁ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ବଗ ରିପୋର୍ଟ ହେଣ୍ଡଲର"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ କେଉଁ ଆପ୍ ବଗ୍ ରିପୋର୍ଟ ସର୍ଟକର୍ଟ ପରିଚାଳନା କରେ, ତାହା ନିର୍ଦ୍ଧାରଣ କରେ।"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ବ୍ୟକ୍ତିଗତ"</string>
@@ -5162,7 +5314,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"ବର୍ତ୍ତମାନର ଲୋକେସନରେ UWB ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"ଥ୍ରେଡ"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"ଥ୍ରେଡ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"ଥ୍ରେଡ ଆପଣଙ୍କ ସ୍ମାର୍ଟ ହୋମ ଡିଭାଇସଗୁଡ଼ିକୁ କନେକ୍ଟ କରିବା, ଦକ୍ଷତା ଏବଂ ପରଫରମାନ୍ସକୁ ଉନ୍ନତ କରିବାରେ ସାହାଯ୍ୟ କରେ।\n\nସକ୍ଷମ କରାଗଲେ ଏହି ଡିଭାଇସଟି ଏକ ଥ୍ରେଡ ନେଟୱାର୍କରେ ଯୋଗ ଦେବାକୁ ଯୋଗ୍ୟ ଅଟେ, ଏହି ଫୋନ ମାଧ୍ୟମରେ Matter ସମର୍ଥିତ ଡିଭାଇସଗୁଡ଼ିକୁର ନିୟନ୍ତ୍ରଣ କରିବାକୁ ଅନୁମତି ଦିଏ।"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"ଥ୍ରେଡ ଆପଣଙ୍କ ସ୍ମାର୍ଟ ହୋମ ଡିଭାଇସଗୁଡ଼ିକୁ କନେକ୍ଟ କରିବା, ଦକ୍ଷତା ଏବଂ ପରଫରମାନ୍ସକୁ ଉନ୍ନତ କରିବାରେ ସାହାଯ୍ୟ କରେ।\n\nସକ୍ଷମ କରାଗଲେ ଏହି ଡିଭାଇସଟି ଏକ ଥ୍ରେଡ ନେଟୱାର୍କରେ ଯୋଗ ଦେବାକୁ ଯୋଗ୍ୟ ଅଟେ, ଏହି ଫୋନ ମାଧ୍ୟମରେ Matter ସମର୍ଥିତ ଡିଭାଇସଗୁଡ଼ିକର ନିୟନ୍ତ୍ରଣ କରିବାକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"ଥ୍ରେଡ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"କେମେରା ଆକ୍ସେସ"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"ମାଇକ୍ରୋଫୋନ୍ ଆକ୍ସେସ୍"</string>
@@ -5434,7 +5586,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ଷ୍ଟ୍ରିମକୁ ଶୁଣନ୍ତୁ"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ସହିତ ଶୁଣିବା ପାଇଁ ଏକ ଅଡିଓ ଷ୍ଟ୍ରିମ QR କୋଡକୁ ସ୍କାନ କରନ୍ତୁ"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"ସେୟାର କରୁଥିବା ସମୟରେ ପାସୱାର୍ଡକୁ ଏଡିଟ କରିପାରିବେ ନାହିଁ। ପାସୱାର୍ଡକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, ପ୍ରଥମେ ଅଡିଓ ସେୟାରିଂକୁ ବନ୍ଦ କରନ୍ତୁ।"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ଆପଣଙ୍କ ପାସୱାର୍ଡରେ 4-16 କେରେକ୍ଟର ଥିବା ଏବଂ କେବଳ ଅକ୍ଷର, ସଂଖ୍ୟା ଏବଂ ଚିହ୍ନ ବ୍ୟବହାର ହୋଇଥିବା ଆବଶ୍ୟକ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR କୋଡ ସ୍କାନର"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ସାହାଯ୍ୟ ଆବଶ୍ୟକ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ସର୍ଚ୍ଚ ସେଟିଂସ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"କଣ୍ଟାକ୍ଟ, ଷ୍ଟୋରେଜ, ଆକାଉଣ୍ଟ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"କଣ୍ଟାକ୍ଟ ଷ୍ଟୋରେଜ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"କେବଳ ଡିଭାଇସ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ଏକ ଆକାଉଣ୍ଟ ସହ ନୂଆ କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ସିଙ୍କ ହେବ ନାହିଁ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ଆପଣଙ୍କ ଡିଭାଇସରେ ସେଭ ହେବ ଏବଂ ଡିଫଲ୍ଟ ଭାବେ ଆପଣଙ୍କ ଆକାଉଣ୍ଟରେ ସିଙ୍କ ହେବ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ଡିଫଲ୍ଟ ଆକାଉଣ୍ଟ ସେଟିଂରେ ତ୍ରୁଟି"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"କୌଣସି ଡିଫଲ୍ଟ ଆକାଉଣ୍ଟ ସେଟ କରାଯାଇନାହିଁ"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"କେବଳ ଡିଭାଇସ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ଡିଭାଇସ ଏବଂ %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ଆରମ୍ଭ କରିବାକୁ ଏକ ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"କଣ୍ଟାକ୍ଟଗୁଡ଼ିକୁ କେଉଁଠାରେ ସେଭ କରିବେ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ସର୍ଚ୍ଚ କରିବାକୁ ସର୍କଲ କରନ୍ତୁ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଥିବା ବିଷୟବସ୍ତୁକୁ ବ୍ୟବହାର କରି ସର୍ଚ୍ଚ କରିବା ପାଇଁ ହୋମ ବଟନ କିମ୍ବା ନାଭିଗେସନ ହେଣ୍ଡେଲକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 1964983c82e..655883fac86 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ਸਨੋਫਲੇਕ"</item>
     <item msgid="7952183800501346803">"ਬੀਚ ਵਾਲੀ ਛੱਤਰੀ"</item>
     <item msgid="799139025758265891">"ਵਰਕਸ਼ਾਪ ਦੇ ਔਜ਼ਾਰ"</item>
-    <item msgid="1330084588359129896">"ਤੰਬੂ"</item>
+    <item msgid="8112685757657659269">"ਪਿਆਨੋ"</item>
     <item msgid="3861584909935022342">"ਫ਼ਿਲਮ ਰੀਲ"</item>
     <item msgid="5827426100157335512">"ਬੁੱਕ ਕਰੋ"</item>
     <item msgid="8585828346253128384">"ਕਮਲ ਦਾ ਫੁੱਲ"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 48c02440498..65ee0547415 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ਬਲੂਟੁੱਥ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ਕੱਲ੍ਹ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ਬਲੂਟੁੱਥ ਬੰਦ ਕਰਨ \'ਤੇ, ਇਹ ਅਗਲੇ ਦਿਨ ਫਿਰ ਚਾਲੂ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"ਸੱਜਾ ਕੰਨ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ਖੱਬਾ ਕੰਨ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ਆਪਣਾ ਦੂਜਾ ਕੰਨ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio ਨੂੰ ਬੰਦ ਕਰੋ"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ਡੀਵਾਈਸ ਵੱਲੋਂ LE ਆਡੀਓ ਹਾਰਡਵੇਅਰ ਸਮਰੱਥਾਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਨ \'ਤੇ Bluetooth LE Audio ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ।"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio ਮੋਡ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio Broadcast UI ਦੀ ਪੂਰਵ-ਝਲਕ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"LE Audio Sharing UI ਦੀ ਪੂਰਵ-ਝਲਕ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਵਿਅਕਤੀਗਤ ਆਡੀਓ ਸਾਂਝਾਕਰਨ ਅਤੇ ਨਿੱਜੀ ਪ੍ਰਸਾਰਨ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"ਡੀਵਾਈਸ ਵੇਰਵਿਆਂ ਵਿੱਚ LE ਆਡੀਓ ਟੌਗਲ ਦਿਖਾਓ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ਬਲੂਟੁੱਥ LE ਆਡੀਓ ਪ੍ਰਵਾਨਿਤ ਸੂਚੀ ਨੂੰ ਬਾਈਪਾਸ ਕਰੋ"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE ਆਡੀਓ ਨੂੰ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਵਰਤੋ, ਭਾਵੇਂ LE ਆਡੀਓ ਪੈਰੀਫੈਰਲ ਦੀ ਆਗਿਆ ਸੂਚੀ ਦੇ ਮਾਪਦੰਡਾਂ ਨੂੰ ਪੂਰਾ ਕਰਨ ਲਈ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ਐਪ ਦੀ ਭਾਸ਼ਾ"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ਸੁਝਾਈਆਂ ਗਈਆਂ ਭਾਸ਼ਾਵਾਂ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"ਸੁਝਾਈਆਂ ਗਈਆਂ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ਸਾਰੇ ਖੇਤਰ"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ਸਾਰੇ ਨੰਬਰਿੰਗ ਸਿਸਟਮ"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ਸਿਸਟਮ ਦੀ ਭਾਸ਼ਾ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਇਸ ਐਪ ਲਈ ਭਾਸ਼ਾ ਦੀ ਚੋਣ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"ਬਦਲੋ"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ਇਸ ਭਾਸ਼ਾ ਨੂੰ ਸਿਸਟਮ ਭਾਸ਼ਾ ਵਜੋਂ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਪਰ ਤੁਸੀਂ ਐਪਾਂ ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਨੂੰ ਇਹ ਦੱਸ ਦਿੱਤਾ ਹੈ ਕਿ ਤੁਸੀਂ ਇਸ ਭਾਸ਼ਾ ਨੂੰ ਤਰਜੀਹ ਦਿੰਦੇ ਹੋ।"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ਖੋਜੋ"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ਕੋਈ ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ਖੇਤਰ ਤਰਜੀਹ"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"ਭਾਸ਼ਾ ਦਾ ਨਾਮ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"ਭਾਸ਼ਾ ਸੰਬੰਧੀ ਹੋਰ ਸੈਟਿੰਗਾਂ"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ਖੇਤਰੀ ਤਰਜੀਹਾਂ"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ਇਕਾਈਆਂ ਅਤੇ ਨੰਬਰ ਸੰਬੰਧੀ ਤਰਜੀਹਾਂ ਨੂੰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ਐਪਾਂ ਨੂੰ ਤੁਹਾਡੀਆਂ ਖੇਤਰੀ ਤਰਜੀਹਾਂ ਜਾਣਨ ਦਿਓ ਤਾਂ ਜੋ ਉਹ ਤੁਹਾਡੇ ਅਨੁਭਵ ਨੂੰ ਵਿਅਕਤੀਗਤ ਬਣਾ ਸਕਣ।"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"ਜਿੱਥੇ ਸੰਭਵ ਹੋਇਆ ਐਪਾਂ ਤੁਹਾਡੀਆਂ ਖੇਤਰੀ ਤਰਜੀਹਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ਖੇਤਰੀ ਤਰਜੀਹਾਂ"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ਤਾਪਮਾਨ"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ਹਫ਼ਤੇ ਦਾ ਪਹਿਲਾ ਦਿਨ"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ਨੰਬਰਾਂ ਸੰਬੰਧੀ ਤਰਜੀਹਾਂ"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ਰੋਮਿੰਗ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਾਂ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ਇਸ ਟੌਗਲ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਸੈਟਿੰਗ ਕਰਨ ਲਈ ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ਨੈੱਟਵਰਕ ਅਤੇ ਵਾਇਰਲੈੱਸ ਸਿਗਨਲਾਂ ਵਰਤ ਕੇ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ਸਮਾਂ ਖੇਤਰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ਆਪਣੇ ਨੇੜੇ-ਤੇੜੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ਡੀਵਾਈਸ ਟਿਕਾਣੇ ਦੇ ਮੁਤਾਬਕ ਸਮਾਂ ਅਤੇ ਤਾਰੀਖ ਖੁਦ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਸਥਾਨਕ ਸਮਾਂ ਵਰਤੋ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ਘੰਟੇ ਵਾਲਾ ਫਾਰਮੈਟ ਵਰਤੋ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ਸਮਾਂ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ਉਂਗਲ ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ਮੁਰੰਮਤ ਕਰਨ ਵਾਲੇ ਪ੍ਰਦਾਨਕ ਕੋਲ ਜਾਓ।"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ, \'ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ\' ਵਿਸ਼ੇਸ਼ਤਾ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ, \'ਅਣਲਾਕ\' ਵਿਸ਼ੇਸ਼ਤਾ"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"ਹੋਰ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗਾਂ"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ਇਨਕ੍ਰਿਪਸ਼ਨ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ਆਪਣੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਲਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ਲਾਕ ਕਰੋ"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ਲੁਕਾਓ"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ਆਪਣੇ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਪੈਟਰਨ ਦੀ ਤਸਦੀਕ ਕਰੋ"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ਆਪਣਾ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ਆਪਣਾ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ਤੁਸੀਂ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਅਧਿਕਤਮ ਸੰਖਿਆ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ਹੋਰ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"ਚਾਲੂ"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ਬੰਦ ਹੈ"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ਬਾਹਰੀ ਡਿਸਪਲੇ"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"ਬਾਹਰੀ ਡਿਸਪਲੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ਡਿਸਪਲੇ ਰੈਜ਼ੋਲਿਊਸ਼ਨ"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ਬਾਹਰੀ ਡਿਸਪਲੇ ਡਿਸਕਨੈਕਟ ਹੈ"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"ਘੁਮਾਅ ਜਾਂ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਨੂੰ ਬਦਲਣ ਨਾਲ ਫ਼ਿਲਹਾਲ ਚੱਲ ਰਹੀਆਂ ਕੁਝ ਐਪਾਂ ਬੰਦ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਪ੍ਰਤਿਬਿੰਬਿਤ ਕਰਨ ਲਈ, ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਇੱਕ ਬਾਹਰੀ ਡਿਸਪਲੇ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ਹੋਰ ਵਿਕਲਪ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ਡਿਸਪਲੇਆਂ ਨੂੰ ਮੁੜ-ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ ਅਤੇ ਘਸੀਟੋ।"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ਕਾਸਟ ਕਰੋ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ਸ਼ੀਸ਼ਾ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ਪਾਸਵਰਡ ਦੀ ਜਾਂਚ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ਡੀਵਾਈਸ ਉਤਪਾਦਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ਇਹ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਫ਼ਿਲਹਾਲ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ਇਸ QR ਕੋਡ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਹੈ। ਕਿਸੇ ਹੋਰ ਤਰੀਕੇ ਨਾਲ ਕਨੈਕਟ ਕਰ ਕੇ ਦੇਖੋ।"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਲਈ, ਇੱਕ ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"ਕੀ ਇਸ ਡੀਵਾਈਸ ਨੂੰ “<xliff:g id="SSID">%1$s</xliff:g>” ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ਸਵੈ-ਘੁਮਾਉਣ ਬਾਰੇ ਹੋਰ ਜਾਣੋ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ਸਕ੍ਰੀਨ ਰੈਜ਼ੋਲਿਊਸ਼ਨ"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ਜ਼ਿਆਦਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ਪੂਰਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ਪੂਰਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਤੁਹਾਡੀ ਬੈਟਰੀ ਦੀ ਜ਼ਿਆਦਾ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੇ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਵਿੱਚ ਸਵਿੱਚ ਕਰਨ ਕਰਕੇ ਕੁਝ ਐਪਾਂ ਮੁੜ-ਸ਼ੁਰੂ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ਚੁਣਿਆ ਗਿਆ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ਰੰਗ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ਕੁਦਰਤੀ"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ਅਡੈਪਟਿਵ"</string>
     <string name="brightness" msgid="6216871641021779698">"ਚਮਕ ਦਾ ਪੱਧਰ"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ਅਡੈਪਟਿਵ ਬ੍ਰਾਈਟਨੈੱਸ"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"ਅਡੈਪਟਿਵ ਬ੍ਰਾਈਟਨੈੱਸ ਬਾਰੇ"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਦੀ ਚਮਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਵਾਤਾਵਰਨ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਸਰਗਰਮੀਆਂ ਦੇ ਮੁਤਾਬਕ ਵੱਧ-ਘੱਟ ਹੋਵੇਗੀ। ਅਡੈਪਟਿਵ ਬ੍ਰਾਈਟਨੈੱਸ ਨੂੰ ਤੁਹਾਡੀਆਂ ਤਰਜੀਹਾਂ ਬਾਰੇ ਸਿੱਖਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਤੁਸੀਂ ਸਲਾਈਡਰ ਨੂੰ ਹੱਥੀਂ ਹਿਲਾ ਸਕਦੇ ਹੋ।"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ਚਾਲੂ"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ਬੰਦ"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ਬੈੱਡਟਾਈਮ ਮੋਡ ਸੰਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ਮੋਡ ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰ ਸਕਦਾ ਹੈ}=1{{mode_1} ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰ ਸਕਦਾ ਹੈ}=2{{mode_1} ਅਤੇ {mode_2} ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰ ਸਕਦੇ ਹਨ}=3{{mode_1}, {mode_2} ਅਤੇ {mode_3} ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰ ਸਕਦੇ ਹਨ}other{{mode_1}, {mode_2} ਅਤੇ # ਹੋਰ ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਕਰ ਸਕਦੇ ਹਨ}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ਮੋਡਾਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"ਹੋਰ ਵੀ ਘੱਟ ਚਮਕਦਾਰ"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"ਜ਼ਿਆਦਾ ਘੱਟ ਚਮਕ"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"ਡੀਵਾਈਸ ਨੂੰ ਆਮ ਨਾਲੋਂ ਘੱਟ ਚਮਕਦਾਰ ਹੋਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ਸਕ੍ਰੀਨ ਸਮਾਂ ਸਮਾਪਤੀ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਤੱਕ ਕੋਈ ਸਰਗਰਮੀ ਨਾ ਹੋਣ \'ਤੇ"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ਟਿਕਾਣਾ ਵਰਤੋ"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ਸਮਾਂ ਖੇਤਰ ਲਈ ਟਿਕਾਣਾ ਵਰਤੋ"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ਸਮਾਂ ਖੇਤਰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ਟਿਕਾਣਾ ਜਾਂ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਬੰਦ ਹਨ"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ਟਿਕਾਣਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"ਇਸ ਨੂੰ ਠੀਕ ਕਰੋ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ਰੱਦ ਕਰੋ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ਸਵੈਚਲਿਤ ਸਮਾਂ ਖੇਤਰ ਬੰਦ ਹੈ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਾਂ ਖੇਤਰ ਸੈੱਟ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੋਣ \'ਤੇ, ਇਹ ਉਪਲਬਧ ਨਹੀਂ ਹੋਵੇਗਾ"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ਸਮਾਂ ਖੇਤਰ ਸੈੱਟ ਕਰਨ ਲਈ ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ਜੇ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਟਿਕਾਣਾ ਉਪਲਬਧ ਹੈ, ਤਾਂ ਇਸਨੂੰ ਤੁਹਾਡਾ ਸਮਾਂ ਖੇਤਰ ਸੈੱਟ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸਾਫ਼ਟਵੇਅਰ ਵਰਜਨ ਦੇਖੋ"</string>
     <string name="legal_information" msgid="7509900979811934843">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
     <string name="manual" msgid="3651593989906084868">"ਮੈਨੁਅਲ"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ਵਿਕਲਪ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ਪਹੁੰਚਯੋਗਤਾ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"ਬਾਊਂਸ ਕੁੰਜੀਆਂ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ਮਿਲੀਸਕਿੰਟਾਂ ਵਿੱਚ ਵਾਰ-ਵਾਰ ਇੱਕੋ ਕੁੰਜੀ ਨੂੰ ਦਬਾਉਂਦੇ ਰਹਿਣ \'ਤੇ ਕੀ-ਬੋਰਡ ਉਸਨੂੰ ਅਣਡਿੱਠ ਕਰ ਦਿੰਦਾ ਹੈ"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ਵਾਰ-ਵਾਰ ਇੱਕੋ ਕੁੰਜੀ ਨੂੰ ਦਬਾਉਂਦੇ ਰਹਿਣ \'ਤੇ ਕੀ-ਬੋਰਡ ਉਸਨੂੰ ਅਣਡਿੱਠ ਕਰ ਦਿੰਦਾ ਹੈ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ਬਾਊਂਸ-ਕੀ ਦੀ ਨਿਊਨਤਮ ਸੀਮਾ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ਚੁਣੋ ਕਿ ਕਿਸੇ ਕੁੰਜੀ ਨੂੰ ਕਿੰਨੀ ਦੇਰ ਤੱਕ ਵਾਰ-ਵਾਰ ਦਬਾਉਣ \'ਤੇ ਕੀ-ਬੋਰਡ ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਕਰੇਗਾ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 ਸਕਿੰਟ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 ਸਕਿੰਟ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 ਸਕਿੰਟ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"ਵਿਉਂਤਬੱਧ"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ਵਿਉਂਤਬੱਧ ਮੁੱਲ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ਸਲੋ ਕੁੰਜੀਆਂ"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"ਕਿਸੇ ਕੁੰਜੀ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਵਿੱਚ ਲੱਗਣ ਵਾਲੇ ਸਮੇਂ ਨੂੰ <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ਮਿਲੀਸਕਿੰਟਾਂ ਤੱਕ ਵਿਵਸਥਿਤ ਕਰਦਾ ਹੈ"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ਕਿਸੇ ਕੁੰਜੀ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਵਿੱਚ ਲੱਗਣ ਵਾਲੇ ਸਮੇਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਦਾ ਹੈ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ਸਥਿਰ ਕੁੰਜੀਆਂ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ਸ਼ਾਰਟਕੱਟਾਂ ਲਈ ਕੁੰਜੀਆਂ ਨੂੰ ਇਕੱਠੇ ਦਬਾਈ ਰੱਖਣ ਦੀ ਬਜਾਏ ਇੱਕ ਵਾਰ ਵਿੱਚ ਇੱਕ ਕੁੰਜੀ ਦਬਾਓ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ਮਾਊਸ ਕੁੰਜੀਆਂ"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ਮਾਊਸ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਵਰਤੋ।"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ਮਾਊਸ ਕੁੰਜੀਆਂ ਵਰਤੋ"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ਪੁਆਇੰਟਰ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਆਪਣਾ ਕੀ-ਬੋਰਡ ਵਰਤੋ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ਮਾਊਸ ਦੀ ਉਲਟ ਸਕ੍ਰੋਲਿੰਗ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ਪੰਨੇ ਨੂੰ ਹੇਠਾਂ ਲਿਜਾਉਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਕ੍ਰੋਲ ਕਰੋ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ਖੱਬੇ ਅਤੇ ਸੱਜੇ ਬਟਨਾਂ ਨੂੰ ਸਵੈਪ ਕਰੋ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ਮਾਊਸ ਦੇ ਖੱਬੇ ਬਟਨ ਨੂੰ ਆਪਣੇ ਸੱਜੇ ਬਟਨ ਵਜੋਂ ਵਰਤੋ"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> ਲਈ ਮਾਊਸ ਕੁੰਜੀਆਂ"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ਮਾਊਸ ਪੁਆਇੰਟਰ ਨੂੰ ਹਿਲਾਉਣ ਲਈ <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ਕੁੰਜੀਆਂ ਵਰਤੋ"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ਮਾਊਸ ਦੇ ਪ੍ਰਾਇਮਰੀ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰਨ ਲਈ <xliff:g id="CLICK_LABEL">%s</xliff:g> ਕੁੰਜੀ ਵਰਤੋ"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ਮਾਊਸ ਦੇ ਪ੍ਰਾਇਮਰੀ ਬਟਨ ਨੂੰ ਦਬਾਈ ਰੱਖਣ ਲਈ <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ਕੁੰਜੀ ਵਰਤੋ"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ਮਾਊਸ ਦੇ ਪ੍ਰਾਇਮਰੀ ਬਟਨ ਨੂੰ ਛੱਡਣ ਲਈ <xliff:g id="RELEASE_LABEL">%s</xliff:g> ਕੁੰਜੀ ਵਰਤੋ"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ਸਕ੍ਰੋਲ ਮੋਡ ਨੂੰ ਟੌਗਲ ਕਰਨ ਲਈ <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ਕੁੰਜੀ ਵਰਤੋ। ਇਸ ਨਾਲ <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ਰਾਹੀਂ ਉੱਪਰ, ਹੇਠਾਂ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਸਕ੍ਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ਮਾਊਸ ਦੇ ਸੈਕੰਡਰੀ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰਨ ਲਈ <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ਕੁੰਜੀ ਵਰਤੋ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ਸ਼ਾਰਟਕੱਟਾਂ ਦੀ ਸੂਚੀ ਦਿਖਾਓ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਕੀ-ਬੋਰਡ ਅਤੇ ਟੂਲ"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ਟੱਚਪੈਡ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ਟੱਚਪੈਡ ਅਤੇ ਮਾਊਸ"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ਮਾਊਸ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ਪੁਆਇੰਟਰ ਸਪੀਡ, ਇਸ਼ਾਰੇ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ਕਲਿੱਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ਟੈਪ ਕਰ ਕੇ ਘਸੀਟੋ"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ਹੇਠਲਾ-ਸੱਜਾ-ਕਲਿੱਕ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ਹੋਰ ਵਿਕਲਪਾਂ ਲਈ ਟੱਚਪੈਡ ਦੇ ਹੇਠਲੇ ਸੱਜੇ ਕੋਨੇ \'ਤੇ ਕਲਿੱਕ ਕਰੋ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ਪੁਆਇੰਟਰ ਸਪੀਡ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ਤਿੰਨ-ਉਂਗਲਾਂ ਨਾਲ ਟੈਪ ਕਰੋ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"ਪੁਆਇੰਟਰ ਦਾ ਰੰਗ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"ਪੁਆਇੰਟਰ ਭਰਨ ਦਾ ਸਟਾਈਲ ਕਾਲੇ ਵਿੱਚ ਬਦਲੋ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"ਪੁਆਇੰਟਰ ਭਰਨ ਦਾ ਸਟਾਈਲ ਹਰੇ ਵਿੱਚ ਬਦਲੋ"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ਟੱਚਪੈਡ ਇਸ਼ਾਰਿਆਂ ਬਾਰੇ ਜਾਣੋ"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ਟਰੈਕਪੈਡ, ਟਰੈਕ ਪੈਡ, ਮਾਊਸ, ਕਰਸਰ, ਸਕ੍ਰੋਲ ਕਰੋ, ਸਵਾਈਪ ਕਰੋ, ਸੱਜਾ ਕਲਿੱਕ, ਕਲਿੱਕ ਕਰੋ, ਪੁਆਇੰਟ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"ਸੱਜਾ ਕਲਿੱਕ, ਟੈਪ ਕਰੋ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"ਵਿਚਕਾਰਲਾ ਕਲਿੱਕ"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant ਨੂੰ ਲਾਂਚ ਕਰੋ"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ਹੋਮ \'ਤੇ ਜਾਓ"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ਵਾਪਸ ਜਾਓ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ਹਾਲੀਆ ਐਪਾਂ ਦੇਖੋ"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ਹੋਮ \'ਤੇ ਜਾਓ"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ਆਪਣੇ ਟੱਚਪੈਡ \'ਤੇ ਕਿਤੇ ਵੀ ਤਿੰਨ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ਵਾਪਸ ਜਾਓ"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ਲਈ ਨਵੀਂ ਕੁੰਜੀ ਚੁਣੋ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਪਹੁੰਚਯੋਗਤਾ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ਸਥਿਰ ਕੁੰਜੀਆਂ, ਬਾਊਂਸ ਕੁੰਜੀਆਂ, ਮਾਊਸ ਕੁੰਜੀਆਂ"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ਕੁੰਜੀਆਂ ਨੂੰ ਦੁਹਰਾਓ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"ਦੁਹਰਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਦੇਰੀ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ਦੁਹਰਾਉਣ ਦੀ ਦਰ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ਕਿਸੇ ਕੁੰਜੀ ਨੂੰ ਦਬਾ ਕੇ ਰੱਖਣ \'ਤੇ, ਉਸ ਕੁੰਜੀ ਦਾ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਉਦੋਂ ਤੱਕ ਦੁਹਰਾਇਆ ਜਾਵੇਗਾ, ਜਦੋਂ ਤੱਕ ਕੁੰਜੀ ਨੂੰ ਛੱਡਿਆ ਨਹੀਂ ਜਾਂਦਾ"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ਖਾਕਾ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ਸਵੈਚਲਿਤ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ਮਿਆਰੀ ਚੋਣਾਂ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ਭਾਸ਼ਾ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ਲਿਖਤ ਦਾ ਆਕਾਰ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ਸੁਰਖੀ ਦਾ ਆਕਾਰ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ਸੁਰਖੀ ਦੀ ਸ਼ੈਲੀ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ਵਿਉਂਂਤੀ ਵਿਕਲਪ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ਬੈਕਗ੍ਰਾਉਂਡ ਦਾ ਰੰਗ"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ਪਾਵਰ ਵਰਤੋਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ਐਪਾਂ ਆਮ ਵਾਂਗ ਚੱਲ ਰਹੀਆਂ ਹਨ"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"ਬੈਟਰੀ ਬਦਲਣ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ਬੈਟਰੀ ਸਮਰੱਥਾ ਅਤੇ ਚਾਰਜਿੰਗ ਕਾਰਗੁਜ਼ਾਰੀ ਘੱਟ ਗਈਆਂ ਹਨ ਅਤੇ ਬੈਟਰੀ ਬਦਲਣ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ਬੈਟਰੀ ਦਾ ਪੱਧਰ ਘੱਟ ਹੈ"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਬਿਹਤਰ ਬਣਾਓ"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ਵਰਜਨ"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ਨੂੰ ਭੁੱਲ ਜਾਓ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"ਕੰਮਕਾਜੀ ਦਿਨਾਂ ਨੂੰ ਸਵੇਰ 9 ਵਜੇ - ਸ਼ਾਮ 5 ਵਜੇ\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"ਕੈਲੰਡਰ ਇਵੈਂਟ"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ਕਿਰਿਆਸ਼ੀਲ ਹੈ}=2{{mode_1} ਅਤੇ {mode_2} ਕਿਰਿਆਸ਼ੀਲ ਹਨ}=3{{mode_1}, {mode_2} ਅਤੇ {mode_3} ਕਿਰਿਆਸ਼ੀਲ ਹਨ}other{{mode_1}, {mode_2}, ਅਤੇ # ਹੋਰ ਕਿਰਿਆਸ਼ੀਲ ਹਨ}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ਮੋਡ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ}other{# ਮੋਡ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੇ ਹਨ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ਚਾਲੂ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ਬੰਦ ਹੈ"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ਸਮਝ ਲਿਆ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ਮਿਆਦ"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ਸੁਨੇਹੇ, ਇਵੈਂਟ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ਹੋ ਗਿਆ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ਸੂਚਨਾਵਾਂ ਦੀ ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਾ ਹੀ ਦਿਸਣਗੀਆਂ ਅਤੇ ਨਾ ਹੀ ਸੁਣਨਗੀਆਂ। ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਅਤੇ ਵਾਰ-ਵਾਰ ਕਾਲਾਂ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਦੀਆਂ ਕਾਲਾਂ ਮਿਲਣਗੀਆਂ।"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ਮੌਜੂਦਾ ਸੈਟਿੰਗ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"ਕੀ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੀਆਂ ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ ਬਦਲਣੀਆਂ ਹਨ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਵਰਤੋ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ਆਪਣੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਾਲੀਆਂ ਧੁਨੀਆਂ ਹੀ ਵਰਤੋ"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ਅਣਲਾਕ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਸਿੱਧਾ ਪਿਛਲੀ ਵਾਰ ਵਰਤੀ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਓ। ਸੂਚਨਾਵਾਂ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੀਆਂ। ਉਨ੍ਹਾਂ ਨੂੰ ਦੇਖਣ ਲਈ ਸਿਖਰ ਤੋਂ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ਲਾਕ ਸਕ੍ਰੀਨ, ਲਾਕਸਕ੍ਰੀਨ, ਛੱਡੋ, ਅਣਡਿੱਠ"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਹੋਣ \'ਤੇ"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਘੱਟ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਦਾ ਵਿਕਲਪ"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਘੱਟ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸਿਰਫ਼ ਨਵੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਪਹਿਲਾਂ ਤੋਂ ਦੇਖੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਹਟਾਓ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"ਗੱਲਾਂਬਾਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਅਤੇ ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"ਗੱਲਾਂਬਾਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਅਤੇ ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"ਕੰਮ ਸੰਬੰਧੀ ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ਸੰਵੇਦਨਸ਼ੀਲ ਕਾਰਜ ਸਮੱਗਰੀ ਲੁਕਾਓ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਲਾਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ ਕਿਸ ਤਰ੍ਹਾਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ਜੇ ਤੁਹਾਨੂੰ ਘੱਟ ਸਮੇਂ ਵਿੱਚ ਕਈ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੁੰਦੀਆਂ ਹਨ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ 2 ਮਿੰਟਾਂ ਤੱਕ ਇਨ੍ਹਾਂ ਦੀ ਅਵਾਜ਼ ਨੂੰ ਘਟਾ ਦੇਵੇਗਾ ਅਤੇ ਅਲਰਟਾਂ ਨੂੰ ਛੋਟਾ ਕਰ ਦੇਵੇਗਾ। ਕਾਲਾਂ, ਅਲਾਰਮ ਅਤੇ ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਪ੍ਰਭਾਵਿਤ ਨਹੀਂ ਹੁੰਦੀਆਂ। \n\nਕੂਲਡਾਊਨ ਦੌਰਾਨ ਪ੍ਰਾਪਤ ਹੋਈਆਂ ਸੂਚਨਾਵਾਂ ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ ਤੋਂ ਹੇਠਾਂ ਵੱਲ ਖਿੱਚ ਕੇ ਦੇਖੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ਕੰਮ ਸੰਬੰਧੀ ਪ੍ਰੋਫਾਈਲਾਂ \'ਤੇ ਲਾਗੂ ਕਰੋ"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ਕੰਮ ਸੰਬੰਧੀ ਪ੍ਰੋਫਾਈਲ ਦੀਆਂ ਐਪਾਂ \'ਤੇ ਲਾਗੂ ਕਰੋ"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"ਬੰਡਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ਚਾਲੂ"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ਬੰਦ"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ਸੂਚਨਾ ਬੰਡਲਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ਵਧੇਰੇ ਸ਼ਾਂਤ ਅਨੁਭਵ ਲਈ ਮਿਲਦੇ-ਜੁਲਦੇ ਥੀਮਾਂ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਖਮੋਸ਼ ਅਤੇ ਇਕੱਠੇ ਗਰੁੱਪਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ। ਬੰਡਲਿੰਗ, ਐਪ ਦੀਆਂ ਆਪਣੀਆਂ ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰੇਗੀ।"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ਮਦਦਗਾਰ ਸੇਵਾਵਾਂ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪ ਵੱਲੋਂ VR ਮਦਦਗਾਰ ਸੇਵਾਵਾਂ ਵਜੋਂ ਚਲਾਉਣ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਗਈ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ VR ਸੇਵਾ ਪਹੁੰਚ ਨੂੰ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਗੱਲਬਾਤ}other{# ਗੱਲਾਂਬਾਤਾਂ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"ਗੱਲਾਂਬਾਤਾਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ਕੌਣ ਰੁਕਾਵਟ ਪਾ ਸਕਦਾ ਹੈ"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ਭਾਵੇਂ ਸੁਨੇਹਾ ਜਾਂ ਕਾਲਿੰਗ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ, ਤਾਂ ਵੀ ਤੁਹਾਡੇ ਵੱਲੋਂ ਇੱਥੇ ਚੁਣੇ ਗਏ ਲੋਕ ਅਜੇ ਵੀ ਉਨ੍ਹਾਂ ਐਪਾਂ ਰਾਹੀਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ਕਾਲਾਂ"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ਕੋਈ ਵੀ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ਸੰਪਰਕ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"ਸੰਪਰਕਾਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ਤਾਰਾਬੱਧ ਕੀਤੇ ਗਏ ਸੰਪਰਕਾਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ਅਲਾਰਮ"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ਕੰਮ ਦੇ ਲਈ)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ਗਣਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ਐਪਾਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ਐਪਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਨ ਦਿਓ"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ਐਪਾਂ ਜੋ ਰੁਕਾਵਟ ਪੈਦਾ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ਕੋਈ ਮੋਡ ਬਣਾਓ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ਵਿਉਂਤਬੱਧ ਮੋਡ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ਮੋਡ ਦਾ ਨਾਮ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ਮੋਡ ਨਾਮ ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ਕੋਈ ਪ੍ਰਤੀਕ ਚੁਣੋ"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"ਕੈਲੰਡਰ ਇਵੈਂਟ"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"ਸੌਣ ਦਾ ਨਿਯਮਿਤ ਸਮਾਂ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ਪੂਰੀ-ਸਕ੍ਰੀਨ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ਇਸ ਐਪ ਤੋਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਪੂਰੀ-ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"ਇਸ ਐਪ ਨੂੰ ਉਹ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ ਜੋ ਡੀਵਾਈਸ ਲਾਕ ਹੋਣ \'ਤੇ ਪੂਰੀ ਸਕ੍ਰੀਨ ਵਿੱਚ ਦਿਖਾਈ ਦਿੰਦੀਆਂ ਹਨ। ਐਪਾਂ ਇਨ੍ਹਾਂ ਦੀ ਵਰਤੋਂ ਅਲਾਰਮਾਂ, ਇਨਕਮਿੰਗ ਕਾਲਾਂ ਜਾਂ ਹੋਰ ਜ਼ਰੂਰੀ ਸੂਚਨਾਵਾਂ ਨੂੰ ਉਜਾਗਰ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"ਸਿਸਟਮ ਤਰਜੀਹਾਂ ਲਿਖੋ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ਆਪਣੀ ਤਰਫ਼ੋਂ ਇਸ ਐਪ ਨੂੰ ਸਿਸਟਮ ਤਰਜੀਹਾਂ ਵਿੱਚ ਸੋਧ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ਇਹ ਇਜਾਜ਼ਤ ਕਿਸੇ ਐਪ ਨੂੰ ਸਿਸਟਮ ਦੀਆਂ ਮੁੱਖ ਤਰਜੀਹਾਂ ਵਿੱਚ ਸੋਧ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"ਮੀਡੀਆ ਪ੍ਰਬੰਧਨ ਐਪਾਂ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ਐਪ ਨੂੰ ਮੀਡੀਆ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਦਿਓ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ਜੇ ਆਗਿਆ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ, ਤਾਂ ਇਹ ਐਪ ਤੁਹਾਨੂੰ ਪੁੱਛੇ ਬਿਨਾਂ ਹੋਰ ਐਪਾਂ ਨਾਲ ਬਣਾਈਆਂ ਗਈਆਂ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਨੂੰ ਸੋਧ ਜਾਂ ਮਿਟਾ ਸਕਦੀ ਹੈ। ਐਪ ਕੋਲ ਫ਼ਾਈਲਾਂ ਅਤੇ ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ਇਸ਼ਾਰੇ"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ਕੈਮਰੇ ਨੂੰ ਤੁਰੰਤ ਖੋਲ੍ਹਣ ਲਈ, ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਦਬਾਓ। ਇਹ ਕਿਸੇ ਵੀ ਸਕ੍ਰੀਨ ਤੋਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"ਸੈਲਫ਼ੀ ਲਈ ਕੈਮਰਾ ਫਲਿੱਪ ਕਰੋ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"ਨੈਵੀਗੇਸ਼ਨ ਮੋਡ"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ। ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ। ਤੁਹਾਡੇ ਖਾਤੇ ਨਾਲ ਇਸ ਸੁਵਿਧਾ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ ਸੇਵਾ ਬਾਰੇ"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"ਤੁਸੀਂ ਯੋਗ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਖਾਤੇ ਦੇ ਹਿੱਸੇ ਵਜੋਂ ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"ਤੁਹਾਡਾ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਪਲਾਨ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ ਸੇਵਾ ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ ਸੇਵਾ ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ਹੋਰ ਜਾਣੋ"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਸੈਟੇਲਾਈਟ ਨਾਲ ਸਵੈ-ਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ। ਵਧੀਆ ਕੁਨੈਕਸ਼ਨ ਲਈ, ਅਸਮਾਨ ਦਾ ਸਾਫ਼ ਦ੍ਰਿਸ਼ ਨੂੰ ਬਰਕਰਾਰ ਰੱਖੋ।"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਸੈਟੇਲਾਈਟ ਨਾਲ ਕਨੈਕਟ ਹੋ ਜਾਣ ਤੋਂ ਬਾਅਦ"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"ਤੁਸੀਂ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਸਮੇਤ ਕਿਸੇ ਨੂੰ ਵੀ ਲਿਖਤ ਸੁਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ। ਉਪਲਬਧ ਹੋਣ \'ਤੇ ਤੁਹਾਡਾ ਫ਼ੋਨ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਨਾਲ ਮੁੜ-ਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹੇ ਸੇਵਾ ਵਿੱਚ ਜ਼ਿਆਦਾ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ ਅਤੇ ਇਹ ਸਿਰਫ਼ ਕੁਝ ਖੇਤਰਾਂ ਵਿੱਚ ਉਪਲਬਧ ਹੈ। ਮੌਸਮ ਅਤੇ ਕੁਝ ਢਾਂਚੇ ਤੁਹਾਡੇ ਸੈਟੇਲਾਈਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰ ਸਕਦੇ ਹਨ। ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਕਾਲ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਐਮਰਜੈਂਸੀ ਕਾਲਾਂ ਹਾਲੇ ਵੀ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।\n\nਖਾਤਾ ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਈ ਦੇਣ ਵਿੱਚ ਕੁਝ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ ਸੇਵਾ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰੋ, ਪਹਿਲਾਂ ਸੈਟੇਲਾਈਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"ਸੈਟੇਲਾਈਟ ਕਨੈਕਟੀਵਿਟੀ"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਨਾਮ"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 16KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਹੋਣ ਵੇਲੇ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਜੋਖਮ ਵਿੱਚ ਹੋ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, ਤੁਹਾਡਾ 4KB ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ। ਇਸ ਨਾਲ ਡੀਵਾਈਸ ਦੁਬਾਰਾ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਕੇ ਪ੍ਰੋਡਕਸ਼ਨ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੁੜ-ਬਹਾਲ ਹੋ ਜਾਵੇਗਾ। ਡੀਵਾਈਸ ਦੇ Android ਵਿੱਚ ਸਫਲਤਾਪੂਰਵਕ ਬੂਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਵਿੱਚ OEM ਅਣਲਾਕ ਸੈਟਿੰਗ ਨੂੰ ਬੰਦ ਕਰੋ। ਜੇ ਡੀਵਾਈਸ Android ਵਿੱਚ ਬੂਟ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ਰਹਿੰਦਾ ਹੈ ਜਾਂ ਅਸਥਿਰ ਹੈ, ਤਾਂ &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ਤੋਂ ਨਵੇਂ ਫੈਕਟਰੀ ਪ੍ਰਤਿਬਿੰਬਾਂ ਨਾਲ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਫਲੈਸ਼ ਕਰੋ ਜਾਂ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ਵਰਤੋ ਅਤੇ \'ਡੀਵਾਈਸ ਸਾਫ਼ ਕਰੋ\', \'ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰੋ\' ਅਤੇ \'ਸਾਰਿਆਂ ਹਿੱਸਿਆਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਫਲੈਸ਼ ਕਰੋ\'।"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"ਹੋਰ ਪੜ੍ਹੋ"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ਐਪ ਨੂੰ ਪੰਨਾ ਆਕਾਰ ਅਨੁਰੂਪਤਾ ਮੋਡ ਵਿੱਚ ਚਲਾਓ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"ਬੱਗ ਰਿਪੋਰਟ ਹੈਂਡਲਰ"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ਨਿਰਧਾਰਤ ਕਰੋ ਕਿ ਕਿਹੜੀ ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਬੱਗ ਰਿਪੋਰਟ ਸ਼ਾਰਟਕੱਟ ਦੀ ਸਾਂਭ-ਸੰਭਾਲ ਕਰੇਗੀ।"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ਨਿੱਜੀ"</string>
@@ -5161,7 +5313,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"ਮੌਜੂਦਾ ਟਿਕਾਣੇ \'ਤੇ UWB ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread ਵਰਤੋ"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread ਤੁਹਾਡੇ ਸਮਾਰਟ ਹੋਮ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ, ਜਿਸ ਨਾਲ ਸਮਰੱਥਾ ਅਤੇ ਕਾਰਗੁਜ਼ਾਰੀ ਵਿੱਚ ਵਾਧਾ ਹੁੰਦਾ ਹੈ।\n\nਚਾਲੂ ਕਰਨ \'ਤੇ, ਇਹ ਡੀਵਾਈਸ Thread ਨੈੱਟਵਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਯੋਗ ਹੋ ਜਾਂਦਾ ਹੈ, ਜਿਸ ਨਾਲ Matter ਸਮਰਥਿਤ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇਸ ਫ਼ੋਨ ਰਾਹੀਂ ਕੰਟਰੋਲ ਦੀ ਆਗਿਆ ਮਿਲਦੀ ਹੈ।"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread ਤੁਹਾਡੇ ਸਮਾਰਟ ਹੋਮ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ, ਜਿਸ ਨਾਲ ਸਮਰੱਥਾ ਅਤੇ ਕਾਰਗੁਜ਼ਾਰੀ ਵਿੱਚ ਵਾਧਾ ਹੁੰਦਾ ਹੈ।\n\nਚਾਲੂ ਕਰਨ \'ਤੇ, ਇਹ ਡੀਵਾਈਸ Thread ਨੈੱਟਵਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਯੋਗ ਹੋ ਜਾਂਦਾ ਹੈ, ਜਿਸ ਨਾਲ Matter ਸਮਰਥਿਤ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇਸ ਫ਼ੋਨ ਰਾਹੀਂ ਕੰਟਰੋਲ ਕਰਨ ਦੀ ਆਗਿਆ ਮਿਲਦੀ ਹੈ।"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread ਬਾਰੇ ਹੋਰ ਜਾਣੋ"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"ਕੈਮਰਾ ਪਹੁੰਚ"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਪਹੁੰਚ"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ਸਟ੍ਰੀਮ ਸੁਣੋ"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਸੁਣਨ ਲਈ ਆਡੀਓ ਸਟ੍ਰੀਮ ਦਾ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"ਸਾਂਝਾਕਰਨ ਦੌਰਾਨ ਪਾਸਵਰਡ ਦਾ ਸੰਪਾਦਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਪਾਸਵਰਡ ਬਦਲਣ ਲਈ, ਪਹਿਲਾਂ ਆਡੀਓ ਸਾਂਝਾਕਰਨ ਨੂੰ ਬੰਦ ਕਰੋ।"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਵਿੱਚ 4-16 ਅੱਖਰ-ਚਿੰਨ੍ਹ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ ਅਤੇ ਸਿਰਫ਼ ਅੱਖਰ, ਨੰਬਰ ਅਤੇ ਚਿੰਨ੍ਹ ਹੀ ਵਰਤੋ"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR ਕੋਡ ਸਕੈਨਰ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ਕੀ ਮਦਦ ਦੀ ਲੋੜ ਹੈ?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ਸੈਟਿੰਗਾਂ ਖੋਜੋ"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"ਸੰਪਰਕ, ਸਟੋਰੇਜ, ਖਾਤਾ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ਸੰਪਰਕ ਸਟੋਰੇਜ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ਸਿਰਫ਼ ਡੀਵਾਈਸ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ਨਵੇਂ ਸੰਪਰਕਾਂ ਨੂੰ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਸਿੰਕ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ਸੰਪਰਕਾਂ ਨੂੰ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਤੁਹਾਡੇ ਖਾਤੇ ਨਾਲ ਸਿੰਕ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਖਾਤਾ ਸੈੱਟ ਕਰਨ ਵਿੱਚ ਗੜਬੜ ਹੋਈ"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ਕੁਝ ਵੀ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਵਜੋਂ ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ਸਿਰਫ਼ ਡੀਵਾਈਸ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ਡੀਵਾਈਸ ਅਤੇ %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ਸੰਪਰਕ ਕਿੱਥੇ ਰੱਖਿਅਤ ਕਰਨੇ ਹਨ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"ਖੋਜਣ ਲਈ ਚੱਕਰ ਬਣਾਓ"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਸਮੱਗਰੀ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਖੋਜਣ ਲਈ ਹੋਮ ਬਟਨ ਨੈਵੀਗੇਸ਼ਨ ਹੈਂਡਲ ਨੂੰ ਸਪਰਸ਼ ਕਰ ਕੇ ਰੱਖੋ।"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index b2634cd0bc7..cdb1ce5edf6 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Płatek śniegu"</item>
     <item msgid="7952183800501346803">"Parasol plażowy"</item>
     <item msgid="799139025758265891">"Narzędzia warsztatowe"</item>
-    <item msgid="1330084588359129896">"Namiot"</item>
+    <item msgid="8112685757657659269">"Fortepian"</item>
     <item msgid="3861584909935022342">"Klatka filmowa"</item>
     <item msgid="5827426100157335512">"Książka"</item>
     <item msgid="8585828346253128384">"Kwiat lotosu"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 44f82d3688e..06327f6b68f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sparuj nowe urządzenie"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatycznie włącz jutro"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Gdy wyłączysz Bluetooth, następnego dnia włączy się ponownie"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Sparuj prawe ucho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Sparuj lewe ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Sparuj drugie ucho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Wyłącz Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Wyłącza funkcję Bluetooth LE Audio, jeśli urządzenie obsługuje sprzętowe funkcje LE Audio"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Tryb Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Włącz podgląd interfejsu Bluetooth LE Audio Broadcast"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Włącza podgląd interfejsu LE Audio Sharing, w tym udostępniania dźwięku osobistego i transmisji prywatnej"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Pokazuj przełącznik LE Audio w Szczegółach urządzenia"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omijaj listę dozwolonych Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Używaj domyślnie technologii LE Audio, nawet jeśli urządzenie peryferyjne LE Audio nie zostało zweryfikowane jako spełniające kryteria listy dozwolonych"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Język aplikacji"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Sugerowane języki"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Wszystkie języki"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugerowane"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Wszystkie języki"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Wszystkie regiony"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Wszystkie systemy numeracji"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Język systemu"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Ustawienie domyślne systemu"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Wybór języka tej aplikacji nie jest dostępny w Ustawieniach."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Zmień"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Język %s nie jest dostępny"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Ten język nie może być używany jako język systemu. Jednak aplikacje i witryny wiedzą, że preferujesz ten język."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Szukaj"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dodaj język"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Ustawienie regionu"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Wpisz nazwę języka"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Więcej ustawień języka"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferencje regionalne"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Ustaw preferencje dotyczące jednostek i liczb"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Powiadom aplikacje o swoich preferencjach regionalnych, aby mogły dokonać personalizacji."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacje będą korzystać z preferencji regionalnych, o ile to będzie możliwe."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferencje regionalne"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Pierwszy dzień tygodnia"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferencje dotyczące liczb"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Łącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Łącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Mogą zostać naliczone opłaty za roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Ustawiaj godzinę automatycznie"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Ustawiaj automatycznie"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Po włączeniu tego przełącznika lokalizacja będzie używana do ustawiania strefy czasowej"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatyczna data i godzina"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Ustaw automatycznie za pomocą sygnałów z sieci i sieci bezprzewodowych"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatyczna strefa czasowa"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ustaw automatycznie na podstawie pobliskich sieci komórkowych"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Ustaw automatycznie według lokalizacji, jeśli jest dostępna"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Używaj ustawień domyślnych dla regionu"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Format 24-godzinny"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Godzina"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Podnieś palec, a potem przyłóż go do czytnika jeszcze raz."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Nie można użyć czytnika linii papilarnych"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Odwiedź serwis."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Odblokowywanie odciskiem palca przy wyłączonym ekranie"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Używaj odblokowywania odciskiem palca nawet przy wyłączonym ekranie"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Odblokowywanie przy wyłączonym ekranie"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Więcej ustawień bezpieczeństwa"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Blokada profilu służbowego, szyfrowanie i inne"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Szyfrowanie, dane logowania i inne"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Ustaw wzór do przestrzeni prywatnej"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Blokowanie"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ukrywanie"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potwierdź wzór przestrzeni prywatnej"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Wpisz ponownie kod PIN do przestrzeni prywatnej"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Wpisz ponownie hasło do przestrzeni prywatnej"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> odcisków palców"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodano maksymalną liczbę odcisków palców"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nie można dodać więcej odcisków palców"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Włączony"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Wyłączony"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Wyświetlacz zewnętrzny"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Wyświetlacz wbudowany"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Używaj wyświetlacza zewnętrznego"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rozdzielczość wyświetlacza"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Wyświetlacz zewnętrzny jest odłączony"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Obrót wyświetlacza lub zmiana rozdzielczości mogą spowodować zatrzymanie uruchomionych aktualnie aplikacji"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Aby można było wyświetlać odbicie lustrzane ekranu, urządzenie musi być podłączone do wyświetlacza zewnętrznego"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Więcej opcji"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Przytrzymaj i przeciągnij, aby zmienić kolejność wyświetlaczy."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Przesyłanie ekranu"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"odbicie lustrzane"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Wyświetlacz bezprzewodowy"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Sprawdź hasło i spróbuj ponownie"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Skontaktuj się z producentem urządzenia"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Sprawdź połączenie i spróbuj ponownie"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ta sieć Wi‑Fi jest teraz niedostępna"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Wystąpił problem z kodem QR. Spróbuj połączyć się w inny sposób."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Wybierz sieć"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Aby podłączyć urządzenie, wybierz sieć"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Dodać to urządzenie do sieci „<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Dowiedz się więcej o autoobracaniu"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rozdzielczość ekranu"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Wysoka rozdzielczość"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Pełna rozdzielczość"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Pełna rozdzielczość bardziej zużywa baterię. Po przełączeniu rozdzielczości niektóre aplikacje mogą wymagać ponownego uruchomienia."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksymalna rozdzielczość"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksymalna rozdzielczość bardziej zużywa baterię. Po przełączeniu rozdzielczości niektóre aplikacje mogą wymagać ponownego uruchomienia."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Wybrano"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kolory"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalne"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptacyjne"</string>
     <string name="brightness" msgid="6216871641021779698">"Poziom jasności"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Automatyczna jasność"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Informacje o automatycznej jasności"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Jasność ekranu będzie automatycznie dostosowywana do otoczenia i Twojej aktywności. Możesz ręcznie przesunąć suwak, by pomóc automatycznej jasności poznać Twoje preferencje."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Włączona"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Wył."</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Ustawienia trybu nocnego"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Tryby mogą też aktywować ciemny motyw}=1{Tryb {mode_1} aktywuje też ciemny motyw}=2{Tryby {mode_1} i {mode_2} aktywują też ciemny motyw}=3{Tryby {mode_1}, {mode_2} i {mode_3} aktywują też ciemny motyw}few{Tryb ciemny jest też włączony w przypadku trybów {mode_1}, {mode_2} i jeszcze # trybów}many{Tryb ciemny jest też włączony w przypadku trybów {mode_1}, {mode_2} i jeszcze # trybów}other{Tryb ciemny jest też włączony w przypadku trybów {mode_1}, {mode_2} i jeszcze # trybu}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Ustawienia trybów"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Jeszcze ciemniej"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Dodatkowe przyciemnienie"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Zezwalaj na przyciemnianie ekranu urządzenia bardziej niż zwykle"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Automatyczne wygaszanie"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Usługi lokalizacyjne"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Usługi lokalizacyjne"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Włącz lokalizację"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Użyj lokalizacji do określenia strefy czasowej"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Nie można ustawić strefy czasowej automatycznie"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Lokalizacja lub usługi lokalizacyjne są wyłączone"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Ustawienia lokalizacji"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Napraw to"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Anuluj"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatyczna strefa czasowa jest wyłączona"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Funkcja jest niedostępna, gdy wyłączona jest automatyczna strefa czasowa"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokalizacja może być używana do ustawienia strefy czasowej"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Jeśli lokalizacja urządzenia jest dostępna, może być używana do ustawienia strefy czasowej"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informacje prawne"</string>
     <string name="manual" msgid="3651593989906084868">"Instrukcja"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opcje"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ułatwienia dostępu"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Klawiatura fizyczna"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Klawisze z filtrem powtórzeń"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klawiatura ignoruje szybkie naciśnięcia tego samego klawisza powtórzone w ciągu <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klawiatura ignoruje szybko powtarzane naciśnięcia tego samego klawisza"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Próg klawisza z filtrem powtórzeń"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Wybierz czas, przez który klawiatura ma ignorować powtarzane naciśnięcia klawiszy"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Niestandardowa"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"wartość niestandardowa"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Klawisze powolne"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Czas wymagany do aktywacji naciśnięcia klawisza zmienia się na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Dostosowuje czas wymagany do aktywacji naciśnięcia klawisza"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Klawisze trwałe"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Naciśnij 1 klawisz, aby zyskać dostęp do skrótów, zamiast przytrzymywać kilka jednocześnie"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Klawisze sterowania myszą"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Używaj fizycznej klawiatury do sterowania myszą"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Używaj klawiszy sterowania myszą"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Używaj klawiatury do sterowania wskaźnikiem"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Odwrotne przewijanie myszą"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Przewiń w górę, aby przesunąć stronę w dół"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamień lewy i prawy przycisk"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Używaj lewego przycisku myszy jako prawego"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> – klawisze sterowania myszą"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Aby przesunąć wskaźnik myszy, naciśnij klawisz <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Aby kliknąć główny przycisk myszy, naciśnij klawisz <xliff:g id="CLICK_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Aby nacisnąć i przytrzymać główny przycisk myszy, kliknij klawisz <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Aby zwolnić główny przycisk myszy, naciśnij klawisz <xliff:g id="RELEASE_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Aby przełączyć tryb przewijania, naciśnij klawisz <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. Spowoduje to, że klawisze <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> będą przewijać widok w górę, w dół, w lewo lub w prawo"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Aby kliknąć dodatkowy przycisk myszy, naciśnij klawisz <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Skróty klawiszowe"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Lista skrótów"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klawiatura i narzędzia w profilu służbowym"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Domyślna"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad i mysz"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mysz"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Prędkość wskaźnika, gesty"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Kliknięcie przez dotknięcie"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Przeciąganie dotykiem"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kliknięcie w prawym dolnym rogu"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliknij prawy dolny róg touchpada, aby zobaczyć więcej opcji"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Szybkość wskaźnika"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Używaj kliknięcia trzema palcami"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Kolor wskaźnika"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Zmień styl wypełnienia na czarny"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Zmień styl wypełnienia na zielony"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Poznaj gesty na touchpada"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mysz, myszka, kursor, przewijanie, przesuwanie, kliknięcie prawym przyciskiem, klikanie, wskaźnik"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kliknięcie prawym przyciskiem, klikanie, dotknięcie, wybranie, naciśnięcie"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Kliknięcie środkowym przyciskiem"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Asystent uruchamiania"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Otwórz stronę główną"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Wstecz"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Wyświetlanie ostatnich aplikacji"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Przejście na ekran główny"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Przesuń 3 palcami w górę w dowolnym miejscu na touchpadzie"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Przechodzenie wstecz"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wybierz nowy klawisz jako <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ułatwienia dostępu z klawiatury fizycznej"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Klawisze trwałe, Klawisze z filtrem powtórzeń, klawisze sterowania myszą"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Powtarzaj znaki klawiszy"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Opóźnienie przed powtórzeniem"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Szybkość powtarzania"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Przytrzymaj klawisz, aby powtarzać dany znak"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Układ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Domyślny"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatyczny: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Podgląd"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opcje standardowe"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Język"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Rozmiar tekstu"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Rozmiar napisów"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Styl napisów"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opcje niestandardowe"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Kolor tła"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Dostosuj wykorzystanie energii"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Dołączone pakiety"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacje działają normalnie"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Zalecana wymiana baterii"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Bateria ma ograniczoną pojemność i wydajność ładowania. Zalecamy jej wymianę."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Niski poziom naładowania baterii"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Włącz Oszczędzanie baterii, aby wydłużyć czas pracy na baterii"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Wydłuż czas pracy na baterii"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odłączyć tę sieć VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odłącz"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Wersja"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Wersja <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zapomnij VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Zastąpić obecną sieć VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ustawić stały VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"„Od 9:00 do 17:00 w ciągu tygodnia”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Wydarzenia w kalendarzu"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Tryb {mode_1} jest aktywny}=2{Tryby {mode_1} i {mode_2} są aktywne}=3{Tryby {mode_1}, {mode_2} i {mode_3} są aktywne}few{Tryby {mode_1}, {mode_2} i # inne są aktywne}many{Tryby {mode_1}, {mode_2} i # innych są aktywne}other{Tryby {mode_1}, {mode_2} i # innego są aktywne}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 tryb może włączać się automatycznie}few{# tryby mogą włączać się automatycznie}many{# trybów może włączać się automatycznie}other{# trybu może włączać się automatycznie}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Nie przeszkadzać}=1{{mode_1}}=2{{mode_1}, {mode_2}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"WŁ."</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nie ustawiono"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Wyłączony"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Powiadomienia"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Czas trwania"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Wiadomości, wydarzenia i przypomnienia"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inni mogli do Ciebie zadzwonić."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gotowe"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ustawienia"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Brak wizualnego i dźwiękowego sygnalizowania powiadomień"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Brak dźwięku powiadomień"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem. Dozwolone są połączenia od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktualne ustawienie)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Zmienić ustawienia trybu Nie przeszkadzać?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Dźwięki w profilu służbowym"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Używaj dźwięków z profilu osobistego"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Używaj takich samych dźwięków w profilu służbowym jak w profilu osobistym"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Po odblokowaniu wyświetl ostatnio używany ekran. Na ekranie blokady nie będzie powiadomień. Aby je zobaczyć, przesuń palcem z góry na dół."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran blokady, Pomiń, Pomijaj"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Gdy profil służbowy jest zablokowany"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalne powiadomienia na ekranie blokady"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Pokaż mniej powiadomień na ekranie blokady"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Na ekranie blokady pokazuj tylko nowe powiadomienia"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automatycznie usuwaj już wyświetlone powiadomienia z ekranu blokady"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Powiadomienia na ekranie blokady"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Pokazuj rozmowy, domyślne i ciche"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Pokazuj rozmowy, domyślne i ciche"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Pokazuj w całości powiadomienia związane z pracą"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ukryj poufne informacje związane z pracą"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Jak mają pokazywać się powiadomienia z profilu, gdy urządzenie jest zablokowane?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Powiadomienia z profilu"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Powiadomienia"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Powiadomienia z aplikacji"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Gdy w krótkim czasie otrzymasz wiele powiadomień, urządzenie zmniejszy głośność i ograniczy liczbę alertów przez maksymalnie 2 minuty. Nie wpłynie to na połączenia, alarmy ani rozmowy priorytetowe. \n\nPowiadomienia otrzymane w tym czasie można zobaczyć po przesunięciu palcem z góry ekranu w dół."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Zastosuj do profili służbowych"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Zastosuj w aplikacjach profilu służbowego"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupowanie powiadomień"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Wł."</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Wył."</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Grupuj powiadomienia"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Powiadomienia o podobnych tematach będą wyciszane i grupowane, żeby Ci nie przeszkadzać. Grupowanie powiadomień zastąpi ustawienia poszczególnych aplikacji."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usługi pomocnicze rzeczywistości wirtualnej"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Żadne zainstalowane aplikacje nie prosiły o uruchomienie w trybie usług pomocniczych rzeczywistości wirtualnej."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Zezwalasz usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do usług VR?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"rozmowy priorytetowe"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Ustawienia rozmów"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Osoby, które mogą się kontaktować mimo trybu Nie przeszkadzać"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Nawet jeśli aplikacje służące do dzwonienia lub wysyłania wiadomości nie będą mogły wysyłać Ci powiadomień, osoby, które tutaj wybierzesz, będą mogły się z Tobą skontaktować za pomocą tych aplikacji."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Połączenia"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Ustawienia kontaktów"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Ustawienia kontaktów oznaczonych gwiazdką"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nikt"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Brak"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmy"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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{Aplikacje {app_1}, {app_2} i {app_3} mogą ignorować tryb Nie przeszkadzać}few{Aplikacje {app_1}, {app_2} i jeszcze # inne mogą ignorować tryb Nie przeszkadzać}many{Aplikacje {app_1}, {app_2} i jeszcze # innych mogą ignorować tryb Nie przeszkadzać}other{Aplikacje {app_1}, {app_2} i jeszcze inne (#) mogą ignorować tryb Nie przeszkadzać}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (służbowa)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Obliczam…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Ustawienia aplikacji"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Zezwól na zastępowanie przez aplikacje"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacje, które mogą ignorować tryb Nie przeszkadzać"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Utwórz tryb"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Tryb niestandardowy"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nazwa trybu"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Nazwa trybu nie może być pusta"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Wybierz ikonę"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Wydarzenia w kalendarzu"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutyna wieczorna"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Podczas jazdy"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Powiadomienia pełnoekranowe"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Zezwalaj na powiadomienia pełnoekranowe z tej aplikacji"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Zezwalaj na wyświetlanie przez tę aplikację powiadomień zajmujących cały ekran, gdy urządzenie jest zablokowane. Aplikacje mogą używać tych uprawnień do powiadamiania o alarmach, połączeniach przychodzących i innych pilnych sprawach."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Zapisuj ustawienia systemowe"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Zezwalaj tej aplikacji na modyfikowanie ustawień systemu w Twoim imieniu"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"To uprawnienie umożliwia aplikacji modyfikowanie podstawowych ustawień systemu."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacje do zarządzania multimediami"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Zezwalaj na zarządzanie multimediami przez aplikację"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ta aplikacja może bez pytania modyfikować lub usuwać pliki multimedialne utworzone w innych aplikacjach, jeśli ma takie uprawnienia. Aplikacja wymaga dostępu do plików i multimediów."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gesty"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Szybko otwieraj aparat"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Aby szybko uruchomić aparat, naciśnij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Odwracaj aparat do selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Tryb nawigacji"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Przesyłanie wiadomości przez satelitę"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Wysyłanie i odbieranie SMS-ów przez satelitę. Twoje konto obejmuje tę funkcję."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Wysyłanie i odbieranie SMS-ów przez satelitę. Twoje konto tego nie obejmuje."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Przesyłanie wiadomości przez satelitę"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Informacje o przesyłaniu wiadomości przez satelitę"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"przesyłanie wiadomości przez satelitę, łączność satelitarna"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> – informacje"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Możesz wymieniać wiadomości przez satelitę w ramach odpowiedniego konta u operatora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Twój abonament u operatora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Twoje konto obejmuje funkcję przesyłania wiadomości przez satelitę"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Twoje konto obejmuje funkcję przesyłania wiadomości"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Twoje konto nie obejmuje funkcji przesyłania wiadomości przez satelitę"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Więcej informacji"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Jak to działa"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Twój telefon automatycznie połączy się z satelitą. Aby uzyskać najlepszą jakość połączenia, stań w miejscu, w którym nic nie zasłania widoku nieba."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Gdy Twój telefon połączy się z satelitą"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Możesz wysyłać SMS-y do dowolnego adresata, w tym również do służb ratunkowych. Twój telefon ponownie połączy się z siecią komórkową, gdy będzie ona dostępna."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Przesyłanie wiadomości przez satelitę może zająć dłuższą chwilę. Funkcja jest dostępna wyłącznie na niektórych obszarach. Pogoda i inne czynniki mogą wpływać na Twoje połączenie satelitarne. Połączenia przez satelitę są niedostępne. Połączenia alarmowe mogą nadal być nawiązywane.\n\nMoże upłynąć trochę czasu, zanim zmiany dotyczące konta będą widoczne w Ustawieniach. Aby uzyskać szczegółowe informacje, skontaktuj się z operatorem."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Więcej informacji o przesyłaniu wiadomości przez satelitę"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> może zająć dłuższą chwilę. Funkcja jest dostępna wyłącznie na niektórych obszarach. Pogoda i inne czynniki mogą wpływać na Twoje połączenie satelitarne. Połączenia przez satelitę są niedostępne. Połączenia alarmowe mogą nadal być nawiązywane.\n\nMoże upłynąć trochę czasu, zanim zmiany dotyczące konta będą widoczne w Ustawieniach. Skontaktuj się z operatorem <xliff:g id="CARRIER_NAME">%1$s</xliff:g> i dowiedz się więcej."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> – więcej informacji"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nie można włączyć funkcji <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Aby włączyć funkcję <xliff:g id="FUNCTION">%1$s</xliff:g>, najpierw zakończ połączenie satelitarne"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Łączność satelitarna"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Łączność satelitarna"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"łączność satelitarna"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"przesyłanie wiadomości przez satelitę"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Twoje konto obejmuje wykorzystanie danych"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satelitarne połączenie alarmowe"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Wysyłaj wiadomości do służb ratunkowych, gdy nie możesz połączyć się z siecią komórkową lub Wi‑Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satelitarne połączenie alarmowe, połączenie alarmowe"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Informacje o satelitarnych połączeniach alarmowych"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Możesz wysyłać wiadomości do służb ratunkowych i udostępniać swoją lokalizację bez dostępu do sieci komórkowej lub Wi-Fi. Ta usługa może być niedostępna w niektórych lokalizacjach i określonych okolicznościach."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Zadzwoń lub wyślij SMS-a do służb ratunkowych"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Odpowiedz na pytania dotyczące sytuacji alarmowej"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Postępuj zgodnie z instrukcjami, aby połączyć się z satelitą"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Jeśli nie ma sygnału sieci komórkowej, zobaczysz opcję użycia satelitarnego połączenia alarmowego"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Wysyłaj odpowiedzi do służb ratunkowych, które udzielą odpowiedniej pomocy"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Po nawiązaniu połączenia możesz wysyłać wiadomości do służb ratunkowych"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Zobacz prezentację"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Gdy łączysz się ze służbami ratunkowymi przez satelitę, Twoje imię i nazwisko, adres e-mail, numer telefonu, lokalizacja, informacje o urządzeniu (IMEI, język, model, poziom naładowania baterii) i dane kontaktów alarmowych są udostępniane służbom ratunkowym i dostawcom usług satelitarnych. \n\nAby można było korzystać z satelitarnego połączenia alarmowego, Wiadomości Google muszą być domyślną aplikacją do SMS-ów. \n\nJeśli automatyczny wybór sieci jest wyłączony, zostanie włączony, a urządzenie będzie automatycznie łączyć się z dowolną siecią."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Ustawienia udostępniania"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Kontakty alarmowe"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Twoje konto Google."</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Sprawdź lub zaktualizuj informacje, które zostaną udostępniane służbom ratunkowym"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nazwy punktów dostępu"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niedostępne po połączeniu z siecią <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Korzystasz z ogólnego trybu strony 16 KB. W tym trybie nie można zagwarantować integralności oprogramowania. Kiedy program rozruchowy będzie odblokowany, dane zapisane na telefonie mogą być zagrożone. W tych trybach niektóre funkcje będą wyłączone, a część aplikacji może nie działać. Aby wrócić do trybu produkcyjnego, musisz przełączyć się z powrotem na tryb 4 KB i zablokować program rozruchowy urządzenia. Spowoduje to ponowne zresetowanie urządzenia i przywrócenie na nim ustawień produkcyjnych. Gdy na urządzeniu uruchomi się Android, wyłącz zdjęcie blokady OEM w Opcjach programisty. Jeśli nie uda się uruchomić Androida lub będzie on działać niestabilnie, sflashuj na urządzeniu najnowszy obraz fabryczny pobrany ze strony &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; lub użyj narzędzia &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; i wybierz kolejno opcje „Wyczyść pamięć urządzenia”, „Zablokuj program rozruchowy” i „Wymuś flashowanie wszystkich partycji”."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Ogólny tryb strony 16 kB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Więcej informacji"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Uruchamiaj aplikację w trybie zgodności z rozmiarem strony"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Obsługiwanie zgłaszania błędów"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Określa, która aplikacja ma obsługiwać skrót do zgłaszania błędów na urządzeniu."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Osobista"</string>
@@ -5196,8 +5319,8 @@
     <string name="reboot_dialog_enable_freeform_support" msgid="3697462756493543645">"Włączenie obsługi okien o dowolnym rozmiarze wymaga ponownego uruchomienia."</string>
     <string name="reboot_dialog_override_desktop_mode" msgid="7480950772574354130">"Aktualizacja dostępności dowolnego rozmiaru okien wymaga ponownego uruchomienia."</string>
     <string name="reboot_dialog_enable_desktop_mode_on_secondary_display" msgid="1153621881052401924">"Włączenie dowolnego rozmiaru okien na dodatkowych ekranach wymaga ponownego uruchomienia."</string>
-    <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Uruchom ponownie teraz"</string>
-    <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Uruchom ponownie później"</string>
+    <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Uruchom teraz"</string>
+    <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Uruchom później"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Dźwięk przestrzenny"</string>
     <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"Jeszcze lepsza jakość dźwięku z kompatybilnych multimediów"</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"Monitorowanie ruchów głowy"</string>
@@ -5435,7 +5558,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Posłuchaj strumienia"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Zeskanuj kod QR strumienia audio, aby słuchać na urządzeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Podczas udostępniania nie można edytować hasła. Aby je zmienić, najpierw wyłącz udostępnianie dźwięku."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Hasło musi zawierać od 4 do 16 znaków i zawierać tylko litery, cyfry i symbole"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Skaner kodów QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Potrzebujesz pomocy?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Wyszukaj w Ustawieniach"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakty, spis, konto"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Spis kontaktów"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tylko urządzenie"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nowe kontakty nie będą synchronizowane z kontem"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty będą domyślnie zapisywane na urządzeniu i synchronizowane z kontem"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Podczas ustawiania konta domyślnego wystąpił błąd"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nie ustawiono konta domyślnego"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tylko urządzenie"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Urządzenie i %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Na początek dodaj konto"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdzie zapisać kontakty"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zaznacz, aby wyszukać"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Aby wyszukać to, co jest widoczne na ekranie, naciśnij i przytrzymaj przycisk ekranu głównego lub uchwyt nawigacyjny."</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 6822b226307..35df4702446 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Floco de neve"</item>
     <item msgid="7952183800501346803">"Guarda-sol"</item>
     <item msgid="799139025758265891">"Ferramentas"</item>
-    <item msgid="1330084588359129896">"Barraca"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rolo de filme"</item>
     <item msgid="5827426100157335512">"Livro"</item>
     <item msgid="8585828346253128384">"Flor de lótus"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 94208e15273..47594c42151 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parear novo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Se você desativar o Bluetooth, ele será reativado no dia seguinte"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Parear lado direito"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Parear lado esquerdo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pareie o outro lado"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Desativar Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Desativa o recurso de Bluetooth LE Audio caso o hardware do dispositivo tenha essa opção."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Ativar a visualização da interface de transmissão de Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ativa a visualização da interface de compartilhamento de LE Audio, incluindo o compartilhamento de áudio pessoal e a transmissão particular"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Mostrar a chave do Bluetooth LE Audio nos Detalhes do dispositivo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ignorar lista de permissões do Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usar o áudio de baixo consumo (LE Audio) por padrão, mesmo que o periférico dele não tenha sido verificado para atender aos critérios da lista de permissões."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma do app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas sugeridos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos os idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugestões"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos os idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas as regiões"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos os sistemas de numeração"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma do sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Padrão do sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"A seleção de idioma para este app não está disponível nas configurações."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Mudar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s indisponível"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Esse idioma não pode ser usado para o sistema, mas os apps e sites vão identificar sua preferência."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pesquisa"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Adicionar um idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferência de região"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Digite o nome do idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Mais configurações de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferências regionais"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Definir preferências de número e unidades"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permita que os apps saibam suas preferências regionais para personalizar sua experiência."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Os apps vão usar suas preferências regionais quando possível."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferências regionais"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primeiro dia da semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferências de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Sujeito a cobrança por uso de roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Definir automaticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"A localização vai ser usada para definir o fuso horário quando esta opção estiver ativada"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente usando sua rede e sinais sem fio"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de você"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Definir automaticamente usando o local do dispositivo, se disponível"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Horário"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levante o dedo e depois toque no sensor novamente"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Não foi possível usar o sensor de impressão digital"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Entre em contato com uma assistência técnica."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueio por impressão digital com a tela desligada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use o Desbloqueio por impressão digital mesmo com a tela desligada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Tela desligada, Desbloqueio"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Mais configurações de segurança"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueio do perfil de trabalho, criptografia e muito mais"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Criptografia, credenciais e muito mais"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Defina um padrão para seu espaço privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirme o padrão do espaço privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Digite o PIN do espaço privado mais uma vez"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Digite a senha do espaço privado mais uma vez"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Não é possível adicionar mais impressões digitais"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Ligada"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desligada"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Tela externa"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar tela externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolução da tela"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"A tela externa está desconectada"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Mudar a rotação ou a resolução pode interromper qualquer app que está sendo executado"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"O dispositivo precisa estar conectado a uma tela externa para espelhar a exibição"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Mais opções"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Pressione e arraste para reorganizar as telas."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Verifique a senha e tente novamente"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Verifique a conexão e tente novamente"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta rede Wi-Fi está indisponível no momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ocorreu um problema com o QR code. Tente se conectar de outra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Escolher rede"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Para conectar seu dispositivo, escolha uma rede"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Adicionar este dispositivo a “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saiba mais sobre o giro automático"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolução da tela"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolução"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolução máxima"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"A resolução máxima consome mais bateria. A troca de resolução pode fazer com que alguns apps sejam reiniciados."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selecionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptáveis"</string>
     <string name="brightness" msgid="6216871641021779698">"Nível de brilho"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brilho adaptável"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Sobre o brilho adaptável"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"O brilho da tela será ajustado automaticamente ao seu ambiente e às suas atividades. Mova o controle deslizante para ajudar o brilho adaptável a memorizar suas preferências."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Ativado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desativado"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Configurações do Modo hora de dormir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Alguns modos também ativam o tema escuro}=1{O modo {mode_1} também ativa o tema escuro}=2{Os modos {mode_1} e {mode_2} também ativam o tema escuro}=3{Os modos {mode_1}, {mode_2} e {mode_3} também ativam o tema escuro}one{Os modos {mode_1}, {mode_2} e mais # também ativam o tema escuro}other{Os modos {mode_1}, {mode_2} e mais # também ativam o tema escuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Configurações de modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ainda mais escuro"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Escurecer a tela"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permitir que o dispositivo fique mais escuro do que o normal"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo limite da tela"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Serviços de localização"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usar a localização"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar a localização para determinar o fuso horário"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Não é possível definir o fuso horário automaticamente"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Localização ou Serviços de localização desativados"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Configurações de localização"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corrigir"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Indisponível quando o fuso horário automático está desativado"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"A localização pode ser usada para definir o fuso horário"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Se a localização do dispositivo estiver disponível, ela poderá ser usada para definir seu fuso horário"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informações legais"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opções"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Acessibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Seletor de layout do teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtragem"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla dentro de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limite da tecla de filtragem"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolha por quanto tempo o teclado ignora pressionamentos repetidos"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado para <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas de aderência"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pressione uma tecla por vez para usar atalhos em vez de manter as teclas pressionadas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do mouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use o teclado físico para controlar o mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas do mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Rolagem reversa do mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Deslize para cima para descer na página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar os botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do mouse como o direito"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas do mouse para <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use as teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover o ponteiro do mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use a tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para clicar no botão principal do mouse"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use a tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para tocar e pressionar o botão principal do mouse"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use a tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar o botão principal do mouse"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use a tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para trocar o modo de rolagem. Isso vai fazer com que as teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> rolem a visualização para cima, para baixo, para a esquerda ou para a direita"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use a tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para clicar no botão secundário do mouse"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas de perfil de trabalho"</string>
@@ -1953,6 +2000,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Padrão"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad e mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidade do cursor, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tocar para clicar"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Arrastar com toque"</string>
@@ -1964,6 +2012,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clicar no canto inferior direito"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Clique no canto inferior direito do touchpad para mais opções"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidade do cursor"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usar o toque com três dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Cor do ponteiro"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Mudar preenchimento para preto"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Mudar preenchimento para verde"</string>
@@ -1978,6 +2027,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Aprender gestos do touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, rolar, deslizar, clicar com o botão direito do mouse, clicar, ponteiro"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"clicar com o botão direito do mouse, tocar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clicar no botão do meio"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar Assistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ir para a página inicial"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Voltar"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver os apps recentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ir para a tela inicial"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Deslize para cima com três dedos em qualquer lugar do touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Voltar"</string>
@@ -2014,6 +2068,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas de aderência, teclas de filtragem, teclas do mouse"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetir teclas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Atraso antes da repetição"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Taxa de repetição"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pressione e segure uma tecla para repetir o caractere dela até que seja liberada"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layout do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automático: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2476,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Visualização"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamanho do texto"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho da legenda"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo da legenda"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções de personalização"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor do plano de fundo"</string>
@@ -2545,6 +2603,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pacotes incluídos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Os apps estão funcionando normalmente"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"É recomendável trocar a bateria"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"A capacidade e o desempenho de carregamento estão reduzidos. Recomendamos a troca da bateria."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nível da bateria baixo"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Ativar a Economia de bateria para prolongar a duração da carga"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Melhorar a duração da bateria"</string>
@@ -2962,6 +3022,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Configurar VPN sempre ativa?"</string>
@@ -3384,7 +3445,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Das 9h às 17h em dias de semana\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos da agenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} está ativo}=2{{mode_1} e {mode_2} estão ativos}=3{{mode_1}, {mode_2} e {mode_3} estão ativos}one{{mode_1}, {mode_2} e mais # modo estão ativos}other{{mode_1}, {mode_2} e mais # modos estão ativos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modo pode ser ativado automaticamente}one{# modo pode ser ativado automaticamente}other{# modos podem ser ativados automaticamente}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Não perturbe}=1{{mode_1}}=2{{mode_1} e {mode_2}}one{{mode_1}, {mode_2} e {mode_3}}other{{mode_1}, {mode_2} e {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ATIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Não definido"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desativado"</string>
@@ -3509,15 +3570,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ok"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificações"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duração"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensagens, eventos e lembretes"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Quando o Não perturbe estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Concluído"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Configurações"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ocultar avisos visuais ou sonoros de notificações"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Desativar som de notificações"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Você não verá nem ouvirá notificações. As chamadas de contatos marcados com estrela e de autores de chamadas repetidas serão permitidas."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Configuração atual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Alterar as configurações de notificação do \"Não perturbe\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usar sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usar os mesmos sons que o perfil pessoal"</string>
@@ -3586,8 +3638,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Após o desbloqueio, a última tela usada será mostrada. Deslize de cima para baixo para conferir as notificações, que não vão aparecer na tela de bloqueio."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Quando o perfil está bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Notificações minimalistas na tela de bloqueio"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostrar menos notificações na tela de bloqueio"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar somente notificações novas na tela de bloqueio"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Remover automaticamente da tela de bloqueio as notificações já vistas"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificações na tela de bloqueio"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostrar conversas, padrão e silenciosas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas, padrão e silenciosas"</string>
@@ -3605,6 +3667,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar todo o conteúdo de notificação de trabalho"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ocultar conteúdo de trabalho confidencial"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Como você quer que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificações do perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificações"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificações de apps"</string>
@@ -3695,6 +3765,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Se chegarem muitas notificações em um curto período, o dispositivo vai diminuir o volume e minimizar alertas por até 2 minutos. Isso não afeta ligações, alarmes e conversas prioritárias. \n\nAs notificações recebidas durante a atenuação podem ser encontradas ao deslizar de cima para baixo na tela."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar a perfis de trabalho"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplicar em apps do perfil de trabalho"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificações agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Ativado"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desativado"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usar agrupamento de notificações"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"As notificações com temas semelhantes serão silenciadas e agrupadas para oferecer uma experiência mais discreta. O agrupamento substitui as configurações de notificação de um app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviço de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3878,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Configurações de conversas"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mesmo se os apps de mensagens ou chamadas não puderem notificar você, as pessoas escolhidas aqui ainda vão poder entrar em contato por esses apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
@@ -3826,6 +3902,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Configurações de contatos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Configurações de contatos marcados com estrela"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nenhuma"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3933,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (trabalho)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculando…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Configurações dos apps"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que apps modifiquem o \"Não perturbe\""</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps que podem fazer interrupções"</string>
@@ -3897,6 +3976,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Criar um modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome do modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"O nome do modo não pode ficar em branco"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Escolha um ícone"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos da agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rotina Hora de dormir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Ao dirigir"</string>
@@ -4151,6 +4232,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificações em tela cheia"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir que esse app mostre notificações em tela cheia"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permita que o app mostre notificações que ocupam a tela inteira quando o dispositivo estiver bloqueado. Os apps poderão usar essa permissão para destacar alarmes, ligações recebidas ou outras notificações urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Gravar preferências do sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permitir que este app mude as preferências do sistema por você"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Com essa permissão, um app pode mudar as preferências principais do sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps de gerenciamento de mídia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir que o app gerencie arquivos de mídia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Se você permitir, esse app poderá modificar ou excluir arquivos de mídia criados com outros apps sem perguntar para você. É necessário autorizar o acesso do app aos arquivos e ao conteúdo de mídia."</string>
@@ -4396,6 +4480,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir a câmera rapidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Virar câmera para tirar selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegação"</string>
@@ -4793,11 +4891,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensagem via satélite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Enviar e receber mensagens de texto via satélite. Incluído na sua conta."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Enviar e receber mensagens de texto via satélite. Recurso não incluído na sua conta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensagem via satélite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Sobre mensagens via satélite"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"É possível enviar e receber mensagens de texto via satélite como parte de uma conta qualificada da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Seu plano da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Mensagens via satélite estão incluídas na sua conta"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Mensagens via satélite não estão incluídas na sua conta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saiba mais"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Como funciona"</string>
@@ -4805,10 +4906,56 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Seu smartphone vai se conectar automaticamente a um satélite. Para conseguir a melhor conexão, vá até um local com céu aberto."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Depois que o smartphone se conectar a um satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"É possível enviar mensagens de texto para qualquer pessoa, inclusive para serviços de emergência. O smartphone vai se reconectar a uma rede móvel quando estiver disponível."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"As mensagens via satélite podem demorar mais e estão disponíveis apenas em algumas áreas. O clima e determinadas estruturas podem afetar a conexão por satélite. A ligação via satélite não está disponível. Talvez chamadas de emergência ainda possam ser feitas.\n\nPode levar algum tempo para mudanças na conta aparecerem nas Configurações. Entre em contato com sua operadora para saber mais."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mais informações sobre mensagens via satélite"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Não é possível ativar o <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para ativar o <xliff:g id="FUNCTION">%1$s</xliff:g>, primeiro encerre a conexão via satélite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectividade via satélite"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomes dos pontos de acesso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5142,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Você está no modo agnóstico de páginas de 16 KB. A integridade do software não é garantida nesse modo, e todos os dados armazenados no smartphone enquanto o carregador de inicialização está desbloqueado podem ser expostos a riscos. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para entrar de novo no modo de produção, volte para o modo 4 KB e, em seguida, bloqueie o carregador de inicialização no dispositivo. Essa ação vai fazer a redefinição de fábrica do dispositivo novamente. Depois que o dispositivo for inicializado corretamente no Android, desative o desbloqueio de OEM nas Opções do desenvolvedor. Se o dispositivo não for inicializado no Android ou estiver instável, atualize-o novamente com as imagens de fábrica mais recentes especificadas em &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecione \"Excluir o dispositivo permanentemente\", \"Bloquear carregador de inicialização\" e \"Forçar a atualização de todas as partições\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo agnóstico de páginas de 16 KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Leia mais"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Executar app com o modo de compatibilidade de tamanho de página"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gerenciador de relatórios de bugs"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina qual app gerencia o atalho para o Relatório de bug no dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Pessoais"</string>
@@ -5161,7 +5311,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB indisponível no local atual"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Usar o Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"O protocolo Thread ajuda a conectar seus dispositivos de casa inteligente, aumentando a eficácia e o desempenho deles.\n\nQuando o recurso está ativado, este dispositivo fica qualificado para ingressar em uma rede Thread, permitindo que você controle dispositivos com suporte do Matter por este smartphone."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"O protocolo Thread ajuda a conectar seus dispositivos de casa inteligente, aumentando a eficácia e o desempenho deles.\n\nQuando o recurso está ativado, este aparelho pode ingressar em uma rede Thread, permitindo que você controle dispositivos compatíveis com Matter por este smartphone."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Saiba mais sobre o Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Acesso à câmera"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Acesso ao microfone"</string>
@@ -5433,7 +5583,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ouvir o stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Use o QR code de um stream de áudio para ouvir com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Não é possível editar a senha enquanto compartilha. Para mudar a senha, primeiro desligue o compartilhamento de áudio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"A senha precisa ter de 4 a 16 caracteres e usar apenas letras, números e símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Leitor de QR code"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Precisa de ajuda?"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"Pesquisar nas configurações"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatos, armazenamento, conta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Armazenamento de contatos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Somente dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contatos não serão sincronizados com uma conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contatos serão salvos no seu dispositivo e sincronizados com sua conta por padrão"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao definir a conta padrão"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta padrão configurada"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Somente dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde salvar contatos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circule para pesquisar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Toque no botão home ou na alça de navegação e pressione para pesquisar usando o conteúdo na tela."</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 15a519ea29e..2b2b5964b82 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Floco de neve"</item>
     <item msgid="7952183800501346803">"Guarda-sol"</item>
     <item msgid="799139025758265891">"Ferramentas de oficina"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Bobina de filme"</item>
     <item msgid="5827426100157335512">"Livro"</item>
     <item msgid="8585828346253128384">"Flor de lótus"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3d5b6e8ea5a..581f17d636a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sincronizar novo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Se desativar o Bluetooth, este é reativado no dia seguinte"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Sincr. ouv. direito"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Sincr. ouv. esquerdo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Sincroniz. o outro ouvido"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Desativar Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Desativa a funcionalidade Bluetooth LE Audio se o dispositivo suportar as capacidades de hardware LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Ativar a pré-visualização da IU de transmissão do Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ativa a pré-visualização da IU de partilha do LE Audio, incluindo a partilha de áudio pessoal e a transmissão privada"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Ver botão LE Audio nos Detalhes"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Contornar lista de autorizações do Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Use o LE Audio por predefinição, mesmo se o cumprimento dos critérios da lista de autorizações pelo periférico com LE Audio não tiver sido validado."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma da app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas sugeridos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos os idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugestões"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos os idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas as regiões"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos os sistemas de numeração"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma do sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Predefinição do sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"A seleção do idioma para esta app não está disponível a partir das Definições."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Alterar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s não está disponível"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Este idioma não pode ser usado como um idioma do sistema, mas indicou às apps e aos Websites que prefere este idioma."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pesquisa"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Adicione um idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferência de região"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Introduza o idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Mais definições de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferências regionais"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Defina preferências de números e unidades"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permita que as apps conheçam as suas preferências regionais para poderem personalizar a sua experiência."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"As apps vão usar as suas preferências regionais sempre que possível."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferências regionais"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primeiro dia da semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferências de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Podem aplicar-se custos de roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Definir a hora automaticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Definir automaticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"A localização vai ser usada para definir o fuso horário quando este botão estiver ativado"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente com base na sua rede e sinais sem fios"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de si"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Definir automaticamente com base na localização do dispositivo, se disponível"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar local predefinido"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levante o dedo e toque no sensor novamente"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Não é possível usar o sensor de impressões digitais"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Visite um fornecedor de serviços de reparação."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueio por impressão digital com o ecrã desligado"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use o Desbloqueio por impressão digital mesmo quando o ecrã está desligado"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ecrã desligado, Desbloquear"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Mais definições de segurança"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueio do perfil de trabalho, encriptação e muito mais"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encriptação, credenciais e muito mais"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Defina um padrão para o espaço privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirme o padrão do espaço privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Introduza novamente o PIN do espaço privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Reintroduza a palavra-passe do espaço privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Não é possível adicionar mais impressões digitais"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Ativado"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desativado"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ecrã externo"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ecrã integrado"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar ecrã externo"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolução do ecrã"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"O ecrã externo está desligado"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Alterar a rotação ou a resolução pode parar as apps que estejam em execução"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"O seu dispositivo tem de estar ligado a um ecrã externo para espelhar o seu ecrã"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Mais opções"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Toque sem soltar e arraste para reorganizar os ecrãs."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelhar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar display sem fios"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Verifique a palavra-passe e tente novamente."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contacte o fabricante do dispositivo."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Verifique a ligação e tente novamente."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta rede Wi-Fi não está disponível de momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Existe um problema com este código QR. Experimente ligar-se de outra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Escolha a rede"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Para ligar o seu dispositivo, escolha uma rede"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Quer adicionar este dispositivo a “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saiba mais sobre a rotação automática"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolução de ecrã"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolução"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolução total"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"A resolução total consome mais bateria. Se mudar a resolução, algumas apps podem ser reiniciadas."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Resolução máxima"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"A resolução máxima consome mais bateria. Se mudar a resolução, algumas apps podem ser reiniciadas."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selecionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptável"</string>
     <string name="brightness" msgid="6216871641021779698">"Nível de luminosidade"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Luminosidade adaptável"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Acerca da luminosidade adaptável"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"A luminosidade do ecrã vai ajustar-se automaticamente ao ambiente e às atividades. Pode mover o controlo de deslize manualmente para permitir que a luminosidade adaptável aprenda as suas preferências."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Ativada"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desativada"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Definições do Modo de hora de dormir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Os modos também podem ativar o tema escuro}=1{{mode_1} também ativa o tema escuro}=2{{mode_1} e {mode_2} também ativam o tema escuro}=3{{mode_1}, {mode_2} e {mode_3} também ativam o tema escuro}other{{mode_1}, {mode_2} e mais # também ativam o tema escuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Definições de modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Escurecer ainda mais"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Escurecimento extra"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permita que o dispositivo fique mais escuro do que o habitual"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Limite de tempo do ecrã"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permita que as apps 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="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Serviços de localização"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usar localização"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar localização para fuso horário"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Impossível definir o fuso horário automaticamente"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Localização ou Serviços de localização desativados"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Definições de localização"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Resolver este problema"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Indisponível quando o fuso horário automático está desativado"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"A localização pode ser usada para definir o fuso horário"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Se a localização do dispositivo estiver disponível, pode ser usada para definir o fuso horário"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver informações jurídicas, estado, versão de software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informações legais"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opções"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Acessibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Seletor de esquema de tecl. físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Evitar pressão repetida"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"O teclado ignora os toques rápidos repetidos da mesma tecla no espaço de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignora as pressões rápidas repetidas da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limiar para evitar pressão repetida"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolha o tempo durante o qual o teclado ignora as pressões repetidas das teclas"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta o tempo que demora a ativação de uma tecla pressionada para <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta o tempo que demora a ativação de uma tecla pressionada"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas aderentes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Prima uma tecla de cada vez para os atalhos em vez de manter as teclas premidas em simultâneo"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do rato"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use o teclado físico para controlar o rato"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas do rato"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Deslocamento inverso do rato"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desloque para cima para mover a página para baixo"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do rato como o botão direito"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas do rato de <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use as teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover o ponteiro do rato"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use a tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para clicar no botão principal do rato"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use a tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para premir sem soltar o botão principal do rato"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use a tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar o botão principal do rato"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use a tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para ativar/desativar o modo de deslocamento. Isto faz com que as teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> desloquem a vista para cima, para baixo, para a esquerda ou para a direita"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use a tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para clicar no botão secundário do rato"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostre a lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas do perfil de trabalho"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predefinição"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad e rato"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Rato"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidade do ponteiro, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tocar para clicar"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Arrastar através do toque"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clicar no canto inferior direito"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Clique no canto inferior direito do touchpad para mais opções"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidade do ponteiro"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usar toque com 3 dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Cor do ponteiro"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Alt. est. preenc. ponteiro p/ preto"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Alt. est. preenc. ponteiro p/ verde"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Aprender gestos do touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, rato, cursor, deslocar, deslizar, clicar com o botão direito do rato, clicar, ponteiro"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"clique com o botão direito do rato, toque"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clicar no meio"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar Assistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Aceder ao ecrã principal"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Voltar"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver apps recentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Aceder ao ecrã principal"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Deslize para cima com 3 dedos em qualquer parte do touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Voltar"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas aderentes, teclas sem repetição, teclas do rato"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetir teclas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Atraso antes da repetição"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Taxa de repetição"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mantenha uma tecla premida para repetir o respetivo caráter até a tecla ser libertada"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Esquema do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinição"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automático: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pré-visualizar"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamanho do texto"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho das legendas"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo das legendas"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor de fundo"</string>
@@ -2520,8 +2575,8 @@
     <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>
     <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Faça a gestão da utilização da bateria"</string>
-    <string name="manager_battery_usage_allow_background_usage_settings_title" msgid="8150026934645052635">"Permitir a utilização em segundo plano"</string>
-    <string name="manager_battery_usage_allow_background_usage_title" msgid="6294649996820358852">"Permitir a utilização em segundo plano"</string>
+    <string name="manager_battery_usage_allow_background_usage_settings_title" msgid="8150026934645052635">"Permitir utilização em segundo plano"</string>
+    <string name="manager_battery_usage_allow_background_usage_title" msgid="6294649996820358852">"Permitir utilização em segundo plano"</string>
     <string name="manager_battery_usage_allow_background_usage_summary" msgid="8021153755201340819">"Ative para atualizações em tempo real, desative para poupar bateria"</string>
     <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sem restrições"</string>
     <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Otimizada"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar utilização de energia"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pacotes incluídos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"As apps estão a ser executadas normalmente"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Substituição da bateria recomendada"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"A capacidade da bateria e o desempenho de carregamento estão reduzidos, e é recomendada a substituição da bateria."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nível da bateria baixo"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Ative a Poupança de bateria para prolongar a autonomia da bateria"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Melhore a autonomia da bateria"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Quer desligar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desligar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Quer substituir a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Quer definir a VPN como sempre ativa?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00 – 17:00, dias úteis\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos de calendário"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} está ativo}=2{{mode_1} e {mode_2} estão ativos}=3{{mode_1}, {mode_2} e {mode_3} estão ativos}other{{mode_1}, {mode_2} e mais # estão ativos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modo pode ser ativado automaticamente}other{# modos podem ser ativados automaticamente}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Não incomodar}=1{{mode_1}}=2{{mode_1} e {mode_2}}other{{mode_1}, {mode_2} e {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ATIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Não definido"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desativado"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificações"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duração"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensagens, eventos e lembretes"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Quando o modo Não incomodar está ativado, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições de mensagens para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Concluído"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Definições"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Sem imagens ou som de notificações"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Sem som de notificações"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Não vê nem ouve notificações. São permitidas chamadas de contactos marcados com uma estrela ou de autores de chamadas repetentes."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Definição atual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Quer alterar as definições de notificação do modo Não incomodar?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usar sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Utilize os mesmos sons que o seu perfil pessoal"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Após o desbloqueio, aceda diretamente ao último ecrã usado. As notificações não aparecem no ecrã de bloqueio. Deslize para baixo para as ver."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecrã de bloqueio, ignorar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Quando o perfil de trabalho está bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalismo das notificações no ecrã de bloqueio"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostrar menos notificações no ecrã de bloqueio"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar apenas novas notificações no ecrã de bloqueio"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Remove automaticamente do ecrã de bloqueio as notificações vistas anteriormente"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificações no ecrã de bloqueio"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostrar conversas predefinidas e silenciosas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas predefinidas e silenciosas"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar todo o conteúdo de notificações de trabalho"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ocultar conteúdo de trabalho confidencial"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Como quer que as notificações do perfil sejam apresentadas quando o dispositivo estiver bloqueado?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificações do perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificações"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificações de apps"</string>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Quando recebe muitas notificações num curto espaço de tempo, o dispositivo diminui o volume e minimiza os alertas durante, no máximo, 2 minutos. As chamadas, os alarmes e as conversas com prioridade não são afetadas. \n\nPara encontrar as notificações recebidas durante o repouso, puxe o ecrã para baixo a partir da parte superior."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar aos perfis de trabalho"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplique a apps de perfil de trabalho"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificações agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Ativado"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desativado"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Use o agrupamento de notificações"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"As notificações com temas semelhantes vão ser silenciadas e agrupadas para uma experiência mais silenciosa. O agrupamento substitui as definições de notificação de uma app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de assistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhuma app instalada pediu para ser executada como serviço de assistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir que o serviço de RV tenha acesso a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversas com prioridade"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}other{# conversas}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Definições de conversas"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mesmo que as apps de mensagens ou de chamadas não possam enviar notificações, as pessoas que indicar aqui podem entrar em contacto consigo através dessas apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
@@ -3826,6 +3899,8 @@
     <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 com estrela"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Definições de contactos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Definições de contactos marcados com estrela"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nenhuma"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (trabalho)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"A calcular…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Definições de apps"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que as apps substituam"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps que podem interromper"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crie um modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome do modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"O nome do modo não pode estar vazio"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Escolha um ícone"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos de calendário"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rotina da hora de dormir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Durante a condução"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificações em ecrã inteiro"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir notificações desta app em ecrã inteiro"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permita que esta app mostre notificações que ocupam o ecrã inteiro quando o dispositivo está bloqueado. As apps podem usá-las para destacar alarmes, chamadas recebidas ou outras notificações urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Escreva preferências do sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permita que esta app modifique as preferências do sistema em seu nome"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Esta autorização permite que uma app modifique as principais preferências do sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps de gestão de multimédia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir que a app faça a gestão de conteúdo multimédia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Se for permitido, esta app pode modificar ou eliminar ficheiros multimédia criados com outras apps sem lhe pedir autorização. A app tem de ter autorização para aceder a ficheiros e a multimédia."</string>
@@ -4396,6 +4477,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir a câmara rapidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir rapidamente a câmara, prima duas vezes o botão ligar/desligar. Funciona a partir de qualquer ecrã."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Toque duas vezes no botão ligar/desligar"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Usar o gesto de tocar duas vezes"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Tocar duas vezes no botão ligar/desligar"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Abrir Câmara"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Aceda à Câmara"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Abrir Carteira"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Aceda à Carteira"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Inverter a câmara para tirar uma selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegação"</string>
@@ -4793,11 +4881,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensagens por satélite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Envie e receba mensagens de texto por satélite. Incluído na sua conta."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Envie e receba mensagens de texto por satélite. Não está incluído na sua conta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensagens por satélite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Acerca das mensagens por satélite"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Mensagens por satélite, conetividade por satélite"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Acerca de <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Pode enviar e receber mensagens de texto por satélite através de uma conta elegível da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"O seu plano da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"As mensagens por satélite estão incluídas na sua conta"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"As mensagens estão incluídas na sua conta"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"As mensagens por satélite não estão incluídas na sua conta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saiba mais"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Como funciona"</string>
@@ -4805,10 +4893,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"O seu telemóvel vai ligar-se automaticamente a um satélite. Para conseguir a melhor ligação, procure uma vista desimpedida para o céu."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Depois de o seu telemóvel estabelecer ligação a um satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Pode enviar mensagens de texto a qualquer pessoa, incluindo aos serviços de emergência. O seu telemóvel vai voltar a ligar-se a uma rede móvel quando esta estiver disponível."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"As mensagens por satélite podem demorar mais tempo e só estão disponíveis em algumas zonas. As condições meteorológicas e determinadas estruturas podem afetar a sua ligação por satélite. As chamadas por satélite não estão disponíveis. Pode continuar a fazer chamadas de emergência.\n\nPode demorar algum tempo até que as alterações à conta sejam apresentadas nas Definições. Contacte a sua operadora para mais detalhes."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mais acerca das mensagens por satélite"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"A funcionalidade <xliff:g id="SUBJECT">%1$s</xliff:g> pode demorar mais tempo e só está disponível em algumas áreas. As condições meteorológicas e determinadas estruturas podem afetar a sua ligação por satélite. As chamadas por satélite não estão disponíveis. Pode continuar a fazer chamadas de emergência.\n\nPode demorar algum tempo até que as alterações à conta sejam apresentadas nas Definições. Contacte a operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> para mais detalhes."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Mais acerca de <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Não é possível ativar a função <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para ativar a função <xliff:g id="FUNCTION">%1$s</xliff:g>, termine primeiro a ligação por satélite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conetividade por satélite"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Conetividade por satélite"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"conetividade por satélite"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"mensagens por satélite"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"A utilização de dados está incluída na sua conta"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Satélite SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Envie mensagens para os serviços de emergência quando não conseguir estabelecer ligação a uma rede móvel ou Wi‑Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"satélite sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Acerca do Satélite SOS"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Pode enviar mensagens para serviços de emergência e partilhar a localização mesmo sem ligação à rede móvel ou Wi-Fi. Este serviço pode não estar sempre disponível em todas as localizações ou circunstâncias."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Ligue ou envie uma mensagem de texto para os serviços de emergência"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Responda a perguntas sobre a emergência"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Siga os passos para estabelecer ligação ao satélite"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Se não tiver uma rede móvel, é apresentada uma opção para usar o Satélite SOS"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Envie respostas para os serviços de emergência para que lhe seja prestada a ajuda adequada"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Quando estabelecer ligação, pode enviar mensagens para os serviços de emergência"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Experimentar demonstração"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Quando estabelece ligação aos serviços de emergência por satélite, o seu nome, email, número de telefone, localização, informações do dispositivo (IMEI, idioma, modelo e nível da bateria) e informações de contacto de emergência são partilhadas com serviços de emergência e fornecedores de serviços de satélite. \n\nPara usar a app Satélite SOS, a app Mensagens Google tem de ser a sua app de SMS predefinida. \n\nSe a seleção automática de rede estiver desativada, vai ser ativada e o seu dispositivo vai ligar-se automaticamente a qualquer rede."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Preferências de partilha"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Contactos de emergência"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"A sua Conta Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Reveja ou atualize as informações que são partilhadas com os serviços de emergência"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomes dos pontos de acesso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando ligado a <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
@@ -4995,6 +5106,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Está ativado o modo de 16 KB do modo sem página. A integridade do software não pode ser garantida neste modo e quaisquer dados armazenados no telemóvel enquanto o carregador de arranque estiver desbloqueado podem estar em risco. Algumas funcionalidades são desativadas nestes modos, por isso, algumas apps podem não funcionar. Para voltar a ativar o modo de produção, tem de voltar ao modo de 4 KB e, de seguida, bloquear o carregador de arranque do dispositivo. Esta ação permite fazer uma reposição de fábrica do dispositivo e restaurá-lo para as definições de produção. Depois de o dispositivo arrancar com êxito no Android, desative o desbloqueio pelo OEM nas Opções de programador. Se o dispositivo não conseguir arrancar no Android ou estiver instável, volte a atualizar o dispositivo com as imagens de fábrica mais recentes de &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecione \"Limpar dispositivo\", \"Bloquear carregador de arranque\" e \"Forçar a atualização de todas as partições\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo sem página de 16 KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ler mais"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Execute a app com o modo de compatibilidade com o tamanho da página"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Controlador do relatório de erro"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina que aplicação processa o atalho para Relatório de erro no seu dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Pessoal"</string>
@@ -5433,7 +5547,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ouvir stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Leia o código QR de uma stream de áudio para ouvir com os <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Não é possível editar a palavra-passe durante a partilha. Para alterar a palavra-passe, primeiro, desative a partilha de áudio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"A sua palavra-passe tem de conter entre 4 e 16 carateres e usar apenas letras, números e símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Leitor de códigos QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Precisa de ajuda?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Pesquise definições"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, armazenamento, conta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Armazenamento de contactos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Apenas no dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contactos não vão ser sincronizados com uma conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contactos vão ser guardados no dispositivo e sincronizados com a sua conta por predefinição"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao predefinir a conta"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta predefinida"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Apenas no dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde guardar os contactos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circundar para Pesquisar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Toque sem soltar no botão do ecrã principal ou no indicador de navegação para pesquisar usando o conteúdo no ecrã."</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 6822b226307..35df4702446 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Floco de neve"</item>
     <item msgid="7952183800501346803">"Guarda-sol"</item>
     <item msgid="799139025758265891">"Ferramentas"</item>
-    <item msgid="1330084588359129896">"Barraca"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Rolo de filme"</item>
     <item msgid="5827426100157335512">"Livro"</item>
     <item msgid="8585828346253128384">"Flor de lótus"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 94208e15273..47594c42151 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parear novo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Se você desativar o Bluetooth, ele será reativado no dia seguinte"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Parear lado direito"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Parear lado esquerdo"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pareie o outro lado"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Desativar Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Desativa o recurso de Bluetooth LE Audio caso o hardware do dispositivo tenha essa opção."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modo Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Ativar a visualização da interface de transmissão de Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ativa a visualização da interface de compartilhamento de LE Audio, incluindo o compartilhamento de áudio pessoal e a transmissão particular"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Mostrar a chave do Bluetooth LE Audio nos Detalhes do dispositivo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Ignorar lista de permissões do Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Usar o áudio de baixo consumo (LE Audio) por padrão, mesmo que o periférico dele não tenha sido verificado para atender aos critérios da lista de permissões."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Idioma do app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Idiomas sugeridos"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Todos os idiomas"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugestões"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Todos os idiomas"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Todas as regiões"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Todos os sistemas de numeração"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Idioma do sistema"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Padrão do sistema"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"A seleção de idioma para este app não está disponível nas configurações."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Mudar"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s indisponível"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Esse idioma não pode ser usado para o sistema, mas os apps e sites vão identificar sua preferência."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Pesquisa"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Adicionar um idioma"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferência de região"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Digite o nome do idioma"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Mais configurações de idioma"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferências regionais"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Definir preferências de número e unidades"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Permita que os apps saibam suas preferências regionais para personalizar sua experiência."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Os apps vão usar suas preferências regionais quando possível."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferências regionais"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Primeiro dia da semana"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferências de números"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Sujeito a cobrança por uso de roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Definir automaticamente"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"A localização vai ser usada para definir o fuso horário quando esta opção estiver ativada"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente usando sua rede e sinais sem fio"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de você"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Definir automaticamente usando o local do dispositivo, se disponível"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Horário"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levante o dedo e depois toque no sensor novamente"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Não foi possível usar o sensor de impressão digital"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Entre em contato com uma assistência técnica."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Desbloqueio por impressão digital com a tela desligada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Use o Desbloqueio por impressão digital mesmo com a tela desligada"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Tela desligada, Desbloqueio"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Mais configurações de segurança"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Bloqueio do perfil de trabalho, criptografia e muito mais"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Criptografia, credenciais e muito mais"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Defina um padrão para seu espaço privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirme o padrão do espaço privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Digite o PIN do espaço privado mais uma vez"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Digite a senha do espaço privado mais uma vez"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Não é possível adicionar mais impressões digitais"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Ligada"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Desligada"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Tela externa"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Usar tela externa"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolução da tela"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"A tela externa está desconectada"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Mudar a rotação ou a resolução pode interromper qualquer app que está sendo executado"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"O dispositivo precisa estar conectado a uma tela externa para espelhar a exibição"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Mais opções"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Pressione e arraste para reorganizar as telas."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Verifique a senha e tente novamente"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Verifique a conexão e tente novamente"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta rede Wi-Fi está indisponível no momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ocorreu um problema com o QR code. Tente se conectar de outra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Escolher rede"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Para conectar seu dispositivo, escolha uma rede"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Adicionar este dispositivo a “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Saiba mais sobre o giro automático"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolução da tela"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Alta resolução"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Resolução máxima"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"A resolução máxima consome mais bateria. A troca de resolução pode fazer com que alguns apps sejam reiniciados."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selecionada"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptáveis"</string>
     <string name="brightness" msgid="6216871641021779698">"Nível de brilho"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Brilho adaptável"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Sobre o brilho adaptável"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"O brilho da tela será ajustado automaticamente ao seu ambiente e às suas atividades. Mova o controle deslizante para ajudar o brilho adaptável a memorizar suas preferências."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Ativado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desativado"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Configurações do Modo hora de dormir"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Alguns modos também ativam o tema escuro}=1{O modo {mode_1} também ativa o tema escuro}=2{Os modos {mode_1} e {mode_2} também ativam o tema escuro}=3{Os modos {mode_1}, {mode_2} e {mode_3} também ativam o tema escuro}one{Os modos {mode_1}, {mode_2} e mais # também ativam o tema escuro}other{Os modos {mode_1}, {mode_2} e mais # também ativam o tema escuro}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Configurações de modos"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ainda mais escuro"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Escurecer a tela"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permitir que o dispositivo fique mais escuro do que o normal"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo limite da tela"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Serviços de localização"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Usar a localização"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Usar a localização para determinar o fuso horário"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Não é possível definir o fuso horário automaticamente"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Localização ou Serviços de localização desativados"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Configurações de localização"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Corrigir"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Cancelar"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Indisponível quando o fuso horário automático está desativado"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"A localização pode ser usada para definir o fuso horário"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Se a localização do dispositivo estiver disponível, ela poderá ser usada para definir seu fuso horário"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informações legais"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opções"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Acessibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Seletor de layout do teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtragem"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla dentro de <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limite da tecla de filtragem"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolha por quanto tempo o teclado ignora pressionamentos repetidos"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizado"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valor personalizado"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado para <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas de aderência"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pressione uma tecla por vez para usar atalhos em vez de manter as teclas pressionadas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do mouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Use o teclado físico para controlar o mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Usar teclas do mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Rolagem reversa do mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Deslize para cima para descer na página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar os botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do mouse como o direito"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Teclas do mouse para <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Use as teclas <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> para mover o ponteiro do mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Use a tecla <xliff:g id="CLICK_LABEL">%s</xliff:g> para clicar no botão principal do mouse"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Use a tecla <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> para tocar e pressionar o botão principal do mouse"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Use a tecla <xliff:g id="RELEASE_LABEL">%s</xliff:g> para soltar o botão principal do mouse"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Use a tecla <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> para trocar o modo de rolagem. Isso vai fazer com que as teclas <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> rolem a visualização para cima, para baixo, para a esquerda ou para a direita"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Use a tecla <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> para clicar no botão secundário do mouse"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas de perfil de trabalho"</string>
@@ -1953,6 +2000,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Padrão"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad e mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Velocidade do cursor, gestos"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tocar para clicar"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Arrastar com toque"</string>
@@ -1964,6 +2012,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clicar no canto inferior direito"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Clique no canto inferior direito do touchpad para mais opções"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Velocidade do cursor"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Usar o toque com três dedos"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Cor do ponteiro"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Mudar preenchimento para preto"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Mudar preenchimento para verde"</string>
@@ -1978,6 +2027,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Aprender gestos do touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, rolar, deslizar, clicar com o botão direito do mouse, clicar, ponteiro"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"clicar com o botão direito do mouse, tocar"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clicar no botão do meio"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Iniciar Assistente"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ir para a página inicial"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Voltar"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ver os apps recentes"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ir para a tela inicial"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Deslize para cima com três dedos em qualquer lugar do touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Voltar"</string>
@@ -2014,6 +2068,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas de aderência, teclas de filtragem, teclas do mouse"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetir teclas"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Atraso antes da repetição"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Taxa de repetição"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pressione e segure uma tecla para repetir o caractere dela até que seja liberada"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layout do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automático: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2476,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Visualização"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Tamanho do texto"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho da legenda"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo da legenda"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções de personalização"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor do plano de fundo"</string>
@@ -2545,6 +2603,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pacotes incluídos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Os apps estão funcionando normalmente"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"É recomendável trocar a bateria"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"A capacidade e o desempenho de carregamento estão reduzidos. Recomendamos a troca da bateria."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nível da bateria baixo"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Ativar a Economia de bateria para prolongar a duração da carga"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Melhorar a duração da bateria"</string>
@@ -2962,6 +3022,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Configurar VPN sempre ativa?"</string>
@@ -3384,7 +3445,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Das 9h às 17h em dias de semana\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Eventos da agenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} está ativo}=2{{mode_1} e {mode_2} estão ativos}=3{{mode_1}, {mode_2} e {mode_3} estão ativos}one{{mode_1}, {mode_2} e mais # modo estão ativos}other{{mode_1}, {mode_2} e mais # modos estão ativos}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modo pode ser ativado automaticamente}one{# modo pode ser ativado automaticamente}other{# modos podem ser ativados automaticamente}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Não perturbe}=1{{mode_1}}=2{{mode_1} e {mode_2}}one{{mode_1}, {mode_2} e {mode_3}}other{{mode_1}, {mode_2} e {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ATIVADO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Não definido"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Desativado"</string>
@@ -3509,15 +3570,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ok"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificações"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duração"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensagens, eventos e lembretes"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Quando o Não perturbe estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Concluído"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Configurações"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Ocultar avisos visuais ou sonoros de notificações"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Desativar som de notificações"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Você não verá nem ouvirá notificações. As chamadas de contatos marcados com estrela e de autores de chamadas repetidas serão permitidas."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Configuração atual)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Alterar as configurações de notificação do \"Não perturbe\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Usar sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Usar os mesmos sons que o perfil pessoal"</string>
@@ -3586,8 +3638,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Após o desbloqueio, a última tela usada será mostrada. Deslize de cima para baixo para conferir as notificações, que não vão aparecer na tela de bloqueio."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Quando o perfil está bloqueado"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Notificações minimalistas na tela de bloqueio"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Mostrar menos notificações na tela de bloqueio"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Mostrar somente notificações novas na tela de bloqueio"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Remover automaticamente da tela de bloqueio as notificações já vistas"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificações na tela de bloqueio"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostrar conversas, padrão e silenciosas"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas, padrão e silenciosas"</string>
@@ -3605,6 +3667,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Mostrar todo o conteúdo de notificação de trabalho"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ocultar conteúdo de trabalho confidencial"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Como você quer que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificações do perfil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificações"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificações de apps"</string>
@@ -3695,6 +3765,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Se chegarem muitas notificações em um curto período, o dispositivo vai diminuir o volume e minimizar alertas por até 2 minutos. Isso não afeta ligações, alarmes e conversas prioritárias. \n\nAs notificações recebidas durante a atenuação podem ser encontradas ao deslizar de cima para baixo na tela."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplicar a perfis de trabalho"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplicar em apps do perfil de trabalho"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificações agrupadas"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Ativado"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Desativado"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Usar agrupamento de notificações"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"As notificações com temas semelhantes serão silenciadas e agrupadas para oferecer uma experiência mais discreta. O agrupamento substitui as configurações de notificação de um app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviço de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3878,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Configurações de conversas"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mesmo se os apps de mensagens ou chamadas não puderem notificar você, as pessoas escolhidas aqui ainda vão poder entrar em contato por esses apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
@@ -3826,6 +3902,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Configurações de contatos"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Configurações de contatos marcados com estrela"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Nenhuma"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
@@ -3855,6 +3933,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (trabalho)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Calculando…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Configurações dos apps"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que apps modifiquem o \"Não perturbe\""</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Apps que podem fazer interrupções"</string>
@@ -3897,6 +3976,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Criar um modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome do modo"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"O nome do modo não pode ficar em branco"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Escolha um ícone"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos da agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rotina Hora de dormir"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Ao dirigir"</string>
@@ -4151,6 +4232,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificações em tela cheia"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permitir que esse app mostre notificações em tela cheia"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permita que o app mostre notificações que ocupam a tela inteira quando o dispositivo estiver bloqueado. Os apps poderão usar essa permissão para destacar alarmes, ligações recebidas ou outras notificações urgentes."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Gravar preferências do sistema"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permitir que este app mude as preferências do sistema por você"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Com essa permissão, um app pode mudar as preferências principais do sistema."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Apps de gerenciamento de mídia"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Permitir que o app gerencie arquivos de mídia"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Se você permitir, esse app poderá modificar ou excluir arquivos de mídia criados com outros apps sem perguntar para você. É necessário autorizar o acesso do app aos arquivos e ao conteúdo de mídia."</string>
@@ -4396,6 +4480,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestos"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir a câmera rapidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Virar câmera para tirar selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegação"</string>
@@ -4793,11 +4891,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mensagem via satélite"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Enviar e receber mensagens de texto via satélite. Incluído na sua conta."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Enviar e receber mensagens de texto via satélite. Recurso não incluído na sua conta."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mensagem via satélite"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Sobre mensagens via satélite"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"É possível enviar e receber mensagens de texto via satélite como parte de uma conta qualificada da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Seu plano da operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Mensagens via satélite estão incluídas na sua conta"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Mensagens via satélite não estão incluídas na sua conta"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Saiba mais"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Como funciona"</string>
@@ -4805,10 +4906,56 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Seu smartphone vai se conectar automaticamente a um satélite. Para conseguir a melhor conexão, vá até um local com céu aberto."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Depois que o smartphone se conectar a um satélite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"É possível enviar mensagens de texto para qualquer pessoa, inclusive para serviços de emergência. O smartphone vai se reconectar a uma rede móvel quando estiver disponível."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"As mensagens via satélite podem demorar mais e estão disponíveis apenas em algumas áreas. O clima e determinadas estruturas podem afetar a conexão por satélite. A ligação via satélite não está disponível. Talvez chamadas de emergência ainda possam ser feitas.\n\nPode levar algum tempo para mudanças na conta aparecerem nas Configurações. Entre em contato com sua operadora para saber mais."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mais informações sobre mensagens via satélite"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Não é possível ativar o <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para ativar o <xliff:g id="FUNCTION">%1$s</xliff:g>, primeiro encerre a conexão via satélite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectividade via satélite"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomes dos pontos de acesso"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5142,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Você está no modo agnóstico de páginas de 16 KB. A integridade do software não é garantida nesse modo, e todos os dados armazenados no smartphone enquanto o carregador de inicialização está desbloqueado podem ser expostos a riscos. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para entrar de novo no modo de produção, volte para o modo 4 KB e, em seguida, bloqueie o carregador de inicialização no dispositivo. Essa ação vai fazer a redefinição de fábrica do dispositivo novamente. Depois que o dispositivo for inicializado corretamente no Android, desative o desbloqueio de OEM nas Opções do desenvolvedor. Se o dispositivo não for inicializado no Android ou estiver instável, atualize-o novamente com as imagens de fábrica mais recentes especificadas em &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ou use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; e selecione \"Excluir o dispositivo permanentemente\", \"Bloquear carregador de inicialização\" e \"Forçar a atualização de todas as partições\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modo agnóstico de páginas de 16 KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Leia mais"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Executar app com o modo de compatibilidade de tamanho de página"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Gerenciador de relatórios de bugs"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determina qual app gerencia o atalho para o Relatório de bug no dispositivo."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Pessoais"</string>
@@ -5161,7 +5311,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB indisponível no local atual"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Usar o Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"O protocolo Thread ajuda a conectar seus dispositivos de casa inteligente, aumentando a eficácia e o desempenho deles.\n\nQuando o recurso está ativado, este dispositivo fica qualificado para ingressar em uma rede Thread, permitindo que você controle dispositivos com suporte do Matter por este smartphone."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"O protocolo Thread ajuda a conectar seus dispositivos de casa inteligente, aumentando a eficácia e o desempenho deles.\n\nQuando o recurso está ativado, este aparelho pode ingressar em uma rede Thread, permitindo que você controle dispositivos compatíveis com Matter por este smartphone."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Saiba mais sobre o Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Acesso à câmera"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Acesso ao microfone"</string>
@@ -5433,7 +5583,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ouvir o stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Use o QR code de um stream de áudio para ouvir com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Não é possível editar a senha enquanto compartilha. Para mudar a senha, primeiro desligue o compartilhamento de áudio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"A senha precisa ter de 4 a 16 caracteres e usar apenas letras, números e símbolos"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Leitor de QR code"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Precisa de ajuda?"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"Pesquisar nas configurações"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatos, armazenamento, conta"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Armazenamento de contatos"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Somente dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contatos não serão sincronizados com uma conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contatos serão salvos no seu dispositivo e sincronizados com sua conta por padrão"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao definir a conta padrão"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta padrão configurada"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Somente dispositivo"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde salvar contatos"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circule para pesquisar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Toque no botão home ou na alça de navegação e pressione para pesquisar usando o conteúdo na tela."</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b7d382c501c..1872920af55 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Fulg de nea"</item>
     <item msgid="7952183800501346803">"Umbrelă de plajă"</item>
     <item msgid="799139025758265891">"Instrumente din atelier"</item>
-    <item msgid="1330084588359129896">"Cort"</item>
+    <item msgid="8112685757657659269">"Pian"</item>
     <item msgid="3861584909935022342">"Bobină de film"</item>
     <item msgid="5827426100157335512">"Carte"</item>
     <item msgid="8585828346253128384">"Floare de lotus"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1a3e416d231..b2f996affe5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Asociază un nou dispozitiv"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activează automat mâine"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Dacă dezactivezi Bluetooth, se reactivează a doua zi"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Urechea dreaptă"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Urechea stângă"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Asociază cealaltă ureche"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Dezactivează Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Dezactivează funcția Bluetooth LE Audio dacă dispozitivul acceptă capacitățile de hardware LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modul Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Activează previzualizarea interfeței de utilizare pentru difuzarea prin Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Activează previzualizarea interfeței de utilizare pentru permiterea accesului prin LE Audio, inclusiv permiterea accesului la audio personal și difuzarea privată"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Comutator LE Audio în Detalii dispozitiv"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Omite lista cu acces permis Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Folosește în mod prestabilit LE Audio chiar dacă dispozitivul periferic LE Audio nu a fost confirmat ca respectând criteriile Allowlist."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Limba aplicației"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Limbi sugerate"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Toate limbile"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Sugestii"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Toate limbile"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Toate regiunile"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Toate sistemele de numerotare"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Limba sistemului"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Prestabilit de sistem"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Selectarea limbii pentru această aplicație din Setări nu este disponibilă."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Schimbă"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nu este disponibilă"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Limba nu poate fi folosită ca limbă a sistemului, dar ai indicat aplicațiilor și site-urilor că preferi această limbă."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Caută"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Adaugă o limbă"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regiunea preferată"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Numele limbii"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Mai multe setări de limbă"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferințe regionale"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Setează preferințele pentru unități și cifre"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Setează preferințele regionale pentru ca aplicațiile să-ți poată personaliza experiența."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplicațiile vor folosi preferințele tale regionale, dacă este posibil."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferințe regionale"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatură"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prima zi a săptămânii"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferințe numerice"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Conectează-te la servicii de date în roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Conectează-te la serviciile de date în roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Se pot aplica tarife de roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Setează ora automat"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Setează automat"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Locația va fi folosită pentru setarea fusului orar când acest comutator este activat"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Dată și oră automate"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Setează automat folosind semnalele de rețea și wireless"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Fus orar automat"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setează automat în funcție de rețelele mobile din apropiere"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Setează automat folosind locația, dacă este disponibilă"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Folosește codul local prestabilit"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Folosește formatul de 24 de ore"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Oră"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Ridică degetul, apoi atinge senzorul din nou"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Nu se poate folosi senzorul de amprentă"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Vizitează un furnizor de servicii de reparații."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Deblocarea cu amprenta când ecranul este oprit"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Folosește Deblocarea cu amprenta chiar și când ecranul este inactiv"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Dezactivează ecranul, deblochează"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Mai multe setări de securitate"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Blocarea profilului de serviciu, criptarea și altele"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Criptarea, datele de conectare și altele"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Setează un model pentru spațiul privat"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Blochează"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ascunde"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirmă modelul pentru spațiul privat"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Reintrodu PIN-ul pentru spațiul privat"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Reintrodu parola pentru spațiul privat"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Poți să adaugi până la <xliff:g id="COUNT">%d</xliff:g> amprente"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ai adăugat numărul maxim de amprente digitale"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nu se mai pot adăuga amprente digitale"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Activat"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Dezactivat"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ecran extern"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Folosește ecranul extern"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rezoluția ecranului"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ecranul extern este deconectat"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Modificarea rotirii sau a rezoluției poate opri aplicațiile care rulează"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Dispozitivul trebuie să fie conectat la un ecran extern pentru a-ți oglindi ecranul"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Mai multe opțiuni"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Ține apăsat și trage pentru a rearanja afișările."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Proiectare"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"oglindă"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activează ecranul wireless"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Verifică parola și încearcă din nou"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contactează producătorul dispozitivului"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Verifică conexiunea și încearcă din nou"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Această rețea Wi-Fi nu este disponibilă momentan"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"A apărut o problemă cu acest cod QR. Încearcă să te conectezi altfel."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Alege rețeaua"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Pentru a vă conecta dispozitivul, alegeți o rețea"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Adaugi acest dispozitiv la „<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Află mai multe despre rotirea automată"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rezoluția ecranului"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Rezoluție înaltă"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Rezoluție maximă"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Rezoluția maximă consumă mai multă baterie. Dacă schimbi rezoluția, unele aplicații pot reporni."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selectată"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Culori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturale"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Nivel de luminozitate"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Luminozitate adaptivă"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Despre luminozitatea adaptivă"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Luminozitatea ecranului se va adapta automat la mediul și activitățile tale. Poți să muți manual glisorul pentru a ajuta luminozitatea adaptivă să îți învețe preferințele."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activată"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Dezactivat"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Setările modului Ora de culcare"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modurile pot și să activeze tema întunecată}=1{{mode_1} activează tema întunecată}=2{{mode_1} și {mode_2} activează tema întunecată}=3{{mode_1}, {mode_2} și {mode_3} activează tema întunecată}few{{mode_1}, {mode_2} și încă # activează tema întunecată}other{{mode_1}, {mode_2} și încă # activează tema întunecată}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Setările pentru Moduri"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Chiar mai întunecat"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Luminozitate redusă suplimentar"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Permite ca dispozitivul să fie mai întunecat ca de obicei"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Durată până la dezactivarea ecranului"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite 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="location_services_preference_title" msgid="604317859531782159">"Servicii de localizare"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Servicii de localizare"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Folosește locația"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Folosește locația pentru fusul orar"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Fusul orar nu poate fi setat automat"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Locația sau serviciile de localizare sunt dezactivate"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Setări privind locația"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Remediază problema"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Anulează"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Fusul orar automat este dezactivat"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nu este disponibilă când fusul orar automat 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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Locația se poate folosi pentru a seta fusul orar"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Dacă locația dispozitivului este disponibilă, se poate folosi pentru a seta fusul orar"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Afișează informații legale, starea și versiunea programului software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informații de ordin juridic"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opțiuni"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilitate"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tastatură fizică"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Taste nerepetate"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastatura ignoră apăsările repetate rapid ale aceleiași taste în <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatura ignoră apăsările repetate rapid ale aceleiași taste"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Pragul pentru evitarea apăsării repetate"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Alege durata de timp în care tastatura ignoră apăsările repetate ale tastelor"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sec."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sec."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sec."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Personalizată"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"valoare personalizată"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Taste lente"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ajustează timpul necesar pentru ca o apăsare de tastă să se activeze la <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajustează timpul necesar pentru activarea unei apăsări de tastă"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taste adezive"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Apasă câte o tastă pentru comenzile rapide în loc să ții apăsate tastele împreună"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Butoanele mouse-ului"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Folosește tastatura fizică pentru a controla mouse-ul."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Folosește tastele pentru mouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Folosește tastatura pentru a controla indicatorul"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Derularea inversă cu mouse-ul"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Derulează în sus pentru a muta pagina în jos"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Schimbă butoanele stâng și drept"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Folosește butonul stâng al mouse-ului ca pe cel drept"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tastele pentru mouse de pe <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Folosește tastele <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> pentru a muta cursorul mouse-ului"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Folosește tasta <xliff:g id="CLICK_LABEL">%s</xliff:g> pentru a da clic pe butonul principal al mouse-ului"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Folosește tasta <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> pentru a apăsa lung butonul principal al mouse-ului"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Folosește tasta <xliff:g id="RELEASE_LABEL">%s</xliff:g> pentru a elibera butonul principal al mouse-ului"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Folosește tasta <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> pentru a activa sau a dezactiva modul de derulare. Astfel, tastele <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> vor derula afișarea în sus, în jos, la stânga sau la dreapta."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Folosește tasta <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> pentru a da clic pe butonul secundar al mouse-ului"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Comenzi rapide de la tastatură"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afișează lista de comenzi rapide"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastaturi și instrumente pt. profilul de serviciu"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Prestabilit"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad și mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Viteza cursorului, gesturi"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Atinge pentru clic"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tragere prin atingere"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Clic în dreapta jos"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Dă clic în colțul din dreapta jos pe touchpad pentru opțiuni"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Viteza cursorului"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Folosește atingerea cu trei degete"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Culoarea cursorului"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Schimbă stilul de umplere în negru"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Schimbă stilul de umplere în verde"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Învață gesturi pentru touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, derulează, glisează, dă clic dreapta, dă clic, indicator"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"dă clic dreapta, atinge"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Clic pe butonul din mijloc"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Lansează Asistentul"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Înapoi la pagina de pornire"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Înapoi"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Vezi aplicațiile recente"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Înapoi la ecranul de pornire"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Glisează în sus cu trei degete oriunde pe touchpad"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Înapoi"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Alege o nouă tastă pentru <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilitatea tastaturii fizice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taste adezive, Taste nerepetate, Butoanele mouse-ului"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repetă tastele"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Durata până la repetare"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Frecvența de repetare"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Apasă lung o tastă pentru a repeta caracterul respectiv până când o eliberezi"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Aspectul <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Prestabilit"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automat: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Previzualizare"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opțiuni standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Limbă"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Dimensiunea textului"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Dimensiunea subtitrării"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stilul subtitrării"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opțiuni personalizate"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Culoare de fundal"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustează utilizarea de energie"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Pachete incluse"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplicațiile rulează normal"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Se recomandă înlocuirea bateriei"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Capacitatea bateriei și performanța de încărcare sunt reduse și se recomandă înlocuirea bateriei."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nivelul bateriei este scăzut"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Activează Economisirea bateriei pentru a mări autonomia bateriei"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Îmbunătățește autonomia bateriei"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vrei să te deconectezi de la această rețea VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Deconectează-te"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiune"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versiunea <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Elimină profilul VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Înlocuiești rețeaua VPN existentă?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setezi rețeaua VPN ca activată permanent?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"În zilele lucrătoare între 09:00 și 17:00"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Evenimente din calendar"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} este activ}=2{{mode_1} și {mode_2} sunt active}=3{{mode_1}, {mode_2} și {mode_3} sunt active}few{{mode_1}, {mode_2} și încă # sunt active}other{{mode_1}, {mode_2} și încă # sunt active}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Un mod se poate activa automat}few{# moduri se pot activa automat}other{# de moduri se pot activa automat}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Nu deranja}=1{{mode_1}}=2{{mode_1}, {mode_2}}few{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ACTIVAT"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nesetat"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Dezactivat"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificări"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Durata"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mesaje, evenimente și mementouri"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Când este activat modul Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiți mai sus. Poți să modifici setările pentru mesaje ca să le permiți prietenilor, familiei sau altor persoane de contact să te contacteze."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Gata"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Setări"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Fără imagini sau sunet de la notificări"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Fără sunet de la notificări"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Nu vei vedea și nu vei auzi notificări. Sunt permise apelurile de la persoanele de contact marcate cu stea și de la apelanții care revin."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Setarea curentă)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Modifici setările pentru notificări ale modului „Nu deranja”?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sunetele profilului de serviciu"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Folosește sunetele profilului personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Folosește aceleași sunete ca pentru profilul personal"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"După deblocare, accesează ultimul ecran folosit. Notificările nu vor apărea pe ecranul de blocare. Glisează în jos din partea de sus ca să le vezi."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecran de blocare, Ecran de blocare, Omitere, Evitare"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Când este blocat profilul de serviciu"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Reducerea numărului notificărilor de pe ecranul de blocare"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Afișează mai puține notificări pe ecranul de blocare"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Afișează doar notificări noi pe ecranul de blocare"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Elimină automat notificările afișate anterior de pe ecranul de blocare"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notificări pe ecranul de blocare"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Afișează conversațiile prestabilite și silențioase"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Afișează conversațiile prestabilite și silențioase"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Afișează tot conținutul notificărilor de serviciu"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ascunde conținutul de lucru sensibil"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Cum vrei să fie afișate notificările din profil când dispozitivul este blocat?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Notificări din profil"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notificări"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notificări din aplicații"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Când primești multe notificări într-un timp scurt, dispozitivul va reduce volumul și va minimiza alertele timp de până la două minute. Apelurile, alarmele și conversațiile prioritare nu vor fi afectate. \n\nPoți accesa notificările primite în perioada de reducere a sunetului dacă tragi în jos din partea de sus a ecranului."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Aplică profilurilor de serviciu"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplică pentru aplicațiile din profilul de serviciu"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Notificări în grup"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Activat"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Dezactivat"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Folosește gruparea notificărilor"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Notificări cu teme similare vor fi dezactivate și grupate pentru o experiență mai liniștită. Gruparea va înlocui setările pentru notificări ale aplicației."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicii de ajutor pentru RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nicio aplicație instalată nu a solicitat să fie rulată ca un serviciu de ajutor pentru RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permiți accesul la serviciul RV pentru <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"conversații prioritare"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Setări pentru conversații"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Cine poate întrerupe"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Chiar dacă aplicațiile de mesagerie sau apeluri nu îți pot trimite notificări, persoanele alese aici te pot contacta prin aceste aplicații"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Apeluri"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Oricine"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacte din Agendă"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Persoane din agendă marcate cu stea"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Setările Agendei"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Setări pentru persoanele de contact cu stea"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Niciunul"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Niciunul"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarme"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Serviciu)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Se calculează..."</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Setările aplicațiilor"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permite aplicațiilor să ignore"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplicații care pot întrerupe"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Creează un mod"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mod personalizat"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Numele modului"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Numele modului trebuie completat"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Alege o pictogramă"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Evenimente din calendar"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina orei de culcare"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"La volan"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Notificări pe ecran complet"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Permite notificările pe ecran complet de la această aplicație"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Permite aplicației să afișeze notificări care ocupă întregul ecran când dispozitivul e blocat. Aplicațiile le pot folosi pentru a evidenția alarme, apeluri primite sau alte informații urgente."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Scrie preferințele de sistem"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Permite acestei aplicații să modifice preferințele de sistem în numele tău"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Cu această permisiune, o aplicație poate să modifice preferințele de sistem de bază."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplicații de gestionare media"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Aplicația poate gestiona conținutul media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Dacă îi permiți, aplicația poate să modifice sau să șteargă fișiere media create cu alte aplicații fără a te întreba. Aplicația trebuie să aibă permisiunea de a accesa fișierele."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gesturi"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Deschide rapid camera foto"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Pentru a deschide rapid camera foto, apasă de două ori butonul de pornire. Funcționează de pe orice ecran."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Întoarce camera foto pentru un selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Mod de navigare"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Mesaje prin satelit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Trimite și primește mesaje text prin satelit. Opțiunea este inclusă în contul tău."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Trimite și primește mesaje text prin satelit. Opțiunea nu este inclusă în contul tău."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Mesaje prin satelit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Despre mesajele prin satelit"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Dacă ai un cont <xliff:g id="CARRIER_NAME">%1$s</xliff:g> eligibil, poți să trimiți și să primești mesaje text prin satelit"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Planul tău <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Mesajele prin satelit sunt incluse în contul tău"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Mesajele prin satelit nu sunt incluse în contul tău"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Află mai multe"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cum funcționează"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonul se va conecta automat la un satelit. Pentru o conexiune optimă, trebuie să vezi cerul clar."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"După conectarea telefonului la un satelit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Poți să trimiți mesaje oricui, inclusiv serviciilor de urgență. Telefonul se va reconecta la o rețea mobilă când va fi disponibilă."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Trimiterea mesajelor prin satelit poate dura mai mult și este disponibilă doar în anumite zone. Condițiile meteo și anumite structuri pot afecta conexiunea prin satelit. Apelarea prin satelit nu este disponibilă. Este posibil ca apelurile de urgență să se conecteze în continuare.\n\nPoate dura un timp pentru ca modificările aduse contului să apară în Setări. Contactează operatorul pentru detalii."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mai multe despre mesajele prin satelit"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Nu se poate activa <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Ca să activezi <xliff:g id="FUNCTION">%1$s</xliff:g>, oprește conexiunea prin satelit"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Conectivitate prin satelit"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Numele punctelor de acces"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponibil când este conectat la <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ești în modul pe 16 KB independent de dimensiunea paginii. Integritatea software-ului nu poate fi garantată în acest mod și toate datele stocate pe telefon cât timp bootloaderul este deblocat pot fi în pericol. Unele funcții vor fi dezactivate în aceste moduri, prin urmare este posibil ca unele aplicații să nu funcționeze. Pentru a intra din nou în modul de producție, trebuie să revii la modul pe 4 KB, apoi să blochezi bootloaderul dispozitivului. Astfel, dispozitivul revine din nou la setările din fabrică și este restabilit la setările de producție. După ce dispozitivul pornește în sistemul Android, dezactivează deblocarea OEM în Opțiuni pentru dezvoltatori. Dacă dispozitivul nu pornește în sistemul Android sau este instabil, reinstalează cele mai recente configurații din fabrică pe dispozitiv de la &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; sau accesează &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; și selectează Wipe Device (Șterge datele de pe dispozitiv) > Lock Bootloader (Blochează bootloaderul) > Force Flash all partitions (Instalează forțat pe toate partițiile)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modul pe 16 KB independent de dimensiunea paginii"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Citește mai multe"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Rulează aplicația în modul de compatibilitate cu dimensiunea paginii"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Handler pentru rapoartele de eroare"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Stabilește ce aplicație gestionează comanda rapidă pentru Raportul de eroare pe dispozitivul tău."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5434,7 +5586,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Ascultă streamul"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Scanează un cod QR de stream audio pentru a-l asculta folosind <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Nu poți edita parola în timpul permiterii accesului. Pentru a schimba parola, mai întâi dezactivează permiterea accesului la audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Parola trebuie să conțină între 4 și 16 caractere și să folosească numai litere, cifre și simboluri"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Scanner de coduri QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Ai nevoie de ajutor?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Caută în setări"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"agendă, spațiu de stocare, cont"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stocarea datelor din Agendă"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Numai pe dispozitiv"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Contactele noi nu se vor sincroniza cu un cont"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Persoanele de contact vor fi salvate pe dispozitiv și sincronizate cu contul în mod prestabilit"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Eroare la setarea contului prestabilit"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nicio setare prestabilită"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Numai pe dispozitiv"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispozitiv și %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adaugă un cont pentru a începe"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Unde să salvezi agenda"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Încercuiește și caută"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Atinge lung butonul Ecran de pornire sau ghidajul de navigare ca să cauți folosind conținutul de pe ecran."</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 4f9a54cec0d..c06ead6809e 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Снежинка"</item>
     <item msgid="7952183800501346803">"Пляжный зонт"</item>
     <item msgid="799139025758265891">"Инструменты в мастерской"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
+    <item msgid="8112685757657659269">"Пианино"</item>
     <item msgid="3861584909935022342">"Кинопленка"</item>
     <item msgid="5827426100157335512">"Книга"</item>
     <item msgid="8585828346253128384">"Цветок лотоса"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 739fd2ab6d4..9be457eeb1d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Добавить устройство"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Включить автоматически завтра"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth снова включится на следующий день после отключения"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Подключить прав. ухо"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Подключить левое ухо"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Подключить другое ухо"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Отключить Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Отключить Bluetooth LE Audio, если доступны аппаратные возможности"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Режим Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Предпросмотр интерфейса для трансляции по Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Разрешить предпросмотр интерфейса для передачи аудио с использованием LE Audio, в том числе для личных трансляций"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Переключатель LE Audio в сведениях об устройстве"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Обходить белый список Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Использовать LE Audio по умолчанию, даже если периферийное устройство LE Audio не соответствует критериям белого списка"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Язык приложения"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Рекомендуемые языки"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Все языки"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Рекомендации"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Все языки"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Все регионы"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Все системы счисления"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Язык системы"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Системные настройки по умолчанию"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Для этого приложения не поддерживается выбор языка в настройках."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Изменить"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s недоступен"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Это язык нельзя использовать как системный, но вы разрешили сообщать приложениям и сайтам, что вы предпочитаете его."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Поиск"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Добавить язык"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Региональные настройки"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Введите название языка"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Другие языковые настройки"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Региональные настройки"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Укажите предпочтительные единицы измерения и форматы отображения чисел"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Приложения используют эти параметры для персонализации."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Приложения по возможности будут использовать ваши региональные настройки."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Региональные настройки"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Единицы измерения температуры"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Первый день недели"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Настройки чисел"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Подключаться к службам передачи данных при роуминге"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Подключаться к службам передачи данных при роуминге"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Может взиматься плата за роуминг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Настраивать время автоматически"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Автоматическое определение"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Когда переключатель включен, часовой пояс выбирается на основании данных о местоположении"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Автоматическое определение даты и времени"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Устанавливать автоматически по сигналам мобильной и беспроводной сетей"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Автоматическое определение часового пояса"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Устанавливать автоматически по мобильным сетям поблизости"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Устанавливать автоматически, используя геолокацию"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Использовать региональные настройки"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часовой формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Время"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Поднимите палец и снова приложите его к сканеру."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Невозможно использовать сканер отпечатков пальцев"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Обратитесь в сервисный центр."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Отключенный экран, разблокировка по отпечатку пальца"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Использовать разблокировку по отпечатку пальца, даже если экран отключен"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Отключенный экран, разблокировка"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Дополнительные настройки безопасности"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Блокировка рабочего профиля, шифрование и прочее"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрование, учетные данные и прочее"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Создайте ключ для личного пространства"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Блокировка"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ограничение доступа"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Подтвердите ключ для частного пространства"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Подтвердите PIN-код для частного пространства"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Подтвердите пароль для частного пространства"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Максимальное количество отпечатков пальца, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Вы уже добавили максимальное количество отпечатков"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Больше нельзя добавить отпечатки пальцев"</string>
@@ -699,7 +720,7 @@
     <string name="unlock_set_do_later_title" msgid="6565575303676064364">"Не сейчас"</string>
     <string name="current_screen_lock" msgid="1367883977261098017">"Текущий способ разблокировки"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="2229689425933043901">"Графический ключ • Отпечаток пальца"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="7979848492740627674">"PIN • Отпечаток пальца"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="7979848492740627674">"PIN-код • Отпечаток пальца"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="6207676267295036963">"Пароль • Отпечаток пальца"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Продолжить без настройки отпечатка"</string>
     <string name="face_unlock_set_unlock_pattern" msgid="4206669838203096608">"Графический ключ • Фейсконтроль"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Включено"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Отключено"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Внешний дисплей"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Встроенный дисплей"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Использование внешнего дисплея"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Разрешение экрана"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Внешний дисплей отключен"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"При изменении положения или разрешения экрана запущенные приложения могут быть закрыты"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Чтобы дублировать экран, к устройству должен быть подключен внешний дисплей"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Ещё"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Чтобы изменить расположение экранов, перетащите их."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублирование"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Включить"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Проверьте пароль и повторите попытку."</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Обратитесь к производителю устройства."</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Проверьте подключение и повторите попытку."</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Эта сеть Wi-Fi сейчас недоступна"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Возникла проблема с этим QR-кодом. Попробуйте другой способ подключения."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Выбор сети"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Чтобы подключить устройство, выберите сеть."</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Подключить это устройство к сети \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Подробнее об автоповороте"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Разрешение экрана"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Высокое разрешение"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Исходное разрешение"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Исходное разрешение расходует больше заряда. При смене разрешения некоторые приложения могут перезапуститься."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Максимальное разрешение"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"При максимальном разрешении расходуется больше заряда. Когда разрешение меняется, некоторые приложения могут перезапуститься."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Выбрано"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Цвета"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральные"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Адаптивная регулировка"</string>
     <string name="brightness" msgid="6216871641021779698">"Яркость"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Адаптивная яркость"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Об адаптивной яркости"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Яркость экрана будет настраиваться автоматически в зависимости от окружающих условий и ваших действий. Дополнительно ее можно регулировать вручную, чтобы система учитывала ваши предпочтения."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Включено"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Отключено"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Настройки ночного режима"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режимы могут также включать тёмную тему.}=1{Режим \"{mode_1}\" также включает тёмную тему.}=2{Режимы \"{mode_1}\" и \"{mode_2}\" также включают тёмную тему.}=3{Режимы \"{mode_1}\", \"{mode_2}\" и \"{mode_3}\" также включают тёмную тему.}one{Режимы \"{mode_1}\", \"{mode_2}\" и ещё # также включают тёмную тему.}few{Режимы \"{mode_1}\", \"{mode_2}\" и ещё # также включают тёмную тему.}many{Режимы \"{mode_1}\", \"{mode_2}\" и ещё # также включают тёмную тему.}other{Режимы \"{mode_1}\", \"{mode_2}\" и ещё # также включают тёмную тему.}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Настройки режимов"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Яркость ниже минимума"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Дополнительное уменьшение яркости"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Разрешить уменьшать яркость экрана ниже обычного"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Время отключения экрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешить приложениям и сервисам искать устройства поблизости, даже когда Bluetooth отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Сервисы геолокации"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Сервисы геолокации"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Использовать данные о местоположении"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Использовать геолокацию для определения часового пояса"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Невозможно установить часовой пояс автоматически"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Геолокация отключена."</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Настройки геолокации"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Исправить"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Отмена"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматическое определение часового пояса отключено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Недоступно, если автоматическое определение часового пояса отключено"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Для определения часового пояса могут использоваться данные о местоположении"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Часовой пояс может определяться по информации о местоположении устройства, если она есть"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
     <string name="legal_information" msgid="7509900979811934843">"Юридическая информация"</string>
     <string name="manual" msgid="3651593989906084868">"Руководство"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Параметры"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Специальные возможности"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физическая клавиатура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Контроль повторного нажатия"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Повторные нажатия одной клавиши в течение <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мс игнорируются"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Быстро повторяющиеся нажатия одной клавиши на клавиатуре будут игнорироваться"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Интервал между повторными нажатиями"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Выберите, в течение какого времени будут игнорироваться повторные нажатия клавиши на клавиатуре."</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 сек."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 сек."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 сек."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Свой вариант"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"пользовательское значение"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Медленные клавиши"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Нажатие клавиши регистрируется по истечении заданного времени: <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мс"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Настроить длительность интервала между нажатием клавиши и назначенным на нее действием"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Залипание клавиш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Вместо того чтобы удерживать вместе все клавиши из сочетания, нажимайте их по одной"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Клавиши управления мышью"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Управлять мышью с помощью физической клавиатуры"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Управлять мышью с помощью клавиш"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Управлять указателем с помощью клавиатуры"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Прокручивать мышью в обратном направлении"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Если прокрутить вверх, страница прокрутится вниз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Поменять местами левую и правую кнопки"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Использовать левую кнопку мыши в качестве правой"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Клавиши управления мышью для устройства \"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>\""</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Для перемещения указателя мыши используйте клавиши <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>."</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Нажатие клавиши <xliff:g id="CLICK_LABEL">%s</xliff:g> соответствует нажатию левой кнопки мыши."</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Нажатие клавиши <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> соответствует нажатию и удержанию левой кнопки мыши."</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Нажатие клавиши <xliff:g id="RELEASE_LABEL">%s</xliff:g> соответствует отпусканию левой кнопки мыши."</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Нажмите клавишу <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>, чтобы включить режим прокрутки. В нем с помощью клавиш <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> можно прокручивать экран вверх, вниз, влево и вправо."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Нажатие клавиши <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> соответствует нажатию правой кнопки мыши."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Быстрые клавиши"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показать список быстрых клавиш"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавиатуры и инструменты рабочего профиля"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"По умолчанию"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сенсорная панель"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сенсорная панель и мышь"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Мышь"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Скорость указателя, жесты"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Нажатие от прикосновения"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Перетаскивание нажатием"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Нажатие на правый нижний угол"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Доп. опции: нажмите на правый нижний угол сенсорной панели"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Скорость указателя"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Нажатие тремя пальцами"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Цвет указателя"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Изменить стиль заливки на черный"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Изменить стиль заливки на зеленый"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Узнать о жестах на сенсорной панели"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"сенсорная панель, мышь, указатель мыши, прокрутить, провести по экрану, нажать правую кнопку мыши, нажать"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"нажать правую кнопку мыши, нажать"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Нажатие средней кнопки мыши"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Запустить Ассистента"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Возврат на главный экран"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Переход назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Просмотр недавних приложений"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Возврат на главный экран"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Проведите по сенсорной панели тремя пальцами вверх."</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Назад"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберите новую клавишу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Специальные возможности для физической клавиатуры"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Залипание клавиш, контроль повторного нажатия, клавиши управления мышью"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Повторный ввод символа"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Задержка перед повторным нажатием"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Скорость повторного ввода"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Повторять ввод символа, пока удерживается клавиша"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Раскладка \"<xliff:g id="IME_LABEL">%s</xliff:g>\""</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По умолчанию"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматически: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Предпросмотр"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартные настройки"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Язык"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Размер шрифта"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Размер субтитров"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стиль субтитров"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Собственные настройки"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Цвет фона"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Режим энергопотребления"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Пакеты"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Приложения работают нормально"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Рекомендуем заменить батарею"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Емкость батареи и эффективность зарядки снижены. Советуем заменить батарею."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Низкий уровень заряда батареи"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Включите режим энергосбережения, чтобы увеличить время работы от батареи."</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Продлите время работы от батареи"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Отключиться от VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Да"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Версия <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Удалить VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Сменить текущую VPN-сеть?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Настроить постоянную VPN-сеть?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"В будние дни с 09:00 до 17:00\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Мероприятия из календаря"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Режим \"{mode_1}\"}=2{Режимы \"{mode_1}\" и \"{mode_2}\"}=3{Режимы \"{mode_1}\", \"{mode_2}\" и \"{mode_3}\"}one{Режимы \"{mode_1}\", \"{mode_2}\" и ещё #}few{Режимы \"{mode_1}\", \"{mode_2}\" и ещё #}many{Режимы \"{mode_1}\", \"{mode_2}\" и ещё #}other{Режимы \"{mode_1}\", \"{mode_2}\" и ещё #}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режим может включаться автоматически}one{# режим может включаться автоматически}few{# режима могут включаться автоматически}many{# режимов могут включаться автоматически}other{# режима могут включаться автоматически}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не беспокоить}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2} {mode_3}}few{{mode_1}, {mode_2} {mode_3}}many{{mode_1}, {mode_2} {mode_3}}other{{mode_1}, {mode_2} {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ВКЛ."</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Не задано"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Отключено"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ОК"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Уведомления"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Длительность"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Сообщения, напоминания и уведомления о мероприятиях"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука (за исключением тех, для которых вы задали разрешения выше). Вы можете изменить настройки, чтобы сообщения от членов семьи, друзей и других контактов приходили со звуком."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ОК"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Настройки"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Отключить звук и отображение уведомлений"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Отключить звук уведомлений"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Уведомления будут полностью отключены. Вы сможете получать звонки только от помеченных контактов и от людей, звонящих повторно."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(выбрано)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Изменить настройки уведомлений в режиме \"Не беспокоить\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Сигналы в рабочем профиле"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Использовать звуки из личного профиля"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Использовать те же звуки, что и в личном профиле"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"После разблокировки переходить к последнему открытому экрану. На заблокированном экране уведомления не показываются. Для их просмотра проведите вниз."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокированный экран, пропустить, перейти"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Когда рабочий профиль заблокирован"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Меньше уведомлений на заблокированном экране"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"На заблокированном экране будет показываться меньше уведомлений"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Только новые уведомления на заблокированном экране"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Автоматически удалять просмотренные уведомления с заблокированного экрана"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Уведомления на заблок. экране"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Показывать все"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Показывать все"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Показывать рабочие уведомления полностью"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Скрыть конфиденциальные рабочие данные"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Выберите режим уведомлений профиля на заблокированном устройстве."</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Если вам будет поступать много уведомлений за короткое время, то устройство на две минуты понизит уровень громкости и сократит количество оповещений. Это не распространяется на звонки, будильники и важные разговоры. \n\nЧтобы увидеть уведомления, полученные в этом режиме, проведите пальцем вниз от верхнего края экрана."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Применить к рабочим профилям"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Применить для приложений в рабочем профиле"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Сгруппированные уведомления"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Включено"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Отключено"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Группировать уведомления"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Похожие уведомления будут группироваться и показываться без звука. Эти настройки уведомлений имеют приоритет над параметрами приложений."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Вспомогательные VR-сервисы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установленные приложения не запрашивали доступ для работы в качестве вспомогательного VR-сервиса."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Разрешить VR-сервису доступ к сервису \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"важные разговоры"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Нет"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ни одного}=1{1 чат}one{# чат}few{# чата}many{# чатов}other{# чата}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Настройки разговоров"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Для кого не действует режим \"Не беспокоить\""</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Даже если отключены уведомления мессенджеров и приложений для звонков, вы будете получать сообщения и вызовы от контактов, указанных здесь."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Вызовы"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Все"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Помеченные контакты"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Настройки Контактов"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Настройки помеченных контактов"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Нет"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Нет"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Будильники"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (работа)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Подождите…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Настройки приложений"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешить приложениям переопределять \"Не беспокоить\""</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Приложения, для которых не действует режим \"Не беспокоить\""</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Создание режима"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Пользовательский режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Название режима"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Укажите название режима."</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Выберите значок"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Мероприятия из календаря"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Режим сна"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Во время вождения"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Уведомления в полноэкранном режиме"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Разрешить этому приложению отправлять уведомления в полноэкранном режиме"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Разрешить этому приложению показывать уведомления в полноэкранном режиме, когда устройство заблокировано. Так приложение сможет сообщать о будильниках, входящих вызовах и других срочных уведомлениях."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Запись системных настроек"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Разрешить этому приложению изменять системные настройки от вашего имени"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Это разрешение позволяет приложению изменять системные настройки."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Управление медиафайлами"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Разрешить приложению управлять медиафайлами"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Если эта настройка включена, приложение сможет без вашего ведома изменять или удалять медиафайлы, созданные другими приложениями. Для этого у приложения должно быть разрешение на доступ к файлам и медиаконтенту."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Жесты"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Быстрое включение камеры"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Включать камеру двойным нажатием кнопки питания. Жест работает на любом экране."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Переключение на фронтальную камеру"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Режим навигации"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Обмен сообщениями по спутниковой связи"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Обмен текстовыми сообщениями по спутниковой связи включен для вашего аккаунта."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Обмен текстовыми сообщениями по спутниковой связи. Недоступен для вашего аккаунта."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Обмен сообщениями по спутниковой связи"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Об обмене сообщениями по спутниковой связи"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"спутниковый обмен сообщениями, обмен данными со спутником"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"О функции \"<xliff:g id="SUBJECT">%1$s</xliff:g>\""</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ваш аккаунт оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" позволяет обмениваться текстовыми сообщениями по спутниковой связи."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ваш тарифный план оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"В вашем аккаунте есть возможность обмениваться сообщениями по спутниковой связи"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"В вашем аккаунте есть возможность обмениваться сообщениями"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"В вашем аккаунте нет возможности обмениваться сообщениями по спутниковой связи"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Подробнее"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Как это работает"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ваш телефон автоматически подключится к спутниковой связи. Для оптимального качества соединения найдите место, где хорошо видно небо."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"После подключения телефона к спутниковой связи"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Вы можете отправлять текстовые сообщения кому угодно, в том числе экстренным службам. Ваш телефон повторно подключится к мобильной сети, когда она станет доступна."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Обмен сообщениями по спутниковой связи может занять больше времени и доступен только в некоторых регионах. На качество соединения могут влиять погода и внешние препятствия, такие как деревья, стены, мосты и здания. Звонки по спутниковой связи недоступны (кроме экстренных).\n\nМожет пройти некоторое время, прежде чем изменения в вашем аккаунте появятся в настройках. За подробными сведениями обращайтесь к своему оператору связи."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Подробнее об обмене сообщениями по спутниковой связи…"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> может занять больше времени и доступен только в некоторых регионах. На качество соединения могут влиять погода и внешние препятствия. Звонки по спутниковой связи недоступны (кроме экстренных).\n\nМожет пройти некоторое время, прежде чем изменения в вашем аккаунте появятся в настройках. За дополнительной информацией обратитесь к оператору \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g>: дополнительная информация"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Не удается включить функцию \"<xliff:g id="FUNCTION">%1$s</xliff:g>\""</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Чтобы включить функцию \"<xliff:g id="FUNCTION">%1$s</xliff:g>\", сначала отключите спутниковую связь."</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Обмен данными со спутником"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Обмен данными со спутником"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"Обмен данными со спутником"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"Спутниковый обмен сообщениями"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"В вашем аккаунте есть возможность передавать данные"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Спутниковый SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Вы можете отправлять сообщения экстренным службам без подключения к мобильной сети или Wi-Fi."</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"спутниковый sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"О спутниковом SOS"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Используйте без подключения к мобильной сети или Wi-Fi. Эта функция может быть доступна не везде и не всегда."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Позвоните или отправьте сообщение экстренным службам."</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Ответьте на вопросы о том, что случилось."</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Подключитесь к спутнику, следуя инструкциям."</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Если мобильная сеть не работает, появится предложение воспользоваться спутниковым SOS."</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Ответы будут отправляться экстренным службам, чтобы они могли оказать вам необходимую помощь."</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Когда связь будет установлена, вы сможете отправлять сообщения экстренным службам."</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Деморежим"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Когда вы обращаетесь в экстренные службы, используя спутниковую связь, ваше имя, адрес электронной почты, номер телефона, местоположение, информация об устройстве (IMEI-код, язык, модель, уровень заряда батареи) и сведения о контактах для экстренных случаев передаются этим службам и поставщикам услуг спутниковой связи. \n\nЧтобы пользоваться спутниковым SOS, выберите Google Сообщения в качестве основного приложения для обмена SMS. \n\nЕсли автоматический выбор сети отключен, он будет активирован, и устройство попытается подключиться к любой доступной сети."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Настройки доступа"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Контакты для экстренных случаев"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Ваш аккаунт Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Проверьте или обновите информацию, которая будет передана экстренным службам."</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Точки доступа"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"точка доступа"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Вы используете режим, независимый от размера страницы, с размером страницы 16 кБ. Гарантировать целостность программного обеспечения при этом невозможно. Пока разблокирован загрузчик операционной системы, любые данные, хранящиеся на телефоне, подвергаются риску. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, уменьшите размер страницы памяти до 4 кБ и заблокируйте загрузчик операционной системы. Настройки устройства при этом будут сброшены. После запуска Android отключите разблокировку загрузчика в разделе \"Для разработчиков\". Перепрошейте устройство, если оно работает нестабильно или Android на нем не запускается. Для этого используйте последние заводские образы с сайта &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; или &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt;. Затем нажмите \"Удалить данные с устройства\", \"Заблокировать загрузчик операционной системы\" и \"Принудительно прошить все разделы\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим работы, который не зависит от страниц, с размером страницы 16 кБ."</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ещё"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Запустить приложение в режиме совместимости с размером страницы"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Обработчик отчетов об ошибках"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Выбранное приложение будет запускаться при нажатии быстрой клавиши для отправки отчета об ошибке."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Личный профиль"</string>
@@ -5163,7 +5286,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Сверхширокополосная связь недоступна в вашем регионе"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Использовать Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread помогает связать устройства умного дома, повышая экономичность эффективность всей системы\n\nЕсли настройка включена, этот телефон можно присоединить к сети Thread и с него управлять устройствами с поддержкой Matter."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread помогает связать устройства умного дома, повышая эффективность всей системы.\n\nЕсли настройка включена, этот телефон можно присоединить к сети Thread и с него управлять устройствами с поддержкой Matter."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Подробнее о Thread…"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Доступ к камере"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Доступ к микрофону"</string>
@@ -5435,7 +5558,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Подключиться к потоку"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Отсканируйте QR-код аудиопотока, чтобы воспроизвести его на устройстве \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Нельзя изменить пароль во время отправки аудио. Сначала отключите ее."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Пароль должен содержать от 4 до 16 знаков. Можно использовать только буквы, цифры и символы."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Сканер QR-кодов"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Нужна помощь?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Поиск по настройкам"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакты, хранилище, аккаунт"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Контакты"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Только на устройстве"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новые контакты не будут синхронизироваться с аккаунтом"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакты будут по умолчанию сохраняться на устройстве и синхронизироваться с аккаунтом"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Не удалось выбрать аккаунт по умолчанию."</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Аккаунт по умолчанию не выбран"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Только на устройстве"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Устройство и %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Сначала добавьте аккаунт"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Куда сохранять контакты"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Обвести и найти"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Чтобы запустить поиск по экрану, нажмите и удерживайте кнопку главного экрана или маркер навигации"</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 907185d7a49..f2278b7df03 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"හිම මල්"</item>
     <item msgid="7952183800501346803">"වෙරළ කුඩය"</item>
     <item msgid="799139025758265891">"වැඩමුළු මෙවලම්"</item>
-    <item msgid="1330084588359129896">"කූඩාරම"</item>
+    <item msgid="8112685757657659269">"පියානෝව"</item>
     <item msgid="3861584909935022342">"සිනමා පටය"</item>
     <item msgid="5827426100157335512">"පොත"</item>
     <item msgid="8585828346253128384">"නෙළුම් මල"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d26e984fd5a..9ad138cea12 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"නව උපාංගය යුගල කරන්න"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"බ්ලූටූත්"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"හෙට ස්වයංක්‍රීයව ක්‍රියාත්මක කරන්න"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"ඔබ බ්ලූටූත් ක්‍රියා විරහිත කළහොත්, එය පසු දින නැවත ක්‍රියාත්මක වේ"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"දකුණු කණ යුගල කරන්න"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"වම් කණ යුගල කරන්න"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"ඔබගේ අනෙක් කණ යුගල කරන්න"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"බ්ලූටූත් LE ශ්‍රව්‍ය අබල කරන්න"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"උපාංගය LE ශ්‍රව්‍ය දෘඨාංග හැකියා වෙත සහාය දක්වන්නේ නම් බ්ලූටූත් LE ශ්‍රව්‍ය විශේෂාංගය අබල කරයි."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"බ්ලූටූත් LE ශ්‍රව්‍ය මාදිලිය"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"බ්ලූටූත් LE ශ්‍රව්‍ය විකාශන UI පෙරදසුන සබල කරන්න"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"පුද්ගලික ශ්‍රව්‍ය බෙදා ගැනීම සහ පුද්ගලික විකාශනය ඇතුළුව LE ශ්‍රව්‍ය බෙදා ගැනීමේ UI පෙරදසුන සබල කරයි"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"උපාංග විස්තරවල LE ශ්‍රව්‍ය ටොගල පෙන්වන්න"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"බ්ලූටූත් LE ශ්‍රව්‍ය ඉඩ දුන් ලැයිස්තුව මඟහරින්න"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ඉඩ දුන් ලැයිස්තුවේ නිර්ණායක සපුරාලීමට LE ශ්‍රව්‍ය පර්යන්තය සත්‍යාපනය කර නොමැති වුවත් පෙරනිමියෙන් LE ශ්‍රව්‍ය භාවිතා කරන්න."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"යෙදුම් භාෂාව"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"යෝජිත භාෂා"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"සියලු භාෂා"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"යෝජිත"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"සියලු භාෂා"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"සියලු ප්‍රදේශ"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"සියලු අංක යෙදීමේ පද්ධති"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"පද්ධති භාෂාව"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"පද්ධති පෙරනිමිය"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"මෙම යෙදුම සඳහා භාෂා තේරීම සැකසීම් වෙතින් ලබා ගත නොහැකිය."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"වෙනස් කරන්න"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s නොමැත"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"මෙම භාෂාව පද්ධති භාෂාවක් ලෙස භාවිත කළ නොහැක, නමුත් ඔබ මෙම භාෂාවට ඉතා කැමති බව යෙදුම් සහ වෙබ් අඩවිවලට දන්වා ඇත."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"සෙවීම"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"භාෂාවක් එක් කරන්න"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ප්‍රදේශ මනාපය"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"භාෂා නම ටයිප් කරන්න"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"තවත් භාෂා සැකසීම්"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"කලාපීය මනාප"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ඒකක සහ අංක මනාප සකසන්න"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"යෙදුම්වලට ඔබේ අත්දැකීම පෞද්ගලීකරණය කළ හැකි පරිදි ඒවාට ඔබේ කලාපීය මනාපයන් දැන ගැනීමට සලස්වන්න."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"යෙදුම් හැකි සෑම විටම ඔබේ කලාපීය මනාප භාවිතා කරනු ඇත."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"කලාපීය මනාප"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"උෂ්ණත්වය"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"සතියෙහි පළමු දිනය"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"අංක මනාප"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
     <string name="roaming_disable" msgid="729512894708689604">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"රෝමිං ගාස්තු අදාළ විය හැකිය."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ස්වයංක්‍රියව වේලාව සකසන්න"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ස්වයංක්‍රීයව සකසන්න"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"මෙම ටොගලය ක්‍රියාත්මක විට වේලා කලාපය සැකසීම සඳහා ස්ථානය භාවිතා කරනු ලැබේ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ස්වයංක්‍රීය දිනය සහ වේලාව"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ඔබේ ජාලය සහ රැහැන් රහිත සංඥා භාවිතයෙන් ස්වයංක්‍රීයව සකසන්න"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ස්වයංක්‍රීය වේලා කලාපය"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ඔබ අසල ඇති ජංගම ජාල මත පදනම්ව ස්වයංක්‍රීයව සකසන්න"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"තිබේ නම්, ඔබේ උපාංග ස්ථානය භාවිතයෙන් ස්වයංක්‍රීයව සකසන්න"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"පෙදෙසි පෙරනිමි භාවිත කරන්න"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"පැය 24 ආකාරය භාවිත කරන්න"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"වේලාව"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ඇඟිල්ල ඔසවා, අනතුරුව නැවත සංවේදකය ස්පර්ශ කරන්න"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ඇඟිලි සලකුණු සංවේදකය භාවිත කළ නොහැක"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"අලුත්වැඩියා සැපයුම්කරුවෙකු වෙත පැමිණෙන්න."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"තිරය ක්‍රියාවිරහිත ඇඟිලි සලකුණු අගුළු හැරීම"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"තිරය ​​ක්‍රියාවිරහිත වූ විට පවා ඇඟිලි සලකුණු අගුළු හැරීම භාවිත කරන්න"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"තිරය ​​ක්‍රියාවිරහිතයි, අගුළු ඇරීම"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"තවත් ආරක්ෂක සැකසීම්"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"කාර්යාල පැතිකඩ අගුල, සංකේතනය සහ තවත් දේ"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"සංකේතනය, අක්තපත්‍ර සහ තවත් දේ"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ඔබේ පෞද්ගලික අවකාශය සඳහා රටාවක් සකසන්න"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"අගුලු දමන්න"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"සඟවන්න"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ඔබේ රහසිගත අවකාශයේ රටාව තහවුරු කරන්න"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ඔබේ රහසිගත අවකාශයේ PIN නැවත ඇතුළු කරන්න"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ඔබේ රහසිගත අවකාශයේ මුරපදය නැවත ඇතුළු කරන්න"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ඔබට ඇඟිලි සලකුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එකතු කළ හැකිය"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ඔබ ඇඟිලි සලකුණු උපරිම සංඛ්‍යාව එක් කර ඇත"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"තවත් ඇඟිලි සලකුණු එක් කළ නොහැකිය"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"ක්‍රියාත්මකයි"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ක්‍රියාවිරහිතයි"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"බාහිර සංදර්ශකය"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"බාහිර සංදර්ශකය භාවිතා කරන්න"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"සංදර්ශක විභේදනය"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"බාහිර සංදර්ශකය විසන්ධි කර ඇත"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"කරකැවීම හෝ විභේදනය වෙනස් කිරීම දැනට ධාවනය වන ඕනෑම යෙදුමක් නැවැත්විය හැක"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"ඔබේ තිරය පිළිබිඹු කිරීමට ඔබේ උපාංගය බාහිර සංදර්ශකයකට සම්බන්ධ කළ යුතු යි"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"තවත් විකල්ප"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"සංදර්ශක නැවත සකස් කිරීමට අල්ලාගෙන අදින්න."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"දර්පණය"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"මුරපදය පරීක්ෂා කර නැවත උත්සාහ කරන්න"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"උපාංග නිෂ්පාදක අමතන්න"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"සම්බන්ධතාව පරීක්‍ෂා කර නැවත උත්සාහ කරන්න"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"මෙම Wi-Fi ජාලය දැන් ලබා ගත නොහැක"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"මෙම QR කේතය සමග ගැටළුවක් ඇත. වෙනත් ආකාරයකින් සම්බන්ධ කිරීමට උත්සාහ කරන්න."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"ජාලය තෝරන්න"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"ඔබේ උපාංගය සම්බන්ධ කිරීමට, ජාලයක් තෝරන්න"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"මෙම උපාංගය “<xliff:g id="SSID">%1$s</xliff:g>”ට එක් කරන්නේද?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ස්වයංක්‍රිය කරකැවීම ගැන තව දැන ගන්න"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"තිර විභේදනය"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ඉහළ විභේදනය"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"පූර්ණ විභේදනය"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"පූර්ණ විභේදනය ඔබේ බැටරිය වැඩියෙන් භාවිත කරයි. ඔබේ විභේදනය මාරු කිරීම සමහර යෙදුම් නැවත ආරම්භ කිරීමට හේතු විය හැක."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"තෝරා ඇත"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"වර්ණ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ස්වභාවික"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"අනුවර්තී"</string>
     <string name="brightness" msgid="6216871641021779698">"දීප්ති මට්ටම"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"අනුවර්තක දීප්තිය"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"අනුවර්තී දීප්තිය පිළිබඳව"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ඔබේ තිරයේ දීප්තිය ස්වයංක්‍රියව ඔබගේ පරිසරයට සහ ක්‍රියාකාරකම්වලට ගළපනු ඇත. අනුවර්තන දීප්තියට ඔබේ මනාප දැන ගැනීමට උදවු වීමට ඔබට ස්ලයිඩරය හස්තීයව ගෙන යාමට හැකිය."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ක්‍රියාත්මකයි"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ක්‍රියාවිරහිතයි"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"නින්දට යන වේලාවේ ප්‍රකාර සැකසීම්"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{ප්‍රකාර අඳුරු තේමාව ද සක්‍රිය කළ හැක}=1{{mode_1} අඳුරු තේමාව ද සක්‍රිය කරයි}=2{{mode_1} සහ {mode_2} අඳුරු තේමාව ද සක්‍රිය කරයි}=3{{mode_1}, {mode_2}, සහ {mode_3} අඳුරු තේමාව ද සක්‍රිය කරයි}one{{mode_1}, {mode_2}, සහ තව #ක් අඳුරු තේමාව ද සක්‍රිය කරයි}other{{mode_1}, {mode_2}, සහ තව #ක් අඳුරු තේමාව ද සක්‍රිය කරයි}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"ප්‍රකාර සැකසීම්"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"තවත් අඳුරු"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"තවත් අඳුරු"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"උපාංගයට සාමාන්‍යයට වඩා අඳුරු වීමට ඉඩ දෙන්න"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"තිර කල් ඉකුත්වීම"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ස්ථාන සේවා"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"ස්ථාන සේවා"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ස්ථානය භාවිත කරන්න"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"වේලා කලාපය සඳහා ස්ථානය භාවිත කරන්න"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"වේලා කලාපය ස්වයංක්‍රීයව සැකසිය නොහැක"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ස්ථානය හෝ ස්ථාන සේවා ක්‍රියාවිරහිතයි"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ස්ථාන සැකසීම්"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"මෙය නිරාකරණය කරන්න"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"අවලංගු කරන්න"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ස්වයංක්‍රිය වේලා කලාපය ක්‍රියාවිරහිතයි"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ස්වයංක්‍රීය වේලා කලාපය ක්‍රියාවිරහිත වූ විට ලබා ගත නොහැක"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"වේලා කලාපය සැකසීමට ස්ථානය භාවිත කරනු ලැබිය හැක"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"ඔබේ උපාංග ස්ථානය තිබේ නම්, එය ඔබේ වේලා කලාපය සැකසීමට භාවිතා කළ හැක"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"නීතිමය තොරතුරු, තත්වය, මෘදුකාංග අනුවාදය පෙන්වන්න"</string>
     <string name="legal_information" msgid="7509900979811934843">"නීතිමය තොරතුරු"</string>
     <string name="manual" msgid="3651593989906084868">"අත්පොත"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"විකල්ප"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ප්‍රවේශ්‍යතාව"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"භෞතික යතුරු පුවරුව"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"පනින යතුරු"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"යතුරුපුවරුව <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms ඇතුළත එකම යතුර නැවත නැවතත් එබීම් නොසලකා හරියි"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"යතුරු පුවරුව එකම යතුර ඉක්මනින් නැවත නැවතත් එබීම නොසලකා හරියි"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"උඩ පනින යතුරු සීමාව"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ඔබේ යතුරු පුවරුව නැවත නැවතත් යතුරු එබීම නොසලකා හරින කාල සීමාව තෝරා ගන්න"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"ත0.2"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"ත0.4"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"ත0.6"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"අභිරුචි"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"අභිරුචි අගය"</string>
     <string name="slow_keys" msgid="2891452895499690837">"මන්දගාමී යතුරු"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"යතුරු එබීම සඳහා ගතවන කාලය <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms දක්වා සකසයි"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"යතුරු එබීම සක්‍රිය වීම සඳහා එයට ගතවන කාලය සකසයි"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ඇලෙන යතුරු"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"කෙටිමං සඳහා යතුරු එකට තබා ගැනීම වෙනුවට වරකට යතුරක් ඔබන්න"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"මූසික යතුරු"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"මූසිකය පාලනය කිරීමට භෞතික යතුරු පුවරුව භාවිතා කරන්න."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"මූසික යතුරු භාවිතා කරන්න"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"දර්ශකය පාලනය කිරීමට ඔබේ යතුරු පුවරුව භාවිතා කරන්න"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"මූසික ආපස්සට අනුචලනය"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"පිටුව පහළට ගෙන යාමට ඉහළට අනුචලන කරන්න"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"වම් සහ දකුණු බොත්තම් මාරු කරන්න"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"වම් මූසික බොත්තම ඔබේ දකුණ ලෙස භාවිතා කරන්න"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> සඳහා මූසික යතුරු"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"මූසික දර්ශකය චලනය කිරීමට <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> යතුරු භාවිතා කරන්න"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"මූලික මූසික බොත්තම ක්ලික් කිරීමට <xliff:g id="CLICK_LABEL">%s</xliff:g> යතුර භාවිතා කරන්න"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"මූලික මූසික බොත්තම ඔබාගෙන සිටීමට<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> යතුර භාවිතා කරන්න"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"මූලික මූසික බොත්තම මුදා හැරීමට <xliff:g id="RELEASE_LABEL">%s</xliff:g> යතුර භාවිතා කරන්න"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"අනුචලන ප්‍රකාරය ටොගල් කිරීමට <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> යතුර භාවිතා කරන්න. මෙය <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> යතුරු දර්ශනය ඉහළට, පහළට, වමට හෝ දකුණට අනුචලනය කරයි"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ද්විතියික මූසික බොත්තම ක්ලික් කිරීමට <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> යතුර භාවිතා කරන්න"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"යතුරු පුවරු කෙටිමං"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"කෙටිමං ලැයිස්තුව පෙන්වන්න"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"කාර්යාල පැතිකඩ යතුරු පුවරු සහ මෙවලම්"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"පෙරනිමි"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ස්පර්ශ පුවරුව"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ස්පර්ශ පුවරුව සහ මූසිකය"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"මූසිකය"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"දර්ශක වේගය, අභිනයන්"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ක්ලික් කිරීමට තට්ටු කිරීම"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ඇදගෙන යාම තට්ටු කරන්න"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"පහළ-දකුණ ක්ලික් කරන්න"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"තවත් විකල්ප සඳහා ස්පර්ශ පුවරුව හි පහළ දකුණු කෙළවරේ ක්ලික් කරන්න"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"දර්ශක වේගය"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ඇඟිලි තුනේ තට්ටුවක් භාවිතා කරන්න"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"දර්ශක වර්ණය"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"දර්ශක පිරවුම් විලාසය කළු පැහැයට වෙනස් කරන්න"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"දර්ශක පිරවුම් විලාසය කොළ පැහැයට වෙනස් කරන්න"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ස්පර්ශක පුවරු අභිනයන් ඉගෙන ගන්න"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ට්‍රැක්පෑඩ්, ට්‍රැක් පෑඩ්, මූසිකය, කර්සරය, අනුචලනය, ස්වයිප්, දකුණු ක්ලික්, ක්ලික්, දර්ශකය"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"දකුණු ක්ලික් කරන්න, තට්ටු කරන්න"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"මැද ක්ලිකය"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"සහායක දියත් කරන්න"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"මුල් පිටුවට යන්න"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ආපසු යන්න"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"මෑත යෙදුම් බලන්න"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"මුල් පිටුවට යන්න"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ඔබේ ස්පර්ශපුවරුවේ ඕනෑම තැනක ඇඟිලි තුනකින් ඉහළට ස්වයිප් කරන්න"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ආපසු යන්න"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> සඳහා නව යතුරක් තෝරා ගන්න:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"භෞතික යතුරුපුවරු ප්‍රවේශ්‍යතාව"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ඇලෙන යතුරු, පනින යතුරු, මූසික යතුරු"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"පුනරාවර්තන යතුරු"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"පුනරාවර්තනයට පෙර ප්‍රමාදය"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"පුනරාවර්තන අනුපාතය"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"යතුර මුදා හරින තෙක් එහි අනුලකුණ පුනරාවර්තනය කිරීමට යතුරක් ඔබාගෙන සිටින්න"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> පිරිසැලසුම"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"පෙරනිමි"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ස්වයංක්‍රීය: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"පෙරදසුන"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"සාමාන්‍ය විකල්ප"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"භාෂාව"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"පෙළ ප්‍රමාණය"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"සිරස්තල ප්‍රමාණය"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"සිරස්තල මෝස්තරය"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"අභිරුචි විකල්ප"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"පසුබිම් වර්ණය"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"බල භාවිතය සීරුමාරු කරන්න"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"ඇතුළත් පැකේජ"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"යෙදුම් සාමාන්‍ය පරිදි ධාවනය වේ"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"බැටරි ප්‍රතිස්ථාපනය නිර්දේශිතයි"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"බැටරි ධාරිතාව සහ ආරෝපණ කාර්ය සාධනය අඩු වන අතර, බැටරිය ප්‍රතිස්ථාපනය කිරීම නිර්දේශ කරනු ලැබේ."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"බැටරි මට්ටම අඩුය"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"බැටරි ආයු කාලය දීර්ඝ කිරීමට බැටරි සුරැකුම ක්‍රියාත්මක කරන්න"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"බැටරි ආයු කාලය වැඩි දියුණු කරන්න"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"මෙම VPN එක විසන්ධි කරන්නද?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"විසන්ධි කරන්න"</string>
     <string name="vpn_version" msgid="6344167191984400976">"අනුවාදය"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"අනුවාදය <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN අමතක කරන්න"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"සැම විට ක්‍රියාත්මක VPN සකසන්නද?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"සතියේ දිනවල පෙ.ව. 9 - ප.ව. 5\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"දින දර්ශන සිදුවීම්"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} සක්‍රියයි}=2{{mode_1} සහ {mode_2} සක්‍රියයි}=3{{mode_1}, {mode_2}, සහ {mode_3} සක්‍රියයි}one{{mode_1}, {mode_2}, සහ තව #ක් සක්‍රියයි}other{{mode_1}, {mode_2}, සහ තව #ක් සක්‍රියයි}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ප්‍රකාරයක් ස්වයංක්‍රීයව ක්‍රියාත්මක විය හැක}one{ප්‍රකාර #ක් ස්වයංක්‍රීයව ක්‍රියාත්මක විය හැක}other{ප්‍රකාර #ක් ස්වයංක්‍රීයව ක්‍රියාත්මක විය හැක}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{බාධා නොකිරීම}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ක්‍රියාත්මකයි"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"සකසා නැත"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"අබලයි"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"තේරුණා"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"දැනුම්දීම්"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"කාල සීමාව"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"පණිවිඩ, සිදුවීම් සහ සිහිැඳවීම්"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"නිමයි"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"සැකසීම්"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ඔබට දැනුම්දීම් දැකීමට හෝ ඇසීමට නොලැබෙනු ඇත. තරු ලකුණු යෙදූ සම්බන්ධතා සහ පුනරාවර්තන ඇමතුම්කරුවන් වෙතින් වන ඇමතුම්වලට ඉඩ දෙනු ලැබේ."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(වත්මන් සැකසීම)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"බාධා නොකරන්න දැනුම්දීම් සැකසීම් වෙනස් කරන්නද?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"කාර්යාල පැතිකඩ හඬවල්"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"පුද්ගලික පැතිකඩ හඬ භාවිත කර."</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ඔබගේ පුද්ගලික පැතිකඩට සමාන ශබ්ද භාවිත කරන්න"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"අගුලු හැරීමෙන් පසු, අවසන් වරට භාවිත කළ තිරය වෙත කෙළින්ම යන්න. අගුලු තිරයේ දැනුම්දීම් නොපෙන්වයි. ඒවා බැලීමට ඉහළ සිට පහළට ස්වයිප් කරන්න."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"අගුළු තිරය, අගුළුතිරය, මඟහරින්න, මඟහැරයාම"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"කාර්යාල පැතිකඩ අගුලු දමා ඇති විට"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"අගුළු තිර දැනුම්දීම් අවමවාදය"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"අගුළු තිරය මත දැනුම්දීම් අඩුවෙන් පෙන්වන්න"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"අගුළු තිරයෙහි නව දැනුම්දීම් පමණක් පෙන්වන්න"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"අගුළු තිරයෙන් කලින් බැලූ දැනුම්දීම් ස්වයංක්‍රීයව ඉවත් කරන්න"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"අගුලු තිරයෙහි දැනුම් දීම්"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"සංවාද, පෙරනිමි සහ නිහඬ කරන්න පෙන්වන්න"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"සංවාද, පෙරනිමිය සහ නිහඬ පෙන්වන්න"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"සියලු කාර්යාල දැනුම්දීම් අන්තර්ගතය පෙන්වන්න"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"සංවේදී වැඩ අන්තර්ගතය සඟවන්න"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"උපාංගය අගුලු දමා ඇති විට, ඔබට පැතිකඩ දැනුම්දීම් පෙන්වීමට අවශ්‍ය කෙසේද?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"ඔබට කෙටි කාලයක් තුළ බොහෝ දැනුම්දීම් ලැබෙන විට, ඔබේ උපාංගය එහි ශබ්දය අඩු කර විනාඩි 2ක් දක්වා ඇඟවීම් අවම කරයි. ඇමතුම්, එලාම්, සහ ප්‍රමුඛතා සංවාදවලට බලපෑමක් නැත. \n\nසන්සුන් කිරීම අතරතුර ලැබෙන දැනුම්දීම් තිරයේ ඉහළ සිට පහළට ඇදීමෙන් සොයා ගත හැක."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"කාර්යාල පැතිකඩ සඳහා යොදන්න"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"කාර්යාල පැතිකඩ යෙදුම්වලට යොදන්න"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"පොදි බැඳ ඇති දැනුම්දීම්"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ක්‍රියාත්මකයි"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ක්‍රියාවිරහිතයි"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"දැනුම්දීම් පොදි බැඳීම භාවිත කරන්න"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"නිහඬ අත්දැකීමක් සඳහා සමාන තේමා සහිත දැනුම්දීම් නිහඬ කර සමූහගත කරනු ඇත. පොදි බැඳීම යෙදුමක දැනුම්දීම් සැකසීම් ප්‍රතික්ෂේප කරයි."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR උදවුකරු සේවා"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ස්ථාපිත යෙදුම් කිසිවක් VR උදවුකරු සේවා ලෙස ධාවනය කිරීමට ඉල්ලා නැත."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> සඳහා VR සේවා ප්‍රවේශය ඉඩ දෙන්නද?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ප්‍රමුඛතා සංවාද"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"කිසිවක් නැත"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{කිසිත් නැත}=1{සංවාද 1}one{සංවාද #}other{සංවාද #}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"සංවාද සැකසීම්"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"බාධා කළ හැකි අය"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"පණිවිඩ යැවීමේ හෝ ඇමතීමේ යෙදුම්වලට ඔබට දැනුම් දිය නොහැකි වුවද, ඔබ මෙහි තෝරා ගන්නා පුද්ගලයන්ට එම යෙදුම් හරහා ඔබ වෙත ළඟා විය හැකිය"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ඇමතුම්"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ඕනෑම කෙනෙක්"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"සම්බන්ධතා"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"සම්බන්ධතා සැකසීම්"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"තරු ලකුණු කළ සම්බන්ධතා සැකසීම්"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"කිසිවක් නැත"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"කිසිවක් නැත"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"ඇඟවීම්"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (කාර්යාලය)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"ගණනය කරමින්…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"යෙදුම් සැකසීම්"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ප්‍රතික්ෂේප කිරිමට යෙදුම්වලට ඉඩ දෙන්න"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"බාධා කළ හැකි යෙදුම්"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"ප්‍රකාරයක් තනන්න"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"අභිරුචි ප්‍රකාරය"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ප්‍රකාරයේ නම"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ප්‍රකාරයේ නම හිස් විය නොහැක"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"නිරූපකයක් තෝරා ගන්න"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"දින දර්ශන සිදුවීම්"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"නින්දට යන වේලාවේ දින චර්යාව"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ධාවනය කරන අතරතුර"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"පූර්ණ තිර දැනුම්දීම්"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"මෙම යෙදුමෙන් පූර්ණ තිර දැනුම්දීම්වලට ඉඩ දෙන්න"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"උපාංගය අගුළු දමා ඇති විට පූර්ණ තිරය ගන්නා දැනුම්දීම් පෙන්වීමට මෙම යෙදුමට ඉඩ දෙන්න. එලාම්, එන ඇමතුම්, හෝ වෙනත් හදිසි දැනුම්දීම් උද්දීපනය කිරීමට යෙදුම් මේවා භාවිතා කිරීමට ඉඩ ඇත."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"පද්ධති මනාප ලියන්න"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"ඔබ වෙනුවෙන් පද්ධති මනාපයන් වෙනස් කිරීමට මෙම යෙදුමට ඉඩ දෙන්න"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"මෙම අවසරය මූලික පද්ධති මනාපයන් වෙනස් කිරීමට යෙදුමකට ඉඩ දෙයි."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"මාධ්‍ය කළමනාකරණ යෙදුම්"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"මාධ්‍ය කළමනාකරණය කිරීමට යෙදුමට ඉඩ දෙන්න"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"ඉඩ දුනහොත්, ඔබෙන් ඇසීමෙන් තොරව මෙම යෙදුමට වෙනත් යෙදුම් සමග තැනූ මාධ්‍ය ගොනු වෙනස් කිරීමට හෝ මැකීමට හැකිය. ගොනු සහ මාධ්‍ය වෙත ප්‍රවේශ වීමට යෙදුමට අවසරය තිබිය යුතුය."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ඉංගිත"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"ඉක්මනින් කැමරාව විවෘත කරන්න"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"ඉක්මනින් කැමරාව විවෘත කිරීමට, බල බොත්තම දෙවරක් ඔබන්න. ඕනෑම තිරයක සිට ක්‍රියා කරයි."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"සෙල්ෆි සඳහා කැමරාව ෆ්ලිප් කරන්න"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"සංචාලනය ප්‍රකාරය"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"චන්ද්‍රිකා පණිවුඩ යැවීම"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"චන්ද්‍රිකා මඟින් කෙටි පණිවුඩ යැවීම සහ ලබා ගැනීම. ඔබේ ගිණුම සමග ඇතුළත් කර ඇත."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"චන්ද්‍රිකා මඟින් කෙටි පණිවුඩ යැවීම සහ ලබා ගැනීම. ඔබගේ ගිණුම සමග ඇතුළත් කර නැත."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"චන්ද්‍රිකා පණිවුඩ යැවීම"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"චන්ද්‍රිකා පණිවුඩ යැවීම ගැන"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"ඔබට සුදුසුකම් ලත් <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ගිණුමක කොටසක් ලෙස චන්ද්‍රිකා මඟින් කෙටි පණිවුඩ යැවීමට සහ ලැබීමට හැක"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"ඔබේ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> සැලැස්ම"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"ඔබේ ගිණුම සමග චන්ද්‍රිකා පණිවුඩ යැවීම ඇතුළත් වේ"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"ඔබේ ගිණුම සමග චන්ද්‍රිකා පණිවුඩ යැවීම ඇතුළත් නොවේ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"තව දැන ගන්න"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"එය ක්‍රියා කරන ආකාරය"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"ඔබේ දුරකථනය චන්ද්‍රිකාවකට ස්වයංක්‍රීයව සම්බන්ධ වේ. හොඳම සම්බන්ධතාව සඳහා, අහසේ පැහැදිලි දර්ශනයක් තබා ගන්න."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"ඔබේ දුරකථනය චන්ද්‍රිකාවකට සම්බන්ධ වූ පසු"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"හදිසි සේවා ඇතුළුව ඔබට ඕනෑම කෙනෙකුට කෙටි පණිවුඩයක් යැවිය හැක. පවතින විට ඔබේ දුරකථනය ජංගම ජාලයකට නැවත සම්බන්ධ වේ."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"චන්ද්‍රිකා පණිවිඩ යැවීමට වැඩි කාලයක් ගත විය හැකි අතර සමහර ප්‍රදේශවල පමණක් ලබා ගත හැක. කාලගුණය සහ ඇතැම් ව්‍යුහයන් ඔබේ චන්ද්‍රිකා සම්බන්ධතාවයට බලපෑ හැක. චන්ද්‍රිකා මගින් ඇමතීම ලබා ගත නොහැක. හදිසි අවස්ථා ඇමතුම් තවමත් සම්බන්ධ විය හැක.\n\nගිණුම් වෙනස්කම් සැකසීම් තුළ පෙන්වීමට යම් කාලයක් ගත විය හැක. විස්තර සඳහා ඔබේ වාහකය සම්බන්ධ කර ගන්න."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"චන්ද්‍රිකා පණිවුඩ යැවීම ගැන වැඩි විස්තර"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ක්‍රියාත්මක කළ නොහැක"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ක්‍රියාත්මක කිරීමට, පළමුව චන්ද්‍රිකා සම්බන්ධතාවය නිමා කරන්න"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"චන්ද්‍රිකා සබැඳුම් හැකියාව"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ප්‍රවේශ ලක්ෂ්‍ය නම්"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> වෙත සම්බන්ධ වූ විට නොමැත"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්‍රකාරයේ 16KB ප්‍රකාරයේ ය. මෙම ප්‍රකාරයේ මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුලු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තක් අවදානමට ලක් වේවි. මෙම ප්‍රකාර තුළ සමහර විශේෂාංග අබල වෙයි, එබැවින් සමහර යෙදුම් ක්‍රියා නොකරයි. නිෂ්පාදන ප්‍රකාරයට නැවත ඇතුළු වීමට, ඔබ 4KB ප්‍රකාරයට ආපසු මාරු කර උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. මෙමඟින් උපාංගයට නැවත කර්මාන්තශාලා යළි සැකසීම සිදු කරන අතර එය නිෂ්පාදන සැකසුම් වෙත ප්‍රතිසාධනය කරයි. උපාංගය සාර්ථකව Android සමග ආරම්භ වූ පසු, සංවර්ධක විකල්ප තුළ OEM අගුලු හැරීම අබල කරන්න. උපාංගය Android වෙත පණ ගැන්වීමට අපොහොසත් වුවහොත් හෝ අස්ථායී නම්, &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; වෙතින් නවතම කර්මාන්තශාලා පින්තූර සමග උපාංගය නැවත ෆ්ලෑෂ් කර; \'උපාංගය පිස දමන්න\', \'අගුළු ආරම්භකය\' සහ \'සියලුම කොටස් ෆ්ලෑෂ් කිරීමට බල කරන්න\' තෝරන්න."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB පිටු-දෘෂ්ටික ප්‍රකාරය"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"තව කියවන්න"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"පිටු ප්‍රමාණයේ සංයුක්ත ප්‍රකාරය සමග යෙදුම ධාවනය කරන්න"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"දෝෂ වාර්තා හසුරුවනය"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ඔබේ උපාංගයේ දෝෂ වර්තා කෙටිමග හසුරුවන්නේ කුමන යෙදුමදැයි තීරණය කරයි."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"පුද්ගලික"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ප්‍රවාහයට සවන් දෙන්න"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමග සවන් දීමට ශ්‍රව්‍ය ප්‍රවාහ QR කේතයක් ස්කෑන් කරන්න"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"බෙදා ගන්නා අතරේ මුරපදය සංස්කරණය කළ නොහැක. මුරපදය වෙනස් කිරීමට, පළමුව ශ්‍රව්‍ය බෙදා ගැනීම ක්‍රියාවිරහිත කරන්න."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"ඔබේ මුරපදයේ අනුලකුණු 4-16ක් අඩංගු විය යුතු අතර අකුරු, අංක සහ සංකේත පමණක් භාවිතා කළ යුතු යි"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR කේත ස්කෑනරය"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"උදවු අවශ්‍ය ද?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"සෙවීමේ සැකසීම්"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"සම්බන්ධතා, ආචයනය, ගිණුම"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"සම්බන්ධතා ආචයනය"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"උපාංගය පමණි"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"නව සම්බන්ධතා ගිණුමක් සමග සමමුහුර්ත නොවනු ඇත"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"සම්බන්ධතා ඔබේ උපාංගයට සුරකිනු ඇති අතර පෙරනිමියෙන් ඔබේ ගිණුමට සමමුහුර්ත කරනු ලැබේ"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"පෙරනිමි ගිණුම සැකසීමේ දෝෂයකි"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"පෙරනිමි සැකසීමක් නැත"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"උපාංගය පමණි"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"උපාංගය සහ %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"පටන් ගැනීමට ගිණුමක් එක් කරන්න"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"සම්බන්ධතා සුරැකිය යුතු ස්ථානය"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"සෙවීමට කවයසෙවීමට කවය අදින්න"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ඔබේ තිරයේ ඇති අන්තර්ගතය භාවිතයෙන් සෙවීමට මුල් පිටුව බොත්තම හෝ සංචලන හසුරුව ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index be2683c21b1..35ca54ccde4 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snehová vločka"</item>
     <item msgid="7952183800501346803">"Plážový slnečník"</item>
     <item msgid="799139025758265891">"Nástroje v dielni"</item>
-    <item msgid="1330084588359129896">"Stan"</item>
+    <item msgid="8112685757657659269">"Klavír"</item>
     <item msgid="3861584909935022342">"Filmový pásik"</item>
     <item msgid="5827426100157335512">"Kniha"</item>
     <item msgid="8585828346253128384">"Lotosový kvet"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b93068d8e56..f3c97619c0e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Spárovať nové zariadenie"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automaticky zapnúť zajtra"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ak Bluetooth vypnete, ďalší deň sa vždy znova zapne"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Spárovať pravé ucho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Spárovať ľavé ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Spárujte si druhé ucho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Deaktivovať Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Deaktivovať funkciu Bluetooth LE Audio, keď zariadenie podporuje možnosti hardvéru LE Audio"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Režim Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Povoliť ukážku používateľského rozhrania vysielania Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Povolí ukážku používateľského rozhrania zdieľania LE Audio vrátane zdieľania osobného zvuku a súkromného vysielania"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Zobrazovať LE Audio v podr. o zariadení"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Obchádzať zoznam povolených aplikácie Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Používať LE Audio predvolene, aj keď nebolo overené, či periféria LE Audio spĺňa kritériá zoznamu povolených"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jazyk aplikácie"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Navrhované jazyky"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Všetky jazyky"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Navrhované"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Všetky jazyky"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Všetky regióny"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Všetky systémy číslovania"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Jazyk systému"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Predvolené systémom"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Výber jazyka pre túto aplikáciu nie je v Nastaveniach k dispozícii."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Zmeniť"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nie je k dispozícii"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Tento jazyk nemôžete používať pre systém, ale môžete informovať aplikácie a weby, že ho preferujete."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Vyhľadávanie"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Pridajte jazyk"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferovaný región"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Zadajte názov jazyka"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Ďalšie nastavenia jazyka"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionálne nastavenia"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Nastavte predvoľby jednotiek a čísiel"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Keď používate regionálne nastavenia, aplikácie vám môžu prispôsobiť svoje prostredie."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikácie budú podľa možností používať vaše regionálne nastavenia."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionálne nastavenia"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Teplota"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prvý deň v týždni"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Predvoľby čísiel"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Pripájať sa k dátovým službám pri roamingu"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Pripájať sa k dátovým službám pri roamingu"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Môžu sa účtovať poplatky za roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Nastavovať čas automaticky"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Nastavovať automaticky"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Keď bude tento prepínač zapnutý, pomocou polohy sa nastaví časové pásmo"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatický dátum a čas"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Nastavovať automaticky pomocou sieťových a bezdrôtových signálov"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatické časové pásmo"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nastavovať automaticky na základe mobilných sietí v okolí"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Nastavovať automaticky pomocou polohy zariadenia, ak je k dispozícii"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používať miestny predvolený formát"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používať 24-hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Čas"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Zdvihnite prst, potom sa opäť dotknite senzora"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Senzor odtlačkov prstov nie je možné používať"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Navštívte poskytovateľa opráv."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Odomykať odtlačkom prsta pri vypnutej obrazovke"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Používajte odomknutie odtlačkom prsta aj keď je obrazovka vypnutá"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Vypnutá obrazovka, odomknutie"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Ďalšie nastavenia zabezpečenia"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zámka pracovného profilu, šifrovanie a ďalšie"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifrovanie, prihlasovacie údaje a ďalšie"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Nastavte vzor pre súkromný priestor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Uzamknutie"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Skrytie"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potvrďte vzor súkromného priestoru"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Znova zadajte PIN súkromného priestoru"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Znova zadajte heslo súkromného priestoru"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maximálny počet odtlačkov, ktoré môžete pridať: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Pridali ste maximálny počet odtlačkov prstov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nie je možné pridať ďalšie odtlačky prstov"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Zapnuté"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Vypnuté"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Externá obrazovka"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Vstavaná obrazovka"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Použiť externú obrazovku"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rozlíšenie displeja"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Externá obrazovka je odpojená"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Zmena otočenia alebo rozlíšenia môže zastaviť všetky aktuálne spustené aplikácie"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Ak chcete zrkadliť obrazovku, zariadenie musí byť pripojené k externej obrazovke"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Ďalšie možnosti"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Pridržaním a presunutím môžete usporiadať obrazovky."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prenos"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrkadlenie"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povoliť bezdrôtové zobrazenie"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Skontrolujte heslo a skúste to znova"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontaktujte výrobcu zariadenia"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Skontrolujte pripojenie a skúste to znova"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Táto sieť Wi‑Fi nie je momentálne k dispozícii"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Vyskytol sa problém s týmto QR kódom. Skúste sa pripojiť inak."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Výber siete"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Ak chcete pripojiť svoje zariadenie, vyberte sieť"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Chcete pridať toto zariadenie do siete <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Ďalšie informácie o automatickom otáčaní"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rozlíšenie obrazovky"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Vysoké rozlíšenie"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Plné rozlíšenie"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Plné rozlíšenie využíva vo väčšej miere batériu. Ak rozlíšenie prepnete, niektoré aplikácie sa môžu reštartovať."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maximálne rozlíšenie"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maximálne rozlíšenie využíva vo väčšej miere batériu. Ak rozlíšenie prepnete, niektoré aplikácie sa môžu reštartovať."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Vybrané"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farby"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodzené"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptívne"</string>
     <string name="brightness" msgid="6216871641021779698">"Úroveň jasu"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptácia jasu"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Informácie o adaptácii jasu"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Jas obrazovky sa automaticky prispôsobí prostrediu a aktivitám. Ručným posúvaním posúvača učíte adaptáciu jasu svoje preferované nastavenia."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Zapnuté"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Vypnuté"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Nastavenia režimu večierky"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Tmavý motív môžu aktivovať aj režimy}=1{Tmavý motív aktivuje aj režim {mode_1}}=2{Tmavý motív aktivujú aj režimy {mode_1} a {mode_2}}=3{Tmavý motív aktivujú aj režimy {mode_1}, {mode_2} a {mode_3}}few{Tmavý motív aktivujú aj režimy {mode_1}, {mode_2} a # ďalšie}many{{mode_1}, {mode_2}, and # more also activate dark theme}other{Tmavý motív aktivujú aj režimy {mode_1}, {mode_2} a # ďalších}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Nastavenia režimov"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ešte tmavšie"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Mimoriadne stmavenie"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Umožnite zariadeniu stmaviť sa viac ako zvyčajne"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Časový limit obrazovky"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Služby určovania polohy"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Služby určovania polohy"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Používať polohu"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Použiť polohu pre časové pásmo"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Časové pásmo sa nedá nastaviť automaticky"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Poloha alebo služby určovania polohy sú vypnuté"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Nastavenia polohy"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Opraviť"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Zrušiť"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatické zisťovanie časového pásma je vypnuté"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nie je k dispozícii, keď je automatické časové pásmo vypnuté"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Poloha sa môže použiť na nastavenie časového pásma"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ak je k dispozícii poloha zariadenia, môže sa pomocou nej nastaviť časové pásmo"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Zobrazuje právne informácie, stav a verziu softvéru"</string>
     <string name="legal_information" msgid="7509900979811934843">"Právne informácie"</string>
     <string name="manual" msgid="3651593989906084868">"Príručka"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Možnosti"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Dostupnosť"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fyzická klávesnica"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Opakované stlačenia"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klávesnica ignoruje rýchle opakované stlačenia rovnakého klávesa rýchlosťou do <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klávesnica ignoruje rýchle opakované stlačenia rovnakého klávesa"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prah opakovaného stlačenia"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Vyberte, ako dlho má klávesnica ignorovať opakované stláčanie klávesov"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Vlastné"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"vlastná hodnota"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Pomalé klávesy"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Upraví čas aktivácie po stlačení klávesa na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Upravuje čas aktivácie po stlačení klávesa"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Režim uzamknutia klávesa"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Namiesto stlačenia viacerých klávesov súčasne aktivovať skratky postupným stlačením jednotlivých klávesov"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Myš klávesnicou"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Ovládať myš pomocou fyzickej klávesnice"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Používať tlačidlá na ovládanie myši"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ovládajte kurzor pomocou klávesnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrátené posúvanie myšou"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Prechádzajte po stránke nadol posúvaním myši nahor"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vymeniť ľavé a pravé tlačidlo"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Používajte ľavé tlačidlo myši ako pravé"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Klávesy klávesnice <xliff:g id="KEYBOARD_NAME">%s</xliff:g> na ovládanie myši"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Klávesmi <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> posuniete kurzor myši"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Klávesom <xliff:g id="CLICK_LABEL">%s</xliff:g> kliknete na hlavné tlačidlo myši"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Klávesom <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> pridržíte hlavné tlačidlo myši"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Klávesom <xliff:g id="RELEASE_LABEL">%s</xliff:g> uvoľníte hlavné tlačidlo myši"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Klávesom <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> prepnete režim posúvania. Potom budete môcť klávesmi <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> posúvať zobrazenie nahor, nadol, doľava alebo doprava."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Klávesom <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> kliknete na sekundárne tlačidlo myši"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klávesové skratky"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Zobraziť zoznam skratiek"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klávesnice a nástroje pracovného profilu"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Predvolené"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad a myš"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Myš"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Rýchlosť kurzora, gestá"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Kliknutie klepnutím"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Presúvanie po klepnutí"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kliknutie vpravo dole"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliknutím v pravom dolnom rohu touchpadu zobrazíte ďalšie možnosti"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Rýchlosť kurzora"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Použitie klepnutia troma prstami"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Farba kurzora"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Zmena farby kurzora na čiernu"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Zmena farby kurzora na zelenú"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Naučiť sa gestá touchpadu"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, myš, kurzor, posúvať, potiahnuť, kliknúť pravým tlačidlom, kliknúť, ukazovateľ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kliknúť pravým tlačidlom, klepnúť"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Kliknutie stredným tlačidlom"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Spustiť Asistenta"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Prejdenie na plochu"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Prejsť späť"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Zobraziť nedávne aplikácie"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Prechod na plochu"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Kdekoľvek na touchpade potiahnite troma prstami nahor"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Prejdenie späť"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte pre <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> nový kláves:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Dostupnosť fyzickej klávesnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Režim uzamknutia klávesa, klávesy jedného stlačenia, klávesy myši"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Opakovať klávesy"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Oneskorenie pred opakovaním"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Miera opakovaní"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pri podržaní klávesa sa bude znak opakovane zadávať, dokým ho neuvoľníte"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Rozloženie <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predvolené"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automaticky: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Ukážka"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Štandardné možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jazyk"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Veľkosť textu"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veľkosť titulkov"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Štýl titulkov"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Vlastné možnosti"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Farba pozadia"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Upraviť spotrebu energie"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Zahrnuté balíčky"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikácie fungujú normálne"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Odporúča sa výmena batérie"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapacita batérie a výkon nabíjania sú obmedzené a odporúča sa výmena batérie."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Úroveň batérie je nízka"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Ak chcete predĺžiť výdrž batérie, zapnite šetrič batérie"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Zlepšite výdrž batérie"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odpojiť tento profil VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odpojiť"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzia"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Verzia <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zabudnúť profil VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Nahradiť existujúcu sieť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nastaviť sieť VPN, ktorá je vždy zapnutá?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"Od 9:00 do 17:00 cez pracovné dni"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Udalosti v kalendári"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Režim {mode_1} je aktívny}=2{Režimy {mode_1} a {mode_2} sú aktívne}=3{Režimy {mode_1}, {mode_2} a {mode_3} sú aktívne}few{Režimy {mode_1}, {mode_2} a # ďalšie sú aktívne}many{{mode_1}, {mode_2}, and # more are active}other{Režimy {mode_1}, {mode_2} a # ďalších je aktívnych}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 režim sa môže zapínať automaticky}few{# režimy sa môžu zapínať automaticky}many{# modes can turn on automatically}other{# režimov sa môže zapínať automaticky}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Režim bez vyrušení}=1{{mode_1}}=2{{mode_1}, {mode_2}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ZAPNUTÉ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nenastavené"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Deaktivované"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Dobre"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Upozornenia"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trvanie"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Správy, udalosti a pripomenutia"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Keď je zapnutý režim bez vyrušení, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Hotovo"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Nastavenia"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Upozornenia bez zobrazenia aj zvuku"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Upozornenia bez zvuku"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky. Povolené sú kontakty s hviezdičkou a opakujúci sa volajúci."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktuálne nastavenie)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Zmeniť nastavenia upozornení režimu bez vyrušení?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvuky pracovného profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Použiť zvuky osobného profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Používať rovnaké zvuky ako váš osobný profil"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Po odomknutí prejdete priamo na poslednú obrazovku. Upozornenia sa nebudú zobrazovať na uzamknutej obrazovke. Zobrazíte ich potiahnutím zhora nadol."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Uzamknutá obrazovka, preskočiť, obísť"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Keď je pracovný profil zamknutý"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalizmus upozornení na uzamknutej obrazovke"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Zobrazovať menej upozornení na uzamknutej obrazovke"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Zobrazovať na uzamknutej obrazovke iba nové upozornenia"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Automaticky odstraňovať upozornenia zobrazené v minulosti z uzamknutej obrazovky"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Upozornenia na uzamknutej obrazovke"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Zobrazovať konverzácie, predvolené aj tiché"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Zobrazovať konverzácie, predvolené aj tiché"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Zobrazovať všetok obsah pracovných upozornení"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Skryť citlivý pracovný obsah"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Akým spôsobom chcete zobrazovať profilové upozornenia na uzamknutom zariadení?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilové upozornenia"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Upozornenia"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Upozornenia aplikácií"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Keď dostanete v krátkom čase priveľa upozornení, zariadenie až na dve minúty zníži hlasitosť a minimalizuje počet upozornení. Netýka sa to hovorov, budíkov a prioritných konverzácií. \n\nUpozornenia prijaté počas režimu stlmenia zobrazíte potiahnutím zhora obrazovky nadol."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Používať na pracovné profily"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Používať na aplikácie v pracovnom profile"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Združené upozornenia"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Zapnuté"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Vypnuté"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Používať združovanie upozornení"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Upozornenia s podobnými témami budú mať vypnutý zvuk a budú zoskupené, aby ste mali tichšie prostredie. Združovanie prepíše vlastné nastavenia upozornení aplikácie."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žiadne nainštalované aplikácie nežiadali, aby boli spúšťané ako pomocné služby VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Umožniť službe VR prístup do služby <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioritné konverzácie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ž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_from_conversations_settings" msgid="2411930666794576607">"Nastavenia konverzácií"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kto môže vyrušiť"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Komunikátory a telefonické aplikácie vám nemôžu posielať upozornenia, ale ľudia, ktorých si tu vyberiete, vás môžu prostredníctvom nich kontaktovať"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hovory"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Nastavenia kontaktov"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Nastavenia kontaktov s hviezdičkou"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Žiadne"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Žiadne"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Budíky"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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ôžu vyrušiť}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (práca)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Prebieha výpočet..."</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Nastavenia aplikácií"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Povoľte aplikáciám prekonávať nastavenia"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikácie, ktoré môžu vyrušiť"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Vytvorenie režimu"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Vlastný režim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Názov režimu"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Pole pre názov režimu nemôže byť prázdne"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Vyberte ikonu"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Udalosti v kalendári"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Postup Večierka"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Počas jazdy"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Upozornenia na celej obrazovke"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Povoliť zobrazovanie upozornení z tejto aplikácie na celej obrazovke"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Povoľte tejto aplikácii zobrazovať upozornenia na celú obrazovku, keď bude zariadenie uzamknuté. Aplikácie vás môžu pomocou nich informovať o budíkoch, prichádzajúcich hovoroch a ďalších dôležitých upozorneniach."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Zápis do predvolieb systému"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Povoľte tejto aplikácii meniť predvoľby systému vo vašom mene"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Toto povolenie umožňuje aplikácii meniť základné predvoľby systému."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikácie na správu médií"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Povoliť aplikácii spravovať médiá"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ak toto nastavenie povolíte, táto aplikácia môže upravovať alebo odstraňovať súbory médií vytvorené v iných aplikáciách bez opýtania. Aplikácia musí mať povolenie na prístup k súborom a médiám."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestá"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Rýchlo spustiť kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Rýchlo otvoriť kameru dvojitým stlačením vypínača. Funguje to na každej obrazovke."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Otočiť kameru na selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Režim navigácie"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Správy cez satelit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Odosielajte a prijímajte textové správy cez satelit. Táto možnosť je zahrnutá vo vašom účte."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Odosielajte a prijímajte textové správy cez satelit. Táto možnosť nie je vo vašom účte k dispozícii."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Správy cez satelit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Správy cez satelit"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Správy cez satelit, pripojenie cez satelit"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Textová správy môžete odosielať a prijímať cez satelit, pretože váš účet <xliff:g id="CARRIER_NAME">%1$s</xliff:g> spĺňa podmienky."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Vaša tarifa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Správy cez satelit sú zahrnuté vo vašom účte"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Správy máte zahrnuté v rámci účtu"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Správy cez satelit nie sú zahrnuté vo vašom účte"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Ďalšie informácie"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Ako to funguje"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Váš telefón sa automaticky pripojí k satelitu. V záujme čo najlepšieho pripojenia choďte na miesto, odkiaľ je dobrý výhľad na oblohu."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Keď sa váš telefón pripojí k satelitu"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Textové správy môžete posielať komukoľvek, aj tiesňovej linke. Keď bude k dispozícii mobilná sieť, váš telefón sa k nej znova pripojí."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Odosielanie a prijímanie správ cez satelit môže trvať dlhšie a v niektorých oblastiach nie je k dispozícii. Počasie a určité budovy môžu mať vplyv na pripojenie cez satelit. Volanie cez satelit nie je k dispozícii. Tiesňové volania môžu byť prepojené.\n\nMôže chvíľu trvať, kým sa zmeny účtu zobrazia v Nastaveniach. Podrobnosti vám poskytne váš operátor."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Viac o správach cez satelit"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> môžu trvať dlhšie a sú k dispozícii iba v niektorých oblastiach. Počasie a určité budovy môžu mať vplyv na pripojenie cez satelit. Volanie cez satelit nie je k dispozícii. Tiesňové volania môžu byť prepojené.\n\nMôže chvíľu trvať, kým sa zmeny účtu zobrazia v Nastaveniach. Podrobnejšie informácie vám poskytne <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> – ďalšie informácie"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> sa nedá zapnúť"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Ak chcete zapnúť <xliff:g id="FUNCTION">%1$s</xliff:g>, zrušte pripojenie cez satelit"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Pripojenie cez satelit"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Pripojenie cez satelit"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"pripojení cez satelit"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"správach cez satelit"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Používanie dát máte zahrnuté v rámci účtu"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Pomoc cez satelit"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Pošlite správu tiesňovej linke, keď sa nedokážete pripojiť k mobilnej sieti alebo sieti Wi‑Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"pomoc cez satelit, pomoc"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Informácie o pomoci cez satelit"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Keď sa nedokážete pripojiť k mobilnej sieti alebo sieti Wi‑Fi, môžete poslať správu tiesňovej linke a zdieľať svoju polohu. Táto služba nemusí byť dostupná stále vo všetkých oblastiach alebo za každých okolností."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Zavolajte alebo pošlite textovú správu tiesňovej linke"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Zodpovedajte otázky o tiesňovej situácii"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Podľa pokynov sa pripojte k satelitu"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ak nemáte pripojenie k mobilnej sieti, uvidíte možnosť použiť pomoc cez satelit"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Odošlite odpovede tiesňovej linke a získajte tak správny druh pomoci"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Po pripojení si budete môcť vymieňať správy s tiesňovou linkou"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Vyskúšať ukážku"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Keď sa cez satelit spojíte s tiesňovou linkou, vaše meno, e‑mail, telefónne číslo, poloha, informácie o zariadení (IMEI, jazyk, model, stav batérie) a tiesňové kontaktné údaje sa budú zdieľať s poskytovateľmi tiesňových liniek aj satelitných služieb. \n\nAk chcete používať pomoc cez satelit, Správy Google musíte mať nastavené ako predvolenú aplikáciu na SMS. \n\nAk je automatický výber siete vypnutý, zapne sa a vaše zariadenie sa automaticky pripojí k akejkoľvek sieti."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Predvoľby zdieľania"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Tiesňové kontakty"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Váš účet Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Skontrolujte alebo aktualizujte informácie, ktoré sa budú zdieľať s tiesňovou linkou"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Názvy prístupových bodov"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ste v režime 16 kB, ktorý nezohľadňuje stránkovanie. V tomto režime nie je možné zaručiť integritu softvéru a všetky dáta uložené v telefóne môžu byť počas odomknutia zavádzacieho programu systému ohrozené. Niektoré funkcie budú v týchto režimoch vypnuté, takže určité aplikácie nemusia fungovať. Ak chcete znova prejsť do ostrého režimu, musíte prepnúť späť do režimu 4 kB a potom uzamknúť zavádzací program systému zariadenia. Tým sa v zariadení znova obnovia výrobné nastavenia na nastavenia ostrého režimu. Po úspešnom zapnutí zariadenia do Androidu vypnite odomknutie OEM v sekcii Pre vývojárov. Ak sa zariadeniu nepodarí spustiť Android alebo bude nestabilné, znova nainštalujte najnovšie výrobné obrazy systému z webu &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; alebo prejdite na &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; a vyberte Vymazať zariadenie, Uzamknúť zavádzací program systému a Vynútiť inštaláciu obrazu systému vo všetkých oddieloch."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Režim 16 kB nezohľadňujúci stránkovanie"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ďalšie informácie"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Spustiť aplikáciu v režime kompatibility s veľkosťou stránok"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Obsluha hlásení chýb"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Určuje, ktorá aplikácia vo vašom zariadení obsluhuje odkaz na hlásenie chýb."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Osobné"</string>
@@ -5435,7 +5558,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Počúvať stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Naskenujte QR kód zvukového streamu a počúvajte pomocou zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Heslo sa nedá upraviť počas zdieľania. Ak ho chcete zmeniť, najprv vypnite zdieľanie zvuku."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Heslo musí mať 4 až 16 znakov a môže obsahovať iba písmená, číslice a symboly"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Skener QR kódov"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Potrebujete pomoc?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Vyhľadávať v nastaveniach"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakty, priestor, účet"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Úložisko kontaktov"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Len senzory zariadenia"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nové kontakty sa s účtom nebudú synchronizovať"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty sa budú predvolene ukladať do zariadenia a synchronizovať s účtom"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Pri nastavovaní predvoleného účtu sa vyskytla chyba"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nie je nastavená žiadna predvolená hodnota"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Iba zariadenie"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Zariadenie a %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začnite pridaním účtu"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam ukladať kontakty"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Vyhľadávanie krúžením"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Ak chcete vyhľadávať pomocou obsahu na obrazovke, pridržte tlačidlo plochy alebo navigačnú rukoväť."</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 6d6648f20ab..06b40531769 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snežinka"</item>
     <item msgid="7952183800501346803">"Senčnik"</item>
     <item msgid="799139025758265891">"Orodja v delavnici"</item>
-    <item msgid="1330084588359129896">"Šotor"</item>
+    <item msgid="8112685757657659269">"Klavir"</item>
     <item msgid="3861584909935022342">"Filmski trak"</item>
     <item msgid="5827426100157335512">"Knjiga"</item>
     <item msgid="8585828346253128384">"Lotosov cvet"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 37ed22a1202..284a995fbc5 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Seznanitev nove naprave"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Samodejno vklopi jutri"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Če izklopite Bluetooth, se naslednji dan znova vklopi"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Seznani desno uho"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Seznani levo uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Seznanite drugo uho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Onemogoči funkcijo Bluetooth LE zvok"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Onemogoči funkcijo Bluetooth LE zvok, če naprava podpira strojno opremo za LE zvok."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Način Bluetooth LE zvok"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Omogoči predogled uporabniškega vmesnika za oddajanje po protokolu Bluetooth LE zvok"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Omogoči predogled uporabniškega vmesnika za deljenje po protokolu LE zvok, vključno z osebnim deljenjem zvoka in zasebnim oddajanjem"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Pokaži preklopnik za LE zvok v podrobnostih o napravi"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Zaobidenje seznama dovoljenih za funkcijo Bluetooth LE zvok"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Privzeta uporaba funkcije LE zvok, tudi če dodatna oprema LE zvok ni potrjena, da izpolnjuje merila za uvrstitev na seznam dovoljenih."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Jezik aplikacije"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Predlagani jeziki"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Vsi jeziki"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Predlagano"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Vsi jeziki"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Vse regije"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Vsi sistemi oštevilčevanja"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistemski jezik"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistemsko privzeto"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"V nastavitvah ni na voljo izbire jezika za to aplikacijo."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Spremeni"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Jezik »%s« ni na voljo"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Tega jezika ni mogoče uporabiti kot sistemski jezik, vendar smo aplikacijam in spletnim stranem javili, da je to vaš želeni jezik."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Išči"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dodajanje jezika"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Nastavitev območja"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Vnesite ime jezika"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Več jezikovnih nastavitev"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regijske nastavitve"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Določite nastavitve za enote in številke."</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Aplikacijam sporočite svoje regijske nastavitve, da bodo lahko prilagodile izkušnjo za vas."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacije bodo uporabile vaše regijske nastavitve povsod, kjer bo to mogoče."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regijske nastavitve"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Prvi dan v tednu"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Nastavitve številk"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami."</string>
     <string name="roaming_disable" msgid="729512894708689604">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami."</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Morda boste morali plačati stroške gostovanja."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Samodejna nastavitev ure"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Nastavi samodejno"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Ko je ta preklopnik vklopljen, bo lokacija uporabljena za nastavitev časovnega pasu."</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Samodejna datum in ura"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Samodejna nastavitev na podlagi omrežja in brezžičnih signalov"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Samodejni časovni pas"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Samodejna nastavitev na podlagi mobilnih omrežij v bližini"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Samodejna nastavitev na podlagi lokacije naprave, če je na voljo"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Uporabi privzete območne nastavitve"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Uporabi 24-urni zapis časa"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ura"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Dvignite prst in se znova dotaknite tipala."</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Tipala prstnih odtisov ni mogoče uporabiti"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Obiščite ponudnika popravil."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Odklepanje s prstnim odtisom pri izklopljenem zaslonu"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Uporaba odklepanja s prstnim odtisom tudi pri izklopljenem zaslonu"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Izklopljen zaslon, odklepanje"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Več varnostnih nastavitev"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zaklepanje delovnega profila, šifriranje in drugo"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Šifriranje, poverilnice in drugo"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Nastavite vzorec za svoj zasebni prostor"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Zaklepanje"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Skrivanje"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Potrdite vzorec za zasebni prostor"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Znova vnesite kodo PIN za zasebni prostor"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Znova vnesite geslo za zasebni prostor"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Dodate lahko do toliko prstnih odtisov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste največje dovoljeno število prstnih odtisov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Prstnih odtisov ni več mogoče dodati"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Vklopljeno"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Izklopljeno"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Zunanji zaslon"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Vgrajeni zaslon"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Uporabi zunanji zaslon"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ločljivost zaslona"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Zunanji zaslon ni povezan"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Če spremenite zasuk z vrtenjem ali ločljivost, lahko s tem ustavite vse aplikacije, ki se trenutno izvajajo"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Če želite zrcaliti zaslon, mora biti naprava povezana z zunanjim zaslonom"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Več možnosti"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Pridržite in povlecite, da prerazporedite zaslone."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Predvajanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcaljenje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogočanje brezžičnega zaslona"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Preverite geslo in poskusite znova"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Obrnite se na proizvajalca naprave"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Preverite povezavo in poskusite znova"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"To omrežje Wi-Fi trenutno ni na voljo"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Prišlo je do težave s to kodo QR. Poskusite se povezati na drug način."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Izbira omrežja"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Če želite povezati napravo, izberite omrežje"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Želite to napravo dodati v omrežje »<xliff:g id="SSID">%1$s</xliff:g>«?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Več o samodejnem zasuku"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ločljivost zaslona"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Visoka ločljivost"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Polna ločljivost"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Za polno ločljivost se porablja več energije baterije. Ob spremembi ločljivosti se bodo morda nekatere aplikacije znova zagnale."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Najvišja ločljivost"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Za najvišjo ločljivost se porablja več energije baterije. Ob spremembi ločljivosti se bodo morda nekatere aplikacije znova zagnale."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Izbrano"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barve"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naravne"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Prilagodljive"</string>
     <string name="brightness" msgid="6216871641021779698">"Raven svetlosti"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Prilagodljiva svetlost"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"O prilagodljivi svetlosti"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Svetlost zaslona se bo samodejno prilagajala glede na okolje in dejavnosti. Če želite, da funkcija za prilagodljivo svetlost hitreje spozna vaše želje, lahko ročno premaknete drsnik."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Vklopljeno"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Izklopljeno"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Nastavitve načina za spanje"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Načini lahko prav tako aktivirajo temno temo}=1{Način »{mode_1}« prav tako aktivira temno temo}=2{Načina »{mode_1}« in »{mode_2}« prav tako aktivirata temno temo}=3{Načini »{mode_1}«, »{mode_2}« in »{mode_3}« prav tako aktivirajo temno temo}one{Načina »{mode_1}« in »{mode_2}« ter še # drug način prav tako aktivirajo temno temo}two{Načina »{mode_1}« in »{mode_2}« ter še # druga načina prav tako aktivirajo temno temo}few{Načina »{mode_1}« in »{mode_2}« ter še # drugi načini prav tako aktivirajo temno temo}other{Načina »{mode_1}« in »{mode_2}« ter še # drugih načinov prav tako aktivirajo temno temo}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Nastavitve načinov"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Še temnejše"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Zelo zatemnjeno"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Dovolite, da je zaslon naprave še temnejši kot običajno"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Časovna omejitev za zaslon"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po toliko časa nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Lokacijske storitve"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Lokacijske storitve"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Uporabi lokacijo"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Uporabi lokacijo za časovni pas"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Samodejna nastavitev časovnega pasu ni mogoča"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Izklopljena lokacija ali izklopljene lokacijske storitve"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Nastavitve lokacije"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Popravi"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Prekliči"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Samodejno nastavljanje časovnega pasu je izklopljeno."</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ni na voljo, ko je samodejno nastavljanje časovnega pasu izklopljeno."</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Lokacija se lahko uporabi za nastavitev časovnega pasu."</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Če je lokacija naprave na voljo, se lahko uporabi za nastavitev časovnega pasu"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
     <string name="legal_information" msgid="7509900979811934843">"Pravne informacije"</string>
     <string name="manual" msgid="3651593989906084868">"Ročno"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Možnosti"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Dostopnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizična tipkovnica"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Izbirnik postavitve fiz. tipkovnice"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Zaznava večkratnih pritiskov tipk"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tipkovnica prezre hitro ponovljene pritiske iste tipke v <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tipkovnica prezre hitro ponovljene pritiske iste tipke"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag za prezrtje pritiskov tipk"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Izberite, kako dolgo tipkovnica prezre ponovljene pritiske tipk"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Po meri"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"vrednost po meri"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Daljši pritisk tipk"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Čas, potreben za aktiviranje pritiska tipke, prilagodi na <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Prilagoditev časa, potrebnega za aktiviranje pritiska tipke"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Zaklepanje tipk"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Za bližnjice pritisnite eno tipko hkrati namesto več tipk hkrati"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke za miško"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Upravljanje miške s fizično tipkovnico."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Uporaba tipk za miško"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Upravljanje kazalke s tipkovnico"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obratno pomikanje z miško"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Pomaknite se navzgor, če želite premakniti stran navzdol"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamenjava levega in desnega gumba"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Uporabljajte levi gumb na miški kot desnega"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tipke za miško na tipkovnici <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Za premikanje kazalca miške uporabite tipke <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Za klik glavnega gumba miške uporabite tipko <xliff:g id="CLICK_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Za pritisk in pridržanje glavnega gumba miške uporabite tipko <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Za sprostitev glavnega gumba miške uporabite tipko <xliff:g id="RELEASE_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Za preklop načina pomikanja uporabite tipko <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. S tipkami <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> boste lahko pogled pomikali navzgor, navzdol, levo ali desno."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Za klik dodatnega gumba miške uporabite tipko <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Bližnjične tipke"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaz seznama bližnjic"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tipkovnice in orodja delovnega profila"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Privzeto"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Sledilna ploščica"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Sledilna ploščica in miška"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Miška"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Hitrost kazalca, poteze"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Dotik za klik"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Vlečenje z dotikom"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klik v spodnjem desnem kotu"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Za več možnosti kliknite sledilno ploščico spodaj desno"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Hitrost kazalca"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Uporaba dotika s tremi prsti"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Barva kazalca"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"V črni slog zapolnitve kazalca"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"V zeleni slog zapolnitve kazalca"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Učenje potez na sledilni ploščici"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"sledilna ploščica, miška, kazalec, drsenje, vlečenje, desni klik, klik"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"desni klik, dotik"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Srednji klik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Zagon Pomočnika"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Na začetni zaslon"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Nazaj"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Ogled nedavnih aplikacij"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Pomik na začetni zaslon"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"S tremi prsti povlecite navzgor po sledilni ploščici."</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Pomik nazaj"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izberite novo tipko za »<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>«:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Dostopnost fizične tipkovnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Zaklepanje tipk, zaznava večkratnih pritiskov tipk, tipke za miško"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Ponavljanje vnosa s tipko"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Zakasnitev pred ponovitvijo"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Hitrost ponavljanja"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pridržite poljubno tipko, da se njen znak ponavlja, dokler je ne spustite"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Postavitev <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Privzeto"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Samodejno: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Predogled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Velikost besedila"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Velikost podnapisov"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Slog podnapisov"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Možnosti po meri"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Barva ozadja"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Prilagodi porabo energije"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Vključeni paketi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacije delujejo normalno"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Priporočena je zamenjava baterije"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Zmogljivost baterije in zmogljivost polnjenja sta zmanjšani, zato je priporočena zamenjava baterije."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Nizka raven napolnjenosti baterije"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Vklopite varčevanje z energijo baterije, da podaljšate čas delovanja baterije."</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Podaljšanje časa delovanja baterije"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Prekinitev povezave s tem omrežjem VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini povezavo"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Različica"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Različica <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Pozabi omrežje VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite zamenjati obstoječe omrežje VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ali želite, da je omrežje VPN stalno vklopljeno?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"»9.00–17.00 ob delavnikih«"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Dogodki na koledarju"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Način {mode_1} je aktiven}=2{Načina {mode_1} in {mode_2} sta aktivna}=3{Načini {mode_1}, {mode_2} in {mode_3} so aktivni}one{Načina {mode_1} in {mode_2} ter še # način so aktivni}two{Načina {mode_1} in {mode_2} ter še # načina so aktivni}few{Načina {mode_1} in {mode_2} ter še # načini so aktivni}other{Načina {mode_1} in {mode_2} ter še # načinov so aktivni}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 način se lahko samodejno vklopi}one{# način se lahko samodejno vklopi}two{# načina se lahko samodejno vklopita}few{# načini se lahko samodejno vklopijo}other{# načinov se lahko samodejno vklopi}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ne moti}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}two{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"VKLOPLJENO"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ni nastavljeno"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Onemogočeno"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Razumem"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Obvestila"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Trajanje"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Sporočila, dogodki in opomniki"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Pri vklopljenem načinu »Ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Končano"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Nastavitve"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Brez vidnega in zvočnega opozarjanja na obvestila"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Brez zvočnega opozarjanja na obvestila"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Obvestila ne bodo prikazana in ne bodo pospremljena z zvokom. Klici od stikov z zvezdico in večkratnih klicateljev so dovoljeni."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(trenutna nastavitev)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Želite spremeniti nastavitve obvestil v načinu »Ne moti«?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvoki v delovnem profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Uporabi zvoke iz osebnega profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Uporabite iste zvoke kot v osebnem profilu."</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Po odklepanju odpre nazadnje uporabljen zaslon. Obvestila ne bodo prikazana na zaklenjenem zaslonu. Za njihov ogled povlecite navzdol z vrha zaslona."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"odklepanje zaslona, zaklenjen zaslon, preskok, zaobitje"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Ko je delovni profil zaklenjen"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalen prikaz obvestil na zaklenjenem zaslonu"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Prikaz manj obvestil na zaklenjenem zaslonu"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Na zaklenjenem zaslonu prikaži samo nova obvestila"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Že ogledana obvestila samodejno odstrani z zaklenjenega zaslona."</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Obvestila na zaklenjenem zaslonu"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Prikaži pogovore ter privzeta in tiha obvestila."</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Prikaži obvestila za privzeto in tiho v razdelku Pogovori."</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Pokaži vso vsebino obvestil za delovni profil."</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Skrij občutljivo vsebino za delovni profil."</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kako naj se obvestila o profilu prikazujejo, ko je naprava zaklenjena?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Obvestila o profilu"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Obvestila"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Obvestila aplikacij"</string>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Ko v kratkem času prejmete veliko obvestil, naprava zmanjša glasnost in minimira opozorila za največ dve minuti. To ne vpliva na klice, alarme in prednostne pogovore. \n\nObvestila, ki jih prejmete med utišanjem, si lahko ogledate tako, da z vrha zaslona povlečete navzdol."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Uporaba za delovne profile"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Uporabi za aplikacije v delovnem profilu"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Združena obvestila"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Vklopljeno"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Izklopljeno"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Uporaba združevanja obvestil"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Obvestila s podobnimi temami bodo utišana in združena, da bo izkušnja tišja. Združevanje bo preglasilo nastavitve obvestil v aplikaciji."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Storitve za pomoč za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nobena nameščena aplikacija ni zahtevala izvajanja kot storitev za pomoč za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Dovolite storitvi <xliff:g id="SERVICE">%1$s</xliff:g> dostop do storitve za VR?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prednostni pogovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Nastavitve pogovorov"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo lahko preglasi"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Tudi če vam aplikacije za sporočanje ali klicanje ne morejo poslati obvestila, boste za osebe, ki jih tukaj izberete, kljub temu dosegljivi prek teh aplikacij."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Klici"</string>
@@ -3826,6 +3899,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Nastavitve stikov"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Nastavitve stikov z zvezdico"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Noben klic"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Nihče"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Preglasitev ni dovoljena za nobeno aplikacijo}=1{Preglasitev je dovoljena za aplikacijo {app_1}}=2{Preglasitev je dovoljena za aplikaciji {app_1} in {app_2}}=3{Preglasitev je dovoljena za aplikacije {app_1}, {app_2} in {app_3}}one{Preglasitev je dovoljena za aplikaciji {app_1} in {app_2} ter še # aplikacijo}two{Preglasitev je dovoljena za aplikaciji {app_1} in {app_2} ter še # aplikaciji}few{Preglasitev je dovoljena za aplikaciji {app_1} in {app_2} ter še # aplikacije}other{Preglasitev je dovoljena za aplikaciji {app_1} in {app_2} ter še # aplikacij}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (delo)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Izračunavanje …"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Nastavitve aplikacij"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Aplikacijam dovoli preglasitev"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacije, ki lahko preglasijo"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Ustvarjanje načina"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Način po meri"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Ime načina"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Ime načina ne sme biti prazno"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Izberite ikono"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Dogodki na koledarju"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina za spanje"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Med vožnjo"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Celozaslonska obvestila"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Dovoli celozaslonska obvestila te aplikacije"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Dovolite, da ta aplikacija prikazuje obvestila, ki zavzamejo celoten zaslon, ko je naprava zaklenjena. Aplikacije lahko z njimi izpostavijo alarme, dohodne klice ali druga nujna obvestila."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Zapisovanje sistemskih nastavitev"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Tej aplikaciji dovolite spreminjanje sistemskih nastavitev v vašem imenu"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"To dovoljenje aplikaciji dovoljuje spreminjanje osnovnih sistemskih nastavitev."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacije za upravljanje predstavnosti"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Aplikaciji dovoli upravljanje predstavnosti"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Pri vklopljenem dovoljenju lahko ta aplikacija brez vaše vednosti spreminja ali briše predstavnostne datoteke, ustvarjene z drugimi aplikacijami. Aplikacija mora imeti dovoljenje za dostop do datotek in predstavnosti."</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Poteze"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Hitro odpiranje fotoaparata"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Če želite hitro odpreti fotoaparat, dvakrat pritisnite gumb za vklop. Deluje na vsakem zaslonu."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Zasuk fotoaparata za selfije"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Način krmarjenja"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satelitska sporočila"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Pošiljanje in prejemanje sporočil po satelitski povezavi. Je vključeno v vašem računu."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Pošiljanje in prejemanje sporočil po satelitski povezavi. Ni vključeno v vašem računu."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satelitska sporočila"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"O satelitskih sporočilih"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satelitska sporočila, povezljivost s sateliti"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"O <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Sporočila lahko pošiljate in prejemate po satelitski povezavi v sklopu ustreznega računa pri operaterju <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Vaš paket pri operaterju <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satelitska sporočila so vključena v vašem računu"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Sporočila so vključena v vašem računu"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satelitska sporočila niso vključena v vašem računu"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Več o tem"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Kako deluje"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefon se bo samodejno povezal s satelitom. Za najboljšo povezavo zagotovite neoviran pogled v nebo."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Po vzpostavitvi povezave telefona s satelitom"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Sporočilo lahko pošljete vsakomur, tudi reševalnim službam. Telefon se bo znova povezal z mobilnim omrežjem, ko bo to na voljo."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Izmenjava satelitskih sporočil morda traja dalj časa in je na voljo le na nekaterih območjih. Vreme in nekatere ovire lahko vplivajo na satelitsko povezavo. Klicanje po satelitski povezavi ni na voljo. Klici v sili bodo morda kljub temu izvedljivi.\n\nMorda bo trajalo nekaj časa, preden bodo spremembe računa prikazane v nastavitvah. Za podrobnejše informacije se obrnite na operaterja."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Več o satelitskih sporočilih"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Pri <xliff:g id="SUBJECT">%1$s</xliff:g> izmenjava sporočil morda traja dalj časa in je na voljo le na nekaterih območjih. Vreme in nekatere ovire lahko vplivajo na satelitsko povezavo. Klicanje po satelitski povezavi ni na voljo. Klici v sili bodo morda kljub temu izvedljivi.\n\nMorda bo trajalo nekaj časa, preden bodo spremembe računa prikazane v nastavitvah. Za podrobnosti se obrnite na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Več o <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Funkcije <xliff:g id="FUNCTION">%1$s</xliff:g> ni mogoče vklopiti"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Če želite vklopiti funkcijo <xliff:g id="FUNCTION">%1$s</xliff:g>, najprej prekinite satelitsko povezavo"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Povezljivost s sateliti"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Povezljivost s sateliti"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"povezljivosti s sateliti"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satelitskih sporočilih"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Prenos podatkov je vključen v vašem računu"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS prek satelita"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Pošiljanje sporočil reševalnim službam, ko se ne morete povezati z mobilnim omrežjem ali omrežjem Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS prek satelita, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"O funkciji SOS prek satelita"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Reševalnim službam lahko pošiljate sporočila in z njimi delite svojo lokacijo, ko se ne morete povezati z mobilnim omrežjem ali omrežjem Wi-Fi. Ta storitev morda ni na voljo vedno na vseh lokacijah ali v vseh okoliščinah."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Pokličite reševalne službe ali jim pošljite sporočilo"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Odgovorite na vprašanja o nujnem primeru"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Uporabite postopek za povezavo s satelitom"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Če nimate mobilnega omrežja, je prikazana možnost uporabe funkcije SOS prek satelita"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Pošljite odgovore reševalnim službam, da boste prejeli ustrezno pomoč"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Ko ste povezani, lahko reševalnim službam pošiljate sporočila"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Preizkusite predstavitev"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Ko se z reševalnimi službami povežete prek satelita, se vaše ime, e-poštni naslov, telefonska številka, lokacija, podatki o napravi (IMEI, jezik, model, raven napolnjenosti baterije) in podatki o stikih za nujne primere delijo z reševalnimi službami in ponudniki satelitskih storitev. \n\nČe želite uporabljati SOS prek satelita, mora biti aplikacija Google Sporočila vaša privzeta aplikacija za sporočila SMS. \n\nČe je samodejna izbira omrežja izklopljena, bo vklopljena in naprava se bo samodejno povezala s poljubnim omrežjem."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Nastavitve deljenja"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Stiki za nujne primere"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Vaš račun Google"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Preglejte ali posodobite podatke, ki se bodo delili z reševalnimi službami"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Imena dostopnih točk"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4913,7 +5031,7 @@
     <string name="network_connection_connecting_message" msgid="433189540877274889">"Vzpostavljanje povezave z napravo …"</string>
     <string name="bluetooth_left_name" msgid="7440064067910080502">"Levo"</string>
     <string name="bluetooth_right_name" msgid="7588088072444124949">"Desno"</string>
-    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Ovitek"</string>
+    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Škatlica"</string>
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterija"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Podokno nastavitev"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogoči okna svobodne oblike"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ste v 16-kilobajtnem načinu načina, neodvisnega od velikosti strani. Celovitosti programske opreme v tem načinu ni mogoče zajamčiti in vsi podatki, shranjeni v telefonu, medtem ko je zagonski nalagalnik odklenjen, so morda ogroženi. V teh načinih bodo nekatere funkcije onemogočene, zato nekatere aplikacije morda ne bodo delovale. Če se želite vrniti v način za splošno razpoložljivost, morate preklopiti nazaj na 4-kilobajtni način, nato pa morate zakleniti zagonski nalagalnik naprave. S tem napravo znova ponastavite na tovarniške nastavitve in jo povrnete na nastavitve za splošno razpoložljivost. Ko se naprava uspešno zažene v sistemu Android, v možnostih za razvijalce onemogočite odklepanje OEM. Če se napravi ne uspe zagnati v sistemu Android ali ni stabilna, jo znova posodobite z najnovejšimi tovarniškimi slikami z naslova &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ali uporabite &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; in izberite možnosti »Wipe Device« (Izbriši podatke v napravi), »Lock Bootloader« (Zakleni zagonski nalagalnik) in »Force Flash all partitions« (Vsili posodobitev vseh particij)."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16-kilobajtni način za neodvisno velikost strani"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Več o tem"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Zaženi aplikacijo v združljivostnem načinu za velikost pomnilniške strani"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Rutina za obravnavo poročila o napakah"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Določa, katera aplikacija obravnava bližnjico za poročilo o napakah v napravi."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Osebno"</string>
@@ -5435,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Poslušaj pretočno predvajanje"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Optično preberite kodo QR pretočnega predvajanja zvoka, če želite poslušati z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Gesla ni mogoče urejati med deljenjem. Če želite spremeniti geslo, najprej izklopite deljenje zvoka."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Geslo mora vsebovati od 4 do 16 znakov, in sicer samo črke, številke in simbole"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Optični bralnik kod QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Potrebujete pomoč?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Iskanje po nastavitvah"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"stiki, shramba, račun"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Shramba za stike"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Samo v napravi"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi stiki ne bodo sinhronizirani z računom"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Stiki bodo privzeto shranjeni v napravi in sinhronizirani z računom"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Napaka pri nastavljanju privzetega računa"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nastavljen ni noben privzeti račun"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo v napravi"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Naprava in %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Za začetek dodajte račun"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam želite shraniti stike"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Iskanje z obkroževanjem"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Za iskanje po vsebini zaslona pridržite gumb za začetni zaslon ali ročico za pomikanje."</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 9666f3ca586..2e8a1322282 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Flok dëbore"</item>
     <item msgid="7952183800501346803">"Çadër plazhi"</item>
     <item msgid="799139025758265891">"Vegla punishteje"</item>
-    <item msgid="1330084588359129896">"Tendë"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Bobina e filmit"</item>
     <item msgid="5827426100157335512">"Libër"</item>
     <item msgid="8585828346253128384">"Zambak uji"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 78e91e9f6ec..6d2e49a89f0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Çifto pajisjen e re"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth-i"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivizo automatikisht nesër"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Nëse çaktivizon Bluetooth-in, ai aktivizohet sërish nesër"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Çifto anën e djathtë"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Çifto anën e majtë"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Çifto anën tjetër"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Çaktivizo Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Çaktivizon veçorinë Bluetooth LE Audio nëse pajisja mbështet aftësitë e harduerit të LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Modaliteti i Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Aktivizo pamjen paraprake të ndërfaqes së përdoruesit për transmetimin me Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Aktivizon pamjen paraprake ë ndërfaqes së përdoruesit për ndarjen me LE Audio, duke përfshirë ndarjen e audios personale dhe transmetimit privat"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Shfaq çelësin për LE Audio te \"Detajet e pajisjes\""</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Anashkalo \"Listën e lejimeve\" të Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Përdor LE Audio si parazgjedhje edhe nëse LE Audio periferike nuk është verifikuar se i ka plotësuar kriteret e \"Listës së lejimeve\"."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Gjuha e aplikacionit"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Gjuhët e sugjeruara"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Të gjitha gjuhët"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Të sugjeruara"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Të gjitha gjuhët"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Të gjitha rajonet"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Të gjitha sistemet e numrave"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Gjuha e sistemit"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Parazgjedhja e sistemit"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Zgjedhja e gjuhës për këtë aplikacion nuk ofrohet nga \"Cilësimet\"."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Ndrysho"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s nuk ofrohet"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Kjo gjuhë nuk mund të përdoret si një gjuhë sistemi, por ti i ke informuar aplikacionet dhe uebsajtet që preferon këtë gjuhë."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Kërko"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Shto një gjuhë"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Preferenca e rajonit"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Shkruaj emrin e gjuhës"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Cilësime të tjera të gjuhës"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Preferencat rajonale"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Cakto njësitë dhe preferencat e numrave"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Tregoju aplikacioneve preferencat e tua rajonale në mënyrë që të personalizojnë përvojën tënde."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Aplikacionet do të përdorin preferencat e tua rajonale atje ku është e mundur."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Preferencat rajonale"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Dita e parë e javës"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Preferencat e numrave"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Lidhu me shërbimet e të dhënave kur je në roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Lidhu me shërbimet e të dhënave kur je në roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Mund të zbatohen tarifat e roaming-ut."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Cakto automatikisht orën"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Cakto automatikisht"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Kur ky çelës është aktiv, vendndodhja do të përdoret për caktimin e brezit orar"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Data dhe ora automatike"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Cakto automatikisht duke përdorur sinjalet e rrjetit dhe ato wireless"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Brezi orar automatik"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Cakto automatikisht bazuar në rrjetet celulare pranë teje"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Cakto automatikisht duke përdorur vendndodhjen e pajisjes sate, nëse ofrohet"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Përdor parazgjedhjen e lokalitetit"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Përdor formatin 24-orësh"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ora"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Ngrije gishtin dhe më pas preke përsëri sensorin"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Sensori i gjurmës së gishtit nuk mund të përdoret"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Vizito një ofrues të shërbimit të riparimit."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"\"Shkyçja me gjurmën e gishtit\" për ekranin joaktiv"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Përdor \"Shkyçjen me gjurmën e gishtit\" edhe kur ekrani është joaktiv"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekrani joaktiv, shkyç"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Cilësime të tjera të sigurisë"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Kyçja e profilit të punës, enkriptimi dhe të tjera"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Enkriptimi, kredencialet dhe të tjera"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Cakto motiv për hapësirën private"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kyç"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Fshih"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Konfirmo motivin e hapësirës sate private"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Fut përsëri kodin PIN të hapësirës sate private"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Fut përsëri fjalëkalimin e hapësirës sate private"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> gjurmë gishtash"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ke shtuar numrin maksimal të gjurmëve të gishtave"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nuk mund të shtohen gjurmë të tjera të gishtave"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Aktiv"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Joaktiv"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ekrani i jashtëm"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Përdor ekranin e jashtëm"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Rezolucioni i ekranit"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ekrani i jashtëm është shkëputur"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Ndryshimi i rrotullimit ose rezolucionit mund të ndalojë çdo aplikacion që është aktualisht në funksionim"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Pajisja jote duhet të lidhet me një ekran të jashtëm për të pasqyruar ekranin tënd"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Opsione të tjera"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Mbaj shtypur dhe zvarrit për të risistemuar ekranet."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmetimi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"pasqyro"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivizo ekranin wireless"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Kontrollo fjalëkalimin dhe provo përsëri"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakto me prodhuesin e pajisjes"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Kontrollo lidhjen dhe provo përsëri"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ky rrjet Wi‑Fi nuk ofrohet për momentin"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ka një problem me këtë kod QR. Provo të lidhesh në një mënyrë tjetër."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Zgjidh rrjetin"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Për të lidhur pajisjen, zgjidh një rrjet"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Të shtohet kjo pajisje te “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Mëso më shumë për rrotullimin automatik"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Rezolucioni i ekranit"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Rezolucion i lartë"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Rezolucion i plotë"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Rezolucioni i plotë përdor më shumë bateri. Ndryshimi i rezolucionit mund të shkaktojë rinisjen e disa aplikacioneve."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Zgjedhur"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Ngjyrat"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natyrale"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Me përshtatje"</string>
     <string name="brightness" msgid="6216871641021779698">"Niveli i ndriçimit"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Ndriçimi me përshtatje"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Rreth ndriçimit me përshtatje"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ndriçimi i ekranit tënd do t\'i përshtatet automatikisht mjedisit dhe aktiviteteve të tua. Mund ta lëvizësh rrëshqitësin manualisht për të ndihmuar ndriçimin me përshtatje që të mësojë preferencat e tua."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Aktiv"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Joaktiv"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Cilësimet e modalitetit të \"Orarit të gjumit\""</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modalitetet mund të aktivizojnë gjithashtu temën e errët}=1{\"{mode_1}\" aktivizon gjithashtu temën e errët}=2{\"{mode_1}\" dhe \"{mode_2}\" aktivizojnë gjithashtu temën e errët}=3{\"{mode_1}\", \"{mode_2}\" dhe \"{mode_3}\" aktivizojnë gjithashtu temën e errët}other{\"{mode_1}\", \"{mode_2}\" dhe # tjetër aktivizojnë gjithashtu temën e errët}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Cilësimet e modaliteteve"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Edhe më i zbehtë"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Shumë më i zbehtë"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Lejo që ekrani i pajisjes të zbehet më shumë se zakonisht"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Koha e pritjes së ekranit"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -1623,7 +1650,7 @@
     <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-i është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar veçoritë dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Shërbimet e vendndodhjes"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Shërbimet e vendndodhjes"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Përdor vendndodhjen"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Përdor vendndodhjen për brezin orar"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Brezi orar nuk mund të caktohet automatikisht"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"\"Vendndodhja\" ose \"Shërbimet e vendndodhjes\" janë joaktive"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Cilësimet e vendndodhjes"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Rregulloje këtë"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Anulo"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Brezi orar automatik është joaktiv"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Nuk ofrohet kur brezi orar automatik është joaktiv"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Vendndodhja mund të përdoret për të caktuar brezin orar"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Nëse ofrohet vendndodhja e pajisjes sate, ajo mund të përdoret për të caktuar brezin tënd orar."</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Shiko informacionin ligjor, statusin dhe versionin e softuerit"</string>
     <string name="legal_information" msgid="7509900979811934843">"Informacioni ligjor"</string>
     <string name="manual" msgid="3651593989906084868">"Manuale"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Opsionet"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Qasshmëria"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tastiera fizike"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Tastet e përsëritura"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tastiera i shpërfill shtypjet e shpejta të përsëritura të të njëjtit tast brenda <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastiera i shpërfill shtypjet e shpejta të përsëritura të të njëjtit tast"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Pragu për tastet e përsëritura"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Zgjidh kohëzgjatjen e shpërfilljes së shtypjeve të përsëritura të tasteve nga tastiera jote"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 sek."</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 sek."</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 sek."</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"E personalizuar"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"Vlerë e personalizuar"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tastet e ngadalta"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Rregullon kohën që duhet për aktivizimin e një shtypjeje tasti në <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Rregullon kohën që duhet për aktivizimin e një shtypjeje tasti"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tastet e përhershme"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Shtyp vetëm një tast në një moment për shkurtoret në vend që t\'i mbash shtypur bashkë tastet"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Butonat e miut"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Përdor tastierën fizike për të kontrolluar miun."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Përdor tastet e miut"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Përdor tastierën për të kontrolluar treguesin"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Lëvizja e miut në të kundërt"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Lëviz lart për ta zhvendosur faqen poshtë"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Ndërro butonin e majtë dhe të djathtë"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Përdor butonin e majtë të miut si buton të djathtë"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Tastet e miut për <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Përdor tastet <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> për të zhvendosur treguesin e miut"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Përdor tastin <xliff:g id="CLICK_LABEL">%s</xliff:g> për të klikuar butonin kryesor të miut"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Përdor tastin <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> për të shtypur dhe mbajtur shtypur butonin kryesor të miut"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Përdor tastin <xliff:g id="RELEASE_LABEL">%s</xliff:g> për të lëshuar butonin kryesor të miut"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Përdor tastin <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> për të aktivizuar/çaktivizuar modalitetin e lëvizjes. Kjo do të bëjë që tastet <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> ta lëvizin pamjen lart, poshtë, majtas ose djathtas"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Përdor tastin <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> për të klikuar te butoni dytësor i miut"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Shkurtoret e tastierës"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Shfaq listën e shkurtoreve"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastierat dhe veglat e profilit të punës"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Parazgjedhja"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Blloku me prekje"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Blloku me prekje dhe miu"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Miu"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Shpejtësia e treguesit, gjestet"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Trokit për të klikuar"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Zvarritja me trokitje"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klikimi në këndin poshtë djathtas"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Kliko te këndi poshtë djathtas i bllokut me prekje për më shumë opsione"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Shpejtësia e treguesit"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Përdor trokitjen me tre gishta"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Ngjyra e treguesit"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Ndrysho stilin e mbushjes së treguesit në të zezë"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Ndrysho stilin e mbushjes së treguesit në jeshile"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Mëso gjestet e bllokut me prekje"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"blloku i prekjes, bllok i prekjes, miu, kursori, lëviz, rrëshqit shpejt, kliko më të djathtin, kliko, treguesi"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"kliko me të djathtin, trokit"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Klikimi në mes"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Hap \"Asistentin\""</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Shko tek ekrani bazë"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Kthehu prapa"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Shiko aplikacionet e fundit"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Shko tek ekrani bazë"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Rrëshqit lart me tre gishta kudo në bllokun tënd me prekje"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Kthehu prapa"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Zgjidh një çelës të ri për <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Qasshmëria për tastierën fizike"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tastet e përhershme, tastet e përsëritura, tastet e miut"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Përsërit tastet"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Vonesa përpara përsëritjes"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Shpejtësia e përsëritjes"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Mbaj shtypur një tast për të përsëritur karakterin e tij derisa të lëshohet tasti"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Struktura e <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"E parazgjedhur"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Shikim paraprak"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opsionet standarde"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Gjuha"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Madhësia e tekstit"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Madhësia e titrave"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stili i titrave"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Personalizo opsionet"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Ngjyra e sfondit"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Rregullo përdorimin e energjisë"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paketat e përfshira"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Aplikacionet po funksionojnë normalisht"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Rekomandohet zëvendësimi i baterisë"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Kapaciteti i baterisë dhe performanca e karikimit janë reduktuar dhe rekomandohet zëvendësimi i baterisë."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Niveli i baterisë është i ulët"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Aktivizo \"Kursyesin e baterisë\" për të rritur kohëzgjatjen e baterisë"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Përmirëso kohëzgjatjen e baterisë"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Shkëpute këtë rrjet VPN"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Shkëpute"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versioni"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versioni <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Harroje rrjetin VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Të zëvendësohet rrjeti ekzistues VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Të caktohet rrjeti VPN gjithmonë aktiv?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00 - 17:00 në ditë jave\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Ngjarjet e kalendarit"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Modaliteti \"{mode_1}\" është aktiv}=2{Modalitetet \"{mode_1}\" dhe \"{mode_2}\" janë aktive}=3{Modalitetet \"{mode_1}\", \"{mode_2}\" dhe \"{mode_3}\" janë aktive}other{Modalitetet \"{mode_1}\", \"{mode_2}\" dhe # të tjera janë aktive}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 modalitet mund të aktivizohet automatikisht}other{# modalitete mund të aktivizohen automatikisht}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Mos shqetëso}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AKTIV"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Nuk është caktuar"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Çaktivizuar"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"E kuptova"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Njoftimet"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Kohëzgjatja"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mesazhet, ngjarjet dhe alarmet rikujtuese"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"U krye"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Cilësimet"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Asnjë pamje apo tingull nga njoftimet"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Asnjë tingull nga njoftimet"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Nuk do të shohësh apo dëgjosh njoftime. Lejohen telefonatat nga kontaktet me yll dhe telefonuesit e përsëritur."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Cilësimet aktuale)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Të ndryshohen cilësimet e njoftimeve të modalitetit \"Mos shqetëso\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Tingujt e profilit të punës"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Përdor tingujt e profilit personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Përdor tinguj të njëjtë si të profilit tënd personal"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Pas shkyçjes, shko drejtpërdrejt tek ekrani i fundit i përdorur. Njoftimet nuk do të shfaqen në ekranin e kyçjes. Rrëshqit poshtë për t\'i parë."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekrani i kyçjes, ekrani i bllokimit, kapërce, anashkalo"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kur profili i punës është i kyçur"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Minimalizmi i njoftimeve të ekranit të kyçjes"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Shfaq më pak njoftime në ekranin e kyçjes"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Shfaq vetëm njoftimet e reja në ekranin e kyçjes"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Hiq automatikisht njoftimet e shikuara më parë nga ekrani i kyçjes"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Njoftimet në ekranin e kyçjes"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Shfaq bisedat, të parazgjedhura dhe të heshtura"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Shfaq bisedat, të parazgjedhura dhe të heshtura"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Shfaq të gjitha përmbajtjet e njoftimeve të punës"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Fshih përmbajtjet delikate të punës"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kur pajisja jote të jetë e kyçur, si dëshiron të shfaqen njoftimet e profilit?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Njoftimet e profilit"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Njoftimet"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Njoftimet e apl."</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kur merr shumë njoftime brenda një kohe të shkurtër, pajisja jote do të ulë volumin dhe do të minimizojë sinjalizimet për deri në 2 minuta. Telefonatat, alarmet dhe bisedat me përparësi nuk do të ndikohen. \n\nNjoftimet e marra gjatë reduktimit mund të gjenden duke tërhequr poshtë nga kreu i ekranit."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Zbato në profilet e punës"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Zbato për aplikacionet e profilit të punës"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Njoftimet e grupuara"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Aktiv"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Joaktiv"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Përdor grupimin e njoftimeve"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Njoftimet me tema të ngjashme do të vendosen në heshtje dhe do të grupohen për një përvojë më të qetë. Grupimi do t\'i anulojë cilësimet e njoftimeve të një aplikacioni."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Shërbimet e ndihmësit VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asnjë aplikacion i instaluar nuk ka kërkuar të ekzekutohet si shërbim ndihmësi VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Të lejohet qasja e shërbimit VR për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"biseda me përparësi"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Asnjë"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Asnjë}=1{1 bisedë}other{# biseda}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Cilësimet e bisedave"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kush mund ta ndërpresë"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Edhe nëse aplikacionet e mesazheve apo të telefonatave nuk mund të të njoftojnë, personat që ti zgjedh këtu mund të të kontaktojnë nëpërmjet këtyre aplikacioneve"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Telefonata"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Cilësimet e kontakteve"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Cilësimet e kontakteve të shënuara me yll"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Asnjë"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Asnjë"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmet"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Asnjë aplikacion nuk mund ta ndërpresë}=1{{app_1} mund ta ndërpresë}=2{{app_1} dhe {app_2} mund ta ndërpresin}=3{{app_1}, {app_2} dhe {app_3} mund ta ndërpresin}other{{app_1}, {app_2} dhe # aplikacione të tjera mund ta ndërpresin}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Puna)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Po llogaritet…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Cilësimet e aplikacioneve"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Lejo aplikacionet ta anulojnë"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikacionet që mund ta ndërpresin"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Krijo një modalitet"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modaliteti i personalizuar"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Emri i modalitetit"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Emri i modalitetit nuk mund të jetë bosh"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Zgjidh një ikonë"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Ngjarjet e kalendarit"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina e orarit të gjumit"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Kur lëviz me makinë"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Njoftimet në ekran të plotë"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Të lejohen njoftimet në ekran të plotë nga ky aplikacion"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Lejo këtë aplikacion të shfaqë njoftime që zënë ekranin e plotë kur pajisja është e kyçur. Aplikacionet mund t’i përdorin këto për të vendosur në fokus alarmet, telefonatat hyrëse apo njoftimet e tjera urgjente."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Të shkruajë preferencat për sistemin"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Lejo që ky aplikacion të modifikojë preferencat e sistemit në emrin tënd"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Kjo leje e lejon një aplikacion të modifikojë preferencat për sistemin thelbësor."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Aplikacionet e menaxhimit të medias"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Lejo që aplikacioni të menaxhojë median"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Nëse lejohet, ky aplikacion mund të modifikojë ose të fshijë skedarët e medias të krijuar me aplikacione të tjera pa të pyetur. Aplikacionet duhet të kenë leje për t\'u qasur te skedarët edhe media."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gjestet"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Hap me shpejtësi kamerën"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Për të hapur me shpejtësi kamerën, shtyp dy herë butonin e energjisë. Funksionon nga çdo ekran."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Përmbys kamerën për selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Modaliteti i navigimit"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Shkëmbimi i mesazheve nëpërmjet satelitit"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Dërgo dhe merr mesazhe me tekst nëpërmjet satelitit. Përfshihet me llogarinë tënde."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Dërgo dhe merr mesazhe me tekst nëpërmjet satelitit. Nuk përfshihet me llogarinë tënde."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Shkëmbimi i mesazheve nëpërmjet satelitit"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Rreth shkëmbimit të mesazheve nëpërmjet satelitit"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Mund të dërgosh dhe të marrësh mesazhe me tekst nëpërmjet satelitit si pjesë e një llogarie të kualifikueshme të <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Plani yt i <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Shkëmbimi i mesazheve nëpërmjet satelitit përfshihet me llogarinë tënde"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Shkëmbimi i mesazheve nëpërmjet satelitit nuk përfshihet me llogarinë tënde"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Mëso më shumë"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Si funksionon"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefoni yt do të lidhet automatikisht me një satelit. Për lidhjen më të mirë, qëndro në pamje të pastër të qiellit."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Pasi telefoni yt të lidhet me një satelit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Mund t\'i dërgosh mesazh me tekst kujtdo, duke përfshirë shërbimet e urgjencës. Telefoni yt do të rilidhet me një rrjet celular kur disponohet."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Shkëmbimi i mesazheve nëpërmjet satelitit mund të kërkojë më shumë kohë dhe ofrohet vetëm në disa zona. Moti dhe disa struktura të caktuara mund të ndikojnë në lidhjen tënde satelitore. Telefonatat nëpërmjet satelitit nuk ofrohen. Telefonatat e urgjencës mund të lidhen përsëri.\n\nMund të duhet pak kohë që ndryshimet e llogarisë të shfaqen te \"Cilësimet\". Kontakto me operatorin celular për detaje."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Më shumë rreth shkëmbimit të mesazheve nëpërmjet satelitit"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Veçoria <xliff:g id="FUNCTION">%1$s</xliff:g> nuk mund të aktivizohet"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Për të aktivizuar veçorinë <xliff:g id="FUNCTION">%1$s</xliff:g>, në fillim mbyll lidhjen satelitore"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Lidhja satelitore"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Emrat e pikës së qasjes"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nuk ofrohet kur është e lidhur me <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Je në modalitetin 16 KB të modalitetit të pavarësisë nga madhësia e faqes. Integriteti i softuerit nuk mund të garantohet në këtë modalitet dhe mund të rrezikohet çdo e dhënë e ruajtur në telefon kur ngarkuesi i fillimit është i shkyçur. Disa veçori do të çaktivizohen në këto modalitete, kështu që disa aplikacione mund të mos funksionojnë. Për të hyrë përsëri në modalitetin e prodhimit, duhet të kthehesh përsëri në modalitetin 4 KB dhe më pas të kyçësh ngarkuesin e fillimit të pajisjes. Ky veprim do ta rivendosë pajisjen në gjendje fabrike dhe do ta restaurojë te cilësimet e prodhimit. Pasi pajisja të niset me sukses në Android, çaktivizo shkyçjen e OEM-së tek \"Opsionet e zhvilluesit\". Nëse pajisja nuk arrin të niset në Android ose është e paqëndrueshme, riinstalo në pajisje imazhet më të fundit të fabrikës nga &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; ose përdor &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; dhe zgjidh \"Pastro pajisjen\", \"Kyç ngarkuesin e fillimit\" dhe \"Riinstalo me forcë të gjitha ndarjet\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Modaliteti 16 KB i pavarësisë nga madhësia e faqes"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Lexo më shumë"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Ekzekuto aplikacionin me modalitetin e përputhshmërisë me madhësinë e faqes"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Administruesi i raportit të defekteve në kod"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Përcakton se cili aplikacion administron shkurtoren e \"Raportit të defekteve në kod\" në pajisjen tënde."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Dëgjo transmetimin"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skano një kod QR të transmetimit audio për të dëgjuar me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Fjalëkalimi nuk mund të modifikohet gjatë ndarjes. Për të ndryshuar fjalëkalimin, në fillim çaktivizo ndarjen e audios."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Fjalëkalimi yt duhet të përfshijë 4-16 karaktere dhe të përdorë vetëm shkronja, numra dhe simbole"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Skaneri i kodeve QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Ke nevojë për ndihmë?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Kërko te cilësimet"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktet, ruajtja, llogaria"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Ruajtja e kontakteve"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Vetëm pajisja"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kontaktet e reja nuk do të sinkronizohen me një llogari"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktet do të ruhen në pajisjen tënde dhe do të sinkronizohen në llogarinë tënde si parazgjedhje"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Gabim gjatë caktimit të llogarisë së parazgjedhur"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nuk është caktuar asnjë e parazgjedhur"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Vetëm në pajisje"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Pajisja dhe %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Shto një llogari për të filluar"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Ku të ruhen kontaktet"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Qarko për të kërkuar"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Prek dhe mbaj shtypur butonin \"Kreu\" ose emërtimin e navigimit për të kërkuar duke përdorur përmbajtjen në ekranin tënd."</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 2484fbf0716..c629feea7d6 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Пахуља"</item>
     <item msgid="7952183800501346803">"Сунцобран"</item>
     <item msgid="799139025758265891">"Алат из радионице"</item>
-    <item msgid="1330084588359129896">"Шатор"</item>
+    <item msgid="8112685757657659269">"Клавир"</item>
     <item msgid="3861584909935022342">"Ролна филма"</item>
     <item msgid="5827426100157335512">"Књига"</item>
     <item msgid="8585828346253128384">"Цвет лотоса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 522a2bfcfb0..014b638dfaa 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Упарите нови уређај"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Аутоматски укључи сутра"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ако искључите Bluetooth, поново ће се укључити следећег дана"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Упари десно уво"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Упари лево уво"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Упарите друго уво"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Онемогући Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Онемогућава функцију Bluetooth LE audio ако уређај подржава могућности LE audio хардвера."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio режим"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Омогући преглед корисничког интерфејса за Bluetooth LE Audio емитовање"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Омогућава преглед корисничког интерфејса за Bluetooth LE Audio, укључујући дељење личних аудио снимака и приватно емитовање"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"LE Audio прекидач у детаљима о уређају"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Заобиђи Bluetooth LE Audio листу дозвољених"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Подразумевано користи LE Audio чак и ако није потврђено да LE Audio периферни уређај задовољава критеријуме листе дозвољених."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Језик апликације"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Предложени језици"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Сви језици"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Предложено"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Сви језици"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Сви региони"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Сви системи за нумерисање"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Језик система"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Подразумевани системски"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Избор језика за ову апликацију није доступан из Подешавања."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Промени"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Није доступно: %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Овај језик не може да се користи као језик система, али сте обавестили апликације и веб-сајтове да желите овај језик."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Претражи"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Додајте језик"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Подешавање региона"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Унесите назив језика"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Још подешавања језика"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Регионална подешавања"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Изаберите подешавања јединица и бројева"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Омогућите апликацијама да сазнају ваша регионална подешавања како би могле да персонализују ваш доживљај."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Апликације ће користити регионална подешавања када је то могуће."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Регионална подешавања"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Први дан недеље"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Подешавања бројева"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Повежи са услугом за податке у ромингу"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Повежи са услугом за податке у ромингу"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Могу да важе накнаде за роминг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Подеси време аутоматски"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Подеси аутоматски"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Локација ће се користити за подешавање временске зоне када је овај прекидач укључен"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Аутоматски датум и време"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Аутоматско подешавање помоћу мреже и бежичних сигнала"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Аутоматска временска зона"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Аутоматско подешавање на основу мобилних мрежа у близини"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Аутоматско подешавање помоћу локације уређаја, ако је доступна"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи подразумевану вредност за локалитет"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовни формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Време"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Подигните прст, па поново додирните сензор"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Не можете да користите сензор за отисак прста"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Посетите добављача за поправке."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Откључавање отиском прста када је екран искључен"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Користите откључавање отиском прста чак и када је екран искључен"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Искључен екран, откључавање"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Још безбедносних подешавања"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Закључавање пословног профила, шифровање и друго"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифровање, акредитиви и друго"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Подесите образац за приватни простор"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Закључај"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Сакриј"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Потврдите шаблон за приватан простор"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Поново унесите PIN за приватан простор"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Поново унесите лозинку за приватан простор"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можете да их додате до <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Додали сте максималан број отисака прстију"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не можете да додате још отисака прстију"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Укључено"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Искључено"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Спољни екран"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Уграђени екран"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Користи спољни екран"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Резолуција екрана"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Спољни екран је искључен"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Промена ротације или резолуције може да заустави све апликације које су тренутно активне"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Уређај мора да буде повезан са спољним екраном да би се пресликао цео екран"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Још опција"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Задржите и превуците да бисте прераспоредили приказ на екранима."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Пребацивање"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"пресликати"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Омогући бежични приказ"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Проверите лозинку и пробајте поново"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Обратите се произвођачу уређаја"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Проверите везу и пробајте поново"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ова WiFi мрежа тренутно није доступна"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Постоји проблем са овим QR кодом. Пробајте да се повежете на други начин."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Одаберите мрежу"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Да бисте повезали уређај, одаберите мрежу"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Желите ли да додате овај уређај на мрежу „<xliff:g id="SSID">%1$s</xliff:g>“?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Сазнајте више о аутоматском ротирању"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Резолуција екрана"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Висока резолуција"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Пуна резолуција"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Пуна резолуција користи више батерије. Ако пређете на ову резолуцију, неке апликације ће се можда рестартовати."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Максимална резолуција"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Максимална резолуција користи више батерије. Ако пређете на ову резолуцију, неке апликације ће се можда рестартовати."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Изабрано је"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Боје"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природне"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Прилагодљиво"</string>
     <string name="brightness" msgid="6216871641021779698">"Ниво осветљености"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Прилагодљива осветљеност"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"О приладољивој осветљености"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Осветљеност екрана ће се аутоматски прилагођавати окружењу и активностима. Можете ручно да померате клизач да би прилагодљиво подешавање осветљености научило шта вам одговара."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Укључено"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Искључено"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Подешавања режима за спавање"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режими могу и да активирају тамну тему}=1{{mode_1} активира и тамну тему}=2{{mode_1} и {mode_2} активирају и тамну тему}=3{{mode_1}, {mode_2} и {mode_3} активирају и тамну тему}one{{mode_1}, {mode_2} и још # активирају и тамну тему}few{{mode_1}, {mode_2} и још # активирају и тамну тему}other{{mode_1}, {mode_2} и још # активирају и тамну тему}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Подешавања режима"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Још слабије осветљење"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Додатно затамњено"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Дозволите да осветљење уређаја буде слабије него обично"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Гашење екрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Услуге локације"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Услуге локације"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Користи локацију"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Користи локацију за временску зону"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Временска зона не може да се подеси аутоматски"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Локација или Услуге локације су искључене"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Подешавања локације"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Поправи ово"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Откажи"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Аутоматска временска зона је искључена"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Није доступно када је искључена аутоматска временска зона"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Локација може да се користи за подешавање временске зоне"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ако је локација уређаја доступна, може да се користи за подешавање временске зоне"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Преглед правних информација, статуса, верзије софтвера"</string>
     <string name="legal_information" msgid="7509900979811934843">"Правне информације"</string>
     <string name="manual" msgid="3651593989906084868">"Упутство"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Опције"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Приступачност"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физичка тастатура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Дужи одзив тастера"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Тастатура занемарује брзе притиске истог тастера који се понављају у року од <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Тастатура занемарује брзе притиске истог тастера који се понављају"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Праг за дужи одзив тастера"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Одаберите колико дуго тастатура занемарује понављане притиске тастера"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 сек"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 сек"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 сек"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Прилагођено"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"прилагођена вредност"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Спори тастери"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Приладите време потребно да се тастер активира после притиска на <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Прилагодите време за активирање тастера после притиска"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Лепљиви тастери"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Притискајте један по један тастер да бисте користили пречице уместо да истовремено држите тастере"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Тастери миша"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Користите физичку тастатуру да бисте управљали мишем."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Користите тастере миша"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Контролишите показивач помоћу тастатуре"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обрнуто скроловање мишем"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Скролујте нагоре да бисте померили страницу надоле"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Замените дугмад налево и надесно"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Користите леви тастер миша као десни"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Тастери миша за: <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Користите тастере <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> да бисте померили показивач миша"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Користите тастер <xliff:g id="CLICK_LABEL">%s</xliff:g> да бисте кликнули на примарно дугме миша"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Користите тастер <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> да бисте притиснули и задржали примарни тастер миша"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Користите тастер <xliff:g id="RELEASE_LABEL">%s</xliff:g> да бисте ослободили примарно дугме миша"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Користите тастер <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> да бисте укључили или искључили режим скроловања. Тако ћете помоћу тастера <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> скроловати приказ нагоре, надоле, улево или удесно"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Користите тастер <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> да бисте кликнули на секундарно дугме миша"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Тастерске пречице"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Приказује листу пречица"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Тастатуре и алатке за пословни профил"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Подразумевано"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Тачпед"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Тачпед и миш"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Миш"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Брзина показивача, покрети"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Додирните да бисте кликнули"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Превлачење додиром"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Клик доле десно"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"За више опција, кликните на доњи десни угао тачпеда"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Брзина показивача"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Користите додир помоћу три прста"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Боја показивача"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Промените стил попуне у црно"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Промените стил попуне у зелено"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Научите покрете за тачпед"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"додирна табла, миш, курсор, скроловање, превлачење, десни клик, клик, показивач"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"десни клик, додир"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Средњи клик"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Покрени Помоћник"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Иди на почетни екран"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Прикажи недавне апликације"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Иди на почетни екран"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Превуците нагоре са три прста било где на тачпеду"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Назад"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Одаберите нови тастер за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Приступачност физичке тастатуре"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Лепљиви тастери, дужи одзив тастера, тастери миша"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Понављање тастера"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Одлагање пре понављања"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Брзина понављања"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Притисните и задржите тастер да бисте понављали унос знака све док не пустите тастер"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Распоред <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Подразумевано"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Аутоматски: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Преглед"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандардне опције"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Језик"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Величина текста"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Величина титла"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил титла"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Прилагођене опције"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Боја позадине"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Прилагођавање коришћења напајања"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Садржани пакети"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Апликације раде уобичајено"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Препоручујемо замену батерије"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Капацитет батерије и учинак пуњења су смањени и препоручујемо замену батерије."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Низак ниво напуњености батерије"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Укључите уштеду батерије да бисте продужили трајање батерије"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Продужите трајање батерије"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Желите ли да прекинете везу са овим VPN-ом?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекини везу"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Верзија <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Желите ли да замените постојећи VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Желите ли да подесите увек укључени VPN?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"9:00–17:00 радним данима"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Догађаји у календару"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Активан је {mode_1}}=2{Активни су {mode_1} и {mode_2}}=3{Активни су {mode_1}, {mode_2} и {mode_3}}one{Активни су {mode_1}, {mode_2} и још # режим}few{Активни су {mode_1}, {mode_2} и још # режима}other{Активни су {mode_1}, {mode_2} и још # режима}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режим може да се укључује аутоматски}one{# режим може да се укључује аутоматски}few{# режима могу да се укључују аутоматски}other{# режима може да се укључује аутоматски}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не узнемиравај}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"УКЉУЧЕНО"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Није подешено"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Онемогућено"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Важи"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Обавештења"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Трајање"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Поруке, догађаји и подсетници"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања и дозволите пријатељима, члановима породице или другим контактима да допру до вас."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Готово"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Подешавања"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Без визуелног и звучног сигнала обавештења"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Без звучног сигнала за обавештења"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Нећете видети нити чути обавештења. Позиви од контаката са звездицом и поновних позивалаца су дозвољени."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(тренутно подешавање)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Желите ли да промените подешавања обавештења за режим Не узнемиравај?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Звукови за пословни профил"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Користи звукове личног профила"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Користи исте звукове као лични профил"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"После откључавања идете директно на последњи екран. Обавештења се неће приказивати на закључаном екрану. Превуците надоле од врха да бисте их видели."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"закључани екран, прескочити, заобићи"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Када је пословни профил закључан"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Минималистичка обавештења на закључаном екрану"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Приказујте мање обавештења на закључаном екрану"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Приказуј само нова обавештења на закључаном екрану"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Аутоматски уклања претходно прегледана обавештења са закључаног екрана"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Обавештења на закључаном екрану"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Приказује конверзације, и подразумеване и нечујне"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Приказуј конверзације, и подразумеване и нечујне"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Приказуј сав садржај обавештења о пословном профилу"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Сакриј осетљив садржај пословног профила"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Када је уређај закључан, како желите да се приказују обавештења о профилу?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Када примите много обавештења у кратком периоду, уређај ће утишати звук и смањити број упозорења на највише два минута. То не утиче на позиве, аларме ни приоритетне конверзације. \n\nОбавештења која добијете током утишавања можете да пронађете повлачењем надоле од врха екрана."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Примени на пословне профиле"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Примените на апликације пословног профила"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Груписана обавештења"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Укључено"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Искључено"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Користи груписање обавештења"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Звук се искључује за обавештења са сличним темама и она се групишу ради тишег доживљаја. Груписање замењује подешавања обавештења саме апликације."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Услуге помагача за виртуелну реалност"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниједна инсталирана апликација није захтевала да се покрене као услуга помагача за виртуелну реалност."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дозвољавате приступ услузи виртуелне реалности за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"приоритетне конверзације"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ништа"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниједна}=1{1 конверзација}one{# конверзација}few{# конверзације}other{# конверзација}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Подешавања конверзација"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ко може да прекида"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Чак и ако апликације за размену порука или позивање не могу да вас обавесте, људи које одаберете овде могу да допру до вас преко тих апликација"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Позиви"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Сви"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти са звездицом"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Подешавања контаката"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Подешавања контаката са звездицом"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Ништа"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Ништа"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Аларми"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (посао)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Израчунава се…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Подешавања апликација"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволи да апликације занемарују"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Апликације које могу да прекидају"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Направите режим"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Прилагођени режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назив режима"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Поље за назив режима не може бити празно"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Одаберите икону"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Догађаји у календару"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Рутина времена за спавање"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Током вожње"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Обавештења преко целог екрана"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Дозволи обавештења преко целог екрана од ове апликације"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Дозволите овој апликацији да приказује обавештења преко целог екрана када је уређај закључан. Апликације могу да их користе ради истицања аларма, долазних позива или других хитних обавештења."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Уписивање подешавања система"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Дозволите овој апликацији да у ваше име мења подешавања система"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Ова дозвола омогућава апликацији да мења основна подешавања система."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Апликације за управљање медијима"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Омогући апликацији управљање медијима"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ако се омогући, ова апликација може да мења или брише медијске фајлове направљене помоћу других апликација без питања. Апликација мора да има дозволу за приступ фајловима и медијима."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Покрети"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Брзо отварајте камеру"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Да бисте брзо отворили камеру, двапут притисните дугме за укључивање. Ово функционише на сваком екрану."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Обрните камеру да бисте снимили селфи"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Режим навигације"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Сателитска размена порука"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Шаљите и примајте текстуалне поруке преко сателита. Обухваћено је налогом."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Шаљите и примајте текстуалне поруке преко сателита. Није обухваћено налогом."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Сателитска размена порука"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"О сателитској размени порука"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"размена порука преко сателита, сателитска веза"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Више информација о: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ако код мобилног оператера <xliff:g id="CARRIER_NAME">%1$s</xliff:g> имате налог који испуњава услове, можете да шаљете и примате текстуалне поруке преко сателита."</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Пакет код мобилног оператера <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Сателитска размена порука је обухваћена налогом"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Размена порука је обухваћена налогом"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Сателитска размена порука није обухваћена налогом"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Сазнајте више"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Принцип рада"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Телефон ће се аутоматски повезати на сателит. За најбољи квалитет везе, уверите се да вам ништа не заклања поглед на небо."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Кад се телефон повеже на сателит"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Можете да шаљете поруке било коме, укључујући хитне службе. Телефон ће се поново повезати на мобилну мрежу када буде доступна."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Сателитска размена порука може да траје дуже и доступна је само у одређеним областима. Временски услови и одређене структуре могу да утичу на сателитску везу. Позивање путем сателита није доступно. Хитни позиви и даље могу да се обаве.\n\nТреба мало времена да се промене налога појаве у Подешавањима. Обратите се мобилном оператеру за детаље."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Више о сателитској размени порука"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> може да траје дуже и доступна је само у одређеним областима. Временски услови и одређене структуре могу да утичу на сателитску везу. Позивање путем сателита није доступно. Хитни позиви и даље могу да се обаве.\n\nМоже да прође неко време пре него што се промене налога прикажу у Подешавањима. Обратите се мобилном оператеру <xliff:g id="CARRIER_NAME">%1$s</xliff:g> за више детаља."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Више о: <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Не може да се укључи <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Да бисте укључили <xliff:g id="FUNCTION">%1$s</xliff:g>, прво завршите сателитску везу"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Сателитска веза"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Сателитска веза"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"сателитска веза"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"размена порука преко сателита"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Коришћење података је обухваћено налогом"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Хитна помоћ преко сателита"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Шаљите поруке хитним службама када не можете да се повежете на мобилну или WiFi мрежу"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"хитна помоћ преко сателита, хитна помоћ"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"О хитној помоћи преко сателита"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Шаљите поруке хитним службама и делите локацију када нема мобилне ни WiFi мреже. Ова услуга можда није увек доступна на свим локацијама и у свим околностима."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Позовите хитне службе или им пошаљите поруку"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Одговорите на питања о хитном случају"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Пратите кораке да бисте се повезали са сателитом"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Ако немате везу са мобилном мрежом, видећете опцију да користите хитну помоћ преко сателита"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Пошаљите одговоре хитним службама да бисте добили одговарајућу помоћ"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Када се повежете, можете да пошаљете поруку хитним службама"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Покрени демонстрацију"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Када се повежете са хитним службама преко сателита, ваше име, имејл, број телефона, локација, информације о уређају (IMEI, језик, модел, ниво батерије) и информације о контактима за хитне случајеве деле се са хитним службама и добављачима сателитских услуга. \n\nДа бисте користили хитну помоћ преко сателита, Google Messages мора да буде подразумевана апликација за SMS поруке. \n\nАко је аутоматски избор мреже искључен, укључиће се и уређај ће се аутоматски повезати на било коју мрежу."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Подешавања дељења"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Контакти за хитне случајеве"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google налог"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Прегледајте или измените информације које ће се делити са хитним службама"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Називи приступних тачака"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"Назив приступне тачке"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно када је повезано са: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4913,7 +5033,7 @@
     <string name="network_connection_connecting_message" msgid="433189540877274889">"Повезује се са уређајем…"</string>
     <string name="bluetooth_left_name" msgid="7440064067910080502">"Лево"</string>
     <string name="bluetooth_right_name" msgid="7588088072444124949">"Десно"</string>
-    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Футрола"</string>
+    <string name="bluetooth_middle_name" msgid="3909371955137442319">"Кутија"</string>
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Батерија"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Табла са подешавањима"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Омогући прозоре произвољног формата"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Користите режим од 16 KB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па могу бити угрожени подаци који сe чувају на телефону док је покретачки програм откључан. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да га вратите на режим од 4 KB и закључате покретачки програм уређаја. То ће поново ресетовати уређај на фабричка подешавања и вратити га на производна подешавања. Када се на уређају укључи Android, онемогућите OEM откључавање у Опцијама за програмера. Ако је уређај нестабилан или се на њему не укључи Android, поново га флешујте користећи најновије слике са фабричким подешавањима са &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;. Можете и да користите &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; и изаберете Обриши уређај, Закључај покретачки програм и Принудно флешуј све партиције."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим од 16 kB независан од величине странице"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Прочитајте више"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Покрените апликацију у режиму компатибилности величине странице"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Обрађивач извештаја о грешци"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Одређује која апликација управља пречицом за извештај о грешци на уређају."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Лично"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Слушајте стрим"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Скенирајте QR кôд аудио стрима да бисте слушали помоћу: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Лозинка не може да се мења током дељења. Да бисте променили лозинку, прво искључите дељење звука."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Лозинка мора да садржи од 4 до 16 знакова и може да садржи само слова, бројеве и симболе"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Скенер QR кода"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Треба вам помоћ?"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"Подешавања претраге"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"Претражите подешавања"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, меморијски простор, налог"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Меморијски простор за контакте"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Само уређај"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Нови контакти се неће синхронизовати са налогом"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакти се подразумевано чувају на уређају и синхронизују са налогом"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при подешавању подразумеваног налога"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Није подешен подразумевани налог"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само уређај"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Уређај и %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте налог да бисте започели"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Где можете да чувате контакте"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Претрага заокруживањем"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Додирните и задржите дугме Почетак или маркер за кретање да бисте претраживали помоћу садржаја на екрану."</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 84665cbb82e..48b1fa6f290 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snöflinga"</item>
     <item msgid="7952183800501346803">"Strandparasoll"</item>
     <item msgid="799139025758265891">"Verktyg"</item>
-    <item msgid="1330084588359129896">"Tält"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Filmrulle"</item>
     <item msgid="5827426100157335512">"Bok"</item>
     <item msgid="8585828346253128384">"Lotusblomma"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 62d46cea4e2..1088e5cd027 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parkoppla en ny enhet"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivera automatiskt i morgon"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Om du stänger av Bluetooth aktiveras det igen nästa dag"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Parkoppla höger"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Parkoppla vänster"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Parkoppla andra örat"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Inaktivera Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Inaktiverar Bluetooth LE Audio-funktionen om enheten har stöd för funktioner för LE Audio-hårdvara."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio-läge"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Aktivera förhandsgranskning av användargränssnittet för Bluetooth LE Audio-sändning"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Aktiverar förhandsgranskningen av användargränssnittet för LE Audio-delning, inklusive delning av personligt ljud och privat sändning"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Visa reglage för LE Audio i Enhetsinfo"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Hoppa över godkännandelistan för Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Använd LE Audio som standard även om LE Audio-kringutrustningen inte har bekräftats uppfylla kraven för godkännandelistan."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Appspråk"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Föreslagna språk"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Alla språk"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Förslag"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Alla språk"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Alla regioner"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Alla numreringssystem"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Systemets språkinställning"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Systemets standardinställning"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Det går inte att välja språk för den här appen i Inställningar."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Ändra"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s är inte tillgängligt"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Du kan inte använda det här språket som systemspråk, men appar och webbplatser informeras om att du föredrar det."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Sök"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Lägg till ett språk"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Regionsinställningar"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Ange språk"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Fler språkinställningar"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Regionsinställningar"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Anger inställningar för enheter och siffror"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Ge appar åtkomst till dina regionsinställningar så att din upplevelse kan anpassas."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Appar använder dina regionsinställningar om möjligt."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Regionsinställningar"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Första dagen i veckan"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Sifferinställningar"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Roamingavgifter kan tillkomma."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Ange tiden automatiskt"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Ange automatiskt"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Plats används för att ställa in tidszon när detta är aktiverat"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Automatiskt datum och tid"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Ställ in automatiskt med nätverk och trådlösa signaler"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidszon"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ställ in automatiskt utifrån mobilnätverk i närheten"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Ställ in automatiskt med enhetens plats, om tillgängligt"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Använd lokal standard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tid"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lyft fingret och nudda sedan sensorn igen"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Det går inte att använda fingeravtryckssensorn"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Besök ett reparationsställe."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Fingeravtryckslås när skärmen är av"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Använd fingeravtryckslås även när skärmen är av"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Skärmen av, lås upp"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Fler säkerhetsinställningar"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Lås för jobbprofilen, kryptering med mera"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Kryptering, användaruppgifter med mera"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Ställ in mönster för ditt privata rum"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Lås"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Dölj"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Bekräfta mönstret för ditt privata utrymme"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Ange pinkoden för ditt privata utrymme igen"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Ange lösenordet för ditt privata utrymme igen"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> fingeravtryck"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har lagt till det högsta tillåtna antalet fingeravtryck"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Det går inte att lägga till fler fingeravtryck"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"På"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Av"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Extern skärm"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Använd extern skärm"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Skärmens upplösning"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Extern skärm har kopplats från"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Om du ändrar rotation eller upplösning kan appar som körs för närvarande stoppas"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Enheten måste vara ansluten till en extern skärm för att spegla skärmen"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Fler alternativ"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Ordna om skärmarna genom att trycka och dra."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casta"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegling"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivera wifi-skärmdelning"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Kontrollera lösenordet och försök igen"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakta enhetens tillverkare"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Kontrollera anslutningen och försök igen"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Det här wifi-nätverket är inte tillgängligt just nu"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Det uppstod ett problem med QR-koden. Försök att ansluta på ett annat sätt."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Välj nätverk"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Välj ett nätverk om du vill ansluta enheten"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Vill du lägga till enheten på <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Läs mer om automatisk rotation"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Skärmupplösning"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Hög upplösning"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Full upplösning"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Full upplösning drar mer batteri. Om du byter upplösning kan vissa appar startas om."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Markerad"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Färger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturliga"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Anpassade"</string>
     <string name="brightness" msgid="6216871641021779698">"Ljusstyrka"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Anpassad ljusstyrka"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Om anpassad ljusstyrka"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Skärmens ljusstyrka justeras automatiskt efter miljö och aktivitet. Du kan träna Anpassad ljusstyrka med dina egna inställningar genom att flytta reglaget manuellt."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"På"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Av"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Inställningar för läggdagsläget"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Mörkt tema kan även aktiveras av lägen}=1{{mode_1} aktiverar även mörkt tema}=2{{mode_1} och {mode_2} aktiverar även mörkt tema}=3{{mode_1}, {mode_2} och {mode_3} aktiverar även mörkt tema}other{{mode_1}, {mode_2} och # till aktiverar även mörkt tema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Inställningar för lägen"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ännu mer dimmat"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extradimmat"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Tillåt att enheten dimmas mer än vanligt"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skärmens tidsgräns"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Platstjänster"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Platstjänster"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Använd plats"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Använd plats för tidszon"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Tidszon kan inte ställas in automatiskt"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Plats eller Platstjänster är av"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Platsinställningar"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Åtgärda detta"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Avbryt"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidszon är inaktiverat"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Inte tillgängligt när automatisk tidszon är inaktiverad"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Platsen kan användas för att ställa in tidszon"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Om enhetens plats är tillgänglig kan den användas för att ställa in tidszonen"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Visa juridisk information, status, programversion"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juridisk information"</string>
     <string name="manual" msgid="3651593989906084868">"Handbok"</string>
@@ -1938,14 +1965,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Alternativ"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Tillgänglighet"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysiskt tangentbord"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Layoutväljare – fysiskt tangentbord"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Studsande tangenter"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Tangentbordet ignorerar snabbt upprepade tryck på samma tangent inom <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tangentbordet ignorerar snabbt upprepade tryck på samma tangent"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Gräns för studsande tangent"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Välj hur länge tangentbordet ska ignorera upprepade tangenttryckningar"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Anpassat"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"anpassat värde"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Långsamma tangenter"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Justera tiden det tar innan ett tryck på en tangent aktiveras till <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Justerar tiden det tar innan ett tryck på en tangent aktiveras"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Låstangentsläge"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tryck ned en tangent i taget för kortkommandon i stället för att hålla ned flera tangenter samtidigt"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Musknappar"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Använd det fysiska tangentbordet för att styra musen."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Använd mustangenter"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Använd tangentbordet för att styra pekaren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvänd scrollning på musen"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scrolla uppåt för att flytta sidan nedåt"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Byt plats på vänster och höger knapp"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Använd vänster musknapp som höger"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mustangenter för <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Använd tangenterna <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> för att flytta muspekaren"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Använd tangenten <xliff:g id="CLICK_LABEL">%s</xliff:g> för att klicka med den primära musknappen"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Använd tangenten <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> för att hålla den primära musknappen nedtryckt"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Använd tangenten <xliff:g id="RELEASE_LABEL">%s</xliff:g> för att släppa den primära musknappen"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Använd tangenten <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> för att aktivera och inaktivera scrollningsläget. Då scrollar tangenterna <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> vyn uppåt, nedåt, åt vänster och åt höger"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Använd tangenten <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> för att klicka med den sekundära musknappen"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Kortkommandon"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Visa en lista över genvägar"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tangentbord och verktyg för jobbprofilen"</string>
@@ -1953,6 +2000,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Standard"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Styrplatta"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Styrplatta och mus"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mus"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Markörens hastighet, rörelser"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Lätt klick på styrplattan"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Tryck och dra"</string>
@@ -1964,6 +2012,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klicka nere till höger"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Klicka i högra hörnet på styrplattan för fler alternativ"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Markörens hastighet"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Använd tryck med tre fingrar"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Muspekarens färg"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Ändra markörfyllningen till svart"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Ändra markörfyllningen till grön"</string>
@@ -1978,6 +2027,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Lär dig rörelser för styrplattan"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"styrplatta, styr platta, mus, markör, scrolla, svep, högerklicka, klicka, pekare"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"högerklicka, tryck"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Mittenklicka"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Starta Assistent"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Återvänd till startsidan"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Tillbaka"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Se de senaste apparna"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Öppna startsidan"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Svep uppåt med tre fingrar var som helst på styrplattan"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Tillbaka"</string>
@@ -2014,6 +2068,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Välj en ny tangent för <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Tillgänglighet för fysiskt tangentbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Låstangentsläge, studsande tangenter, musknappar"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Upprepa tangenter"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Fördröjning före upprepning"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Upprepningsfrekvens"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Håll ned en tangent för att upprepa tecknet tills du släpper tangenten"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layouten <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatiskt: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2476,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Förhandsgranskning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardalternativ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Språk"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Textstorlek"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Teckenstorlek för textning"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Textstil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Anpassade alternativ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrundsfärg"</string>
@@ -2545,6 +2603,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Justera strömförbrukningen"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Inkluderade paket"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Appar körs som vanligt"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Batteribyte rekommenderas"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batterikapaciteten och laddningsprestandan har minskat och ett batteribyte rekommenderas."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Låg batterinivå"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Förläng batteritiden genom att aktivera batterisparläget"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Förbättra batteritiden"</string>
@@ -2962,6 +3022,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vill du koppla från VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Koppla från"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Glöm VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vill du byta ut befintligt VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vill du ställa in Alltid på-VPN?"</string>
@@ -3384,7 +3445,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"”Vardagar kl. 9.00–17.00”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Kalenderhändelser"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} är aktivt}=2{{mode_1} och {mode_2} är aktiva}=3{{mode_1}, {mode_2} och {mode_3} är aktiva}other{{mode_1}, {mode_2} och # till är aktiva}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 läge kan aktiveras automatiskt}other{# lägen kan aktiveras automatiskt}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Stör ej}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"PÅ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Inte angivet"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Inaktiverat"</string>
@@ -3509,15 +3570,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Aviseringar"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Varaktighet"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Meddelanden, händelser och påminnelser"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom det som du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter kan nå dig."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Klar"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Inställningar"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Inga synliga/hörbara aviseringar"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Aviseringar hörs inte"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Aviseringar varken syns eller hörs. Samtal från stjärnmärkta kontakter och personer som ringer upp flera gånger släpps fram."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktuell inställning)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Vill du ändra aviseringsinställningarna för Stör ej?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Jobbprofilens ljud"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Använd den privata profilens ljud"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Använd samma ljud som i den privata profilen"</string>
@@ -3586,8 +3638,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Öppna den senast använda skärmen när du låser upp. Aviseringar visas inte på låsskärmen. Svep nedåt från skärmens överkant för att se dem."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låsskärm, Hoppa över, Kringgå"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"När jobbprofilen är låst"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Få aviseringar på låsskärmen"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Visa färre aviseringar på låsskärmen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Visa endast nya aviseringar på låsskärmen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Ta automatiskt bort tidigare visade aviseringar från låsskärmen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Aviseringar på låsskärmen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Visa konversationer, standard och ljudlösa"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Visa konversationer, standard och ljudlösa"</string>
@@ -3605,6 +3667,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Visa allt innehåll i jobbaviseringarna"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Dölj känsligt jobbinnehåll"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Hur vill du att profilaviseringar visas när enheten är låst?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profilaviseringar"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Aviseringar"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Appaviseringar"</string>
@@ -3695,6 +3765,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"När du får många aviseringar på kort tid kommer enheten att sänka volymen och minimera aviseringar i upp till två minuter. Samtal, alarm och prioriterade konversationer påverkas inte. \n\nDu kan hitta aviseringarna som tas emot under den gradvisa sänkningen genom att dra nedåt från skärmens överkant."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Använd för jobbprofiler"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Tillämpa på jobbprofilappar"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Grupperade aviseringar"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"På"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Av"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Använd aviseringsgruppering"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Aviseringar med liknande teman grupperas ljudlöst för en tystare upplevelse. Gruppering åsidosätter en apps egna aviseringsinställningar."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjälptjänster för VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Inga installerade appar har begärt att få köras som hjälptjänster för VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vill du tillåta att tjänsten för VR får tillgång till <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3878,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"prioriterade konversationer"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Inga"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Inga}=1{1 konversation}other{# konversationer}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Inställningar för konversationer"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Vem får störa dig"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Personer du väljer här kan kontakta dig via meddelande- och samtalsappar även om du har inaktiverat aviseringar"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Samtal"</string>
@@ -3826,6 +3902,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktinställningar"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Inställningar för stjärnmärkta kontakter"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Inga"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Inga"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarm"</string>
@@ -3855,6 +3933,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (jobbet)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Beräknar …"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Appinställningar"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillåt att appar åsidosätter funktionen"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Appar som får störa dig"</string>
@@ -3897,6 +3976,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Skapa ett läge"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Anpassat läge"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Lägesnamn"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Du måste ange ett lägesnamn"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Välj en ikon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalenderhändelser"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Läggdagsrutin"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"När du kör"</string>
@@ -4151,6 +4232,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Aviseringar i helskärm"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Tillåt aviseringar i helskärm från den här appen"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Tillåt att den här appen visar aviseringar som täcker hela skärmen när enheten är låst. Sådana aviseringar kan användas i appar för att lyfta fram alarm, inkommande samtal och andra brådskande aviseringar."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Skriva systeminställningar"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Tillåt att appen ändrar systeminställningarna åt dig"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Denna behörighet tillåter en app att ändra viktiga systeminställningar."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Appar för mediehantering"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Tillåt att appen hanterar media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Om du tillåter detta kan appen modifiera eller radera mediefiler som skapats med andra appar utan att du tillfrågas. Appen måste ha åtkomst till filer och media."</string>
@@ -4396,6 +4480,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Rörelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Öppna kameran snabbt"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Tryck två gånger på av/på-knappen för att snabbt öppna kameran. Du kan göra det på alla skärmar."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Vänd kameran för att ta en selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigeringsläge"</string>
@@ -4777,7 +4875,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ändra nätverksläge"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Önskad nätverkstyp"</string>
     <string name="carrier_settings_version" msgid="3364919669057317776">"Version av operatörsinställningarna"</string>
-    <string name="call_category" msgid="641461844504128789">"Ringer upp"</string>
+    <string name="call_category" msgid="641461844504128789">"Samtal"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videosamtal via operatören"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemval"</string>
     <string name="cdma_system_select_summary" msgid="384128007068464145">"Ändra CDMA-roamingläge"</string>
@@ -4793,11 +4891,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellitmeddelanden"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Skicka och ta emot sms via satellit. Ingår i kontot."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Skicka och ta emot sms via satellit. Ingår inte i kontot."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellitmeddelanden"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Om satellitmeddelanden"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Att skicka och ta emot sms via satellit ingår i kvalificerade <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-konton"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ditt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-abonnemang"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Satellitmeddelanden ingår i kontot"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Satellitmeddelanden ingår inte i kontot"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Läs mer"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Så fungerar det"</string>
@@ -4805,10 +4906,56 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonen ansluter automatiskt till en satellit. Den bästa anslutningen får du utomhus under bar himmel."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"När telefonen ansluter till en satellit"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Du kan sms:a vem som helst, inklusive räddningstjänsten. Telefonen återansluter till ett mobilnätverk när det finns ett tillgängligt."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Satellitmeddelanden kan ta längre tid och är bara tillgängliga i vissa områden. Väder och vissa byggnader kan påverka din satellitanslutning. Du kan inte ringa samtal via satellit. Nödsamtal kanske fortfarande går fram.\n\nDet kan ta en stund innan kontoändringar dyker upp i inställningarna. Kontakta operatören för mer information."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Mer om satellitmeddelanden"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Det går inte att aktivera <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Om du vill aktivera <xliff:g id="FUNCTION">%1$s</xliff:g> avslutar du först satellitanslutningen"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Satellitanslutning"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Namn på åtkomstpunkter"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Inte tillgänglig vid anslutning till <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5142,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Du använder 16 kB-versionen av det sidagnostiska läget. Det går inte att garantera mjukvarans integritet i detta läge och all data som lagras på telefonen när starthanteraren är olåst kan vara i farozonen. En del funktioner inaktiveras i dessa lägen. Det kan innebära att vissa program inte fungerar. Om du vill återgå till produktionsläget måste du byta tillbaka till 4 kB-läget och sedan låsa starthanteraren på enheten. Detta återställer enheten till produktionsinställningarna igen. När enheten startas med Android ska du inaktivera OEM-upplåsning i utvecklaralternativen. Om det inte går att starta enheten med Android eller om den inte är stabil flashar du om enheten med de senaste systemavbildningarna från &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; or use &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; och väljer Rensa enhet, Lås starthanteraren och Tvångsflasha alla partitioner."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 kB-versionen av det sidagnostiska läget"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Läs mer"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Kör appen i kompatibilitetsläge för sidstorlek"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Felrapportshanterare"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Avgör vilken app som hanterar Genväg till felrapport på enheten."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Privat"</string>
@@ -5433,7 +5583,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Lyssna på streamen"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skanna QR-koden för en ljudstream om du vill lyssna med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Det går inte att redigera lösenordet medan delning pågår. Om du vill byta lösenord måste du först stänga av ljuddelningen."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Lösenordet måste innehålla 4–16 tecken och endast bokstäver, siffror och symboler"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-skanner"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Behöver du hjälp?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Sökinställningar"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakter, lagring, konto"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktlagring"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Endast enheten"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nya kontakter synkroniseras inte med ett konto"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter sparas på enheten och synkroniseras med kontot som standard"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Det gick inte att ställa in standardkontot"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Inget standardkonto har angetts"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Endast enheten"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Enhet och %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lägg till ett konto för att komma igång"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Var du vill spara kontakter"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Tryck länge på hemknappen eller navigeringshandtaget för att söka med innehållet på skärmen."</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 09a6fdb26eb..c393fc12973 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Kipande kidogo sana cha theluji"</item>
     <item msgid="7952183800501346803">"Mwamvuli wa ufukweni"</item>
     <item msgid="799139025758265891">"Zana za karakana"</item>
-    <item msgid="1330084588359129896">"Hema"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Ukanda wa filamu"</item>
     <item msgid="5827426100157335512">"Kitabu"</item>
     <item msgid="8585828346253128384">"Ua la yungiyungi"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bf329cdff0d..6b3ec75ceb5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Unganisha kifaa kipya"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Washa kesho kiotomatiki"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Ukizima Bluetooth, itawashwa tena siku itakayofuata"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Unganisha kisaidizi cha kulia"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Unganisha kisaidizi cha kushoto"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Unganisha kisaidizi cha sikio jingine"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Zima Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Huzima kipengele cha Bluetooth LE audio ikiwa kifaa kinatumia maunzi yenye uwezo wa kutumia LE audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Hali ya Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Washa mipangilio ya toleo tangulizi la kiolesura cha Arifa ya Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Huwasha mipangilio ya toleo tangulizi la kiolesura cha LE Audio ya kusikiliza pamoja ikijumuisha kusikiliza pamoja na arifa za faragha"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Onyesha LE Audio kwenye Maelezo ya Kifaa"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Kwepa Faili Zilizoruhusiwa za Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Tumia LE Audio kwa chaguomsingi hata ikiwa kifaa cha LE Audio hakijathibitishwa kuwa kimetimiza masharti."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Lugha ya programu"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Lugha zinazopendekezwa"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Lugha zote"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Zinazopendekezwa"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Lugha zote"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Maeneo yote"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Mifumo yote ya namba"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Lugha ya mfumo"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Chaguomsingi la mfumo"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Chaguo la lugha kwa programu hii halipatikani kwenye Mipangilio."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Badilisha"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s haipatikani"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Lugha hii haiwezi kutumika kama lugha ya mfumo, lakini umeruhusu programu na tovuti zitambue kuwa unapendelea lugha hii."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Tafuta"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Weka lugha"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Mapendeleo ya eneo"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Andika jina la lugha"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Mipangilio zaidi ya lugha"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Mapendeleo ya kimaeneo"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Weka mapendeleo ya vipimo na namba"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Ruhusu programu zifahamu mapendeleo yako ya kimaeneo ili ziweze kuwekea hali yako ya utumiaji mapendeleo."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Programu zitatumia mapendeleo yako ya kimaeneo inapowezekana."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Mapendeleo ya kimaeneo"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Halijoto"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Siku ya kwanza ya wiki"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Mapendeleo ya namba"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Unganisha huduma ya data ninapotumia mitandao ya ng\'ambo"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Unganisha huduma ya data ninapotumia mitandao ya ng\'ambo"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Huenda ukatozwa ada za kutumia mitandao ya ng\'ambo."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Weka saa kiotomatiki"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Weka saa za eneo kiotomatiki"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Data ya mahali itatumika kuweka saa za eneo unapowasha kitufe hiki"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Mipangilio otomatiki ya tarehe na wakati"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Weka mipangilio otomatiki ukitumia mtandao wako na mawimbi ya simu za mkononi"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Mipangilio otomatiki ya saa za eneo"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Weka mipangilio otomatiki kulingana na mitandao ya simu iliyo karibu nawe"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Weka mipangilio kiotomatiki ukitumia data ya mahali kilipo kifaa chako, ikiwa inapatikana"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Tumia chaguomsingi la lugha"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Saa"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Inua kidole, kisha gusa kitambuzi tena"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Imeshindwa kutumia kitambuzi cha alama ya kidole"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Tembelea mtoa huduma za urekebishaji."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Kufungua Skrini Iliyozima kwa Alama ya Kidole"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Tumia kipengele cha Kufungua kwa Alama ya Kidole hata wakati skrini imezimwa"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Skrini imezima, Fungua"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Mipangilio zaidi ya usalama"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Ufungaji wa wasifu wa kazini, usimbaji fiche na zaidi"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Usimbaji fiche, vitambulisho na zaidi"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Weka mchoro wa sehemu yako ya faragha"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Funga"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ficha"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Thibitisha mchoro wa sehemu yako ya faragha"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Weka tena PIN ya sehemu yako ya faragha"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Weka tena nenosiri la sehemu yako ya faragha"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Unaweza kuongeza hadi alama za vidole <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Umeongeza idadi ya juu inayoruhusiwa ya alama za kidole"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Haiwezi kuongeza alama zaidi za kidole"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Imewashwa"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Imezimwa"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Skrini ya Nje"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Tumia skrini ya nje"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ubora wa skrini"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Skrini ya nje imeondolewa"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Hatua ya kubadilisha mzunguko au ubora inaweza kufanya programu zozote zinazotumika kwa sasa ziache kufanya kazi"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Ni lazima kifaa chako kiunganishwe na skrini ya nje ili kuakisi skrini yako"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Chaguo zaidi"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Shikilia na uburute upange upya skrini zako."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tuma"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"kioo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Washa kuonyesha skrini bila kutumia waya"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Angalia nenosiri na ujaribu tena"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Wasiliana na mtengenezaji wa kifaa"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Angalia muunganisho na ujaribu tena"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Mtandao huu wa Wi-Fi haupatikani kwa sasa"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Kuna hitilafu fulani kwenye msimbo huu wa QR. Jaribu kuunganisha ukitumia njia nyingine."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Chagua mtandao"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Ili uunganishe kifaa chako, chagua mtandao"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ungependa kuongeza kifaa hiki kwenye “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Pata maelezo zaidi kuhusu kuzungusha skrini kiotomatiki"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ubora wa skrini"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Ubora wa juu"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Ubora kamili"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Ubora kamili wa skrini hutumia zaidi betri yako. Kubadili ubora wa skrini yako kunaweza kusababisha baadhi ya programu zizime kisha ziwake."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Umechaguliwa"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Rangi"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Asili"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Inayojirekebisha"</string>
     <string name="brightness" msgid="6216871641021779698">"Kiwango cha mwangaza"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Mwangaza unaojirekebisha"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Kuhusu mwangaza unaojirekebisha"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Itarekebisha mwangaza wa skrini kiotomatiki ili uendane na mazingira na shughuli zako. Unaweza kusogeza kitelezi mwenyewe ili kusaidia kipengele cha mwangaza unaojirekebisha kijifunze mapendeleo yako."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Umewashwa"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Kimezimwa"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Mipangilio ya Hali tuli"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Hali pia zinaweza kuwezesha mandhari meusi}=1{{mode_1} pia huwasha mandhari meusi}=2{{mode_1} na {mode_2} pia huwasha mandhari meusi}=3{{mode_1}, {mode_2} na {mode_3} pia huwasha mandhari meusi}other{{mode_1}, {mode_2} na nyingine # pia huwasha mandhari meusi}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Mipangilio ya hali"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Mwangaza uliofifia zaidi"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Kipunguza mwangaza zaidi"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Ruhusu mwangaza wa kifaa hiki ufifie kuliko kawaida"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Muda wa skrini kujizima"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1623,7 +1650,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Huduma za mahali"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Huduma za mahali"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Tumia data ya mahali"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Tumia data ya mahali kuweka mipangilio ya saa za eneo"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Huwezi kuweka saa za eneo kiotomatiki"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Data ya mahali au Huduma za Mahali zimezimwa"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Mipangilio ya mahali"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Rekebisha hii"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Ghairi"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Utambuzi otomatiki wa saa za eneo umezimwa"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Haipatikani wakati mipangilio otomatiki ya saa za eneo imezimwa"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Huenda data ya mahali ikatumika kuweka saa za eneo"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Ikiwa data ya mahali kilipo kifaa chako inapatikana, inaweza kutumiwa kuweka mipangilio ya saa za eneo uliko"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Angalia maelezo ya kisheria, hadhi, toleo la programu"</string>
     <string name="legal_information" msgid="7509900979811934843">"Maelezo ya kisheria"</string>
     <string name="manual" msgid="3651593989906084868">"Mwongozo"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Chaguo"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ufikivu"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Kibodi halisi"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Vitufe vinavyoduta"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Kibodi hupuuza vitendo vya kurudia kubonyeza kitufe kimoja haraka na mara nyingi ndani ya milisekunde <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g>"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Kibodi hupuuza vitendo vya kurudia kubonyeza kitufe kimoja haraka mara nyingi"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Upeo wa mibofyo inayopuuzwa"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Chagua kipindi cha muda ambao kibodi yako itapuuza vitendo vya kurudia kubonyeza kitufe kimoja"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"sek 0.2"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"sek 0.4"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"sek 0.6"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Maalum"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"thamani maalum"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Vitufe vya polepole"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Hurekebisha muda unaochukua kitendo cha kubofya kitufe ili kuwasha uwe milisekunde <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g>"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Hurekebisha muda unaochukua kitendo cha kubonyeza kitufe kuwasha"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Vitufe vinavyonata"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Bonyeza kitufe kimoja baada ya kingine ili upate njia za mkato badala ya kubonyeza na kushikilia vitufe kwa pamoja"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Vitufe vya kipanya"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Tumia kibodi halisi kudhibiti kipanya."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Tumia vitufe vya kipanya"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Tumia kibodi yako kudhibiti kielekezi"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Kubadilisha mwelekeo wa kipanya"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sogeza juu ili usogeze ukurasa chini"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Kubadilisha utendaji wa vitufe vya kulia na kushoto"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Tumia kitufe cha kushoto cha kipanya kutekeleza majukumu ya kitufe cha kulia"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Vitufe vya kipanya vya <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Tumia vitufe vya <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> kusogeza kielekezi cha kipanya"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Tumia kitufe cha <xliff:g id="CLICK_LABEL">%s</xliff:g> kubofya kitufe cha msingi cha kipanya"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Tumia kitufe cha <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> kubonyeza na kushikilia kitufe cha msingi cha kipanya"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Tumia kitufe cha <xliff:g id="RELEASE_LABEL">%s</xliff:g> kuachilia kitufe cha msingi cha kipanya"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Tumia kitufe cha <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> kuwasha au kuzima hali ya kusogeza. Hii itafanya vitufe vya <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> kusogeza juu, chini, kushoto au kulia"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Tumia kitufe cha <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> kubofya kitufe mbadala cha kipanya"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Mikato ya kibodi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Onyesha orodha ya njia za mkato"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Zana na kibodi za wasifu wa kazini"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Chaguomsingi"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Padi ya kugusa"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Padi ya kugusa na kipanya"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Kipanya"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Kasi ya kiashiria, ishara"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Gusa ili ubofye"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Kugusa na kuburuta"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kubofya chini kulia"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Bofya kona ya chini kulia mwa padi ya kugusa kwa chaguo zaidi"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kasi ya kiashiria"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Gusa kwa vidole vitatu"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Rangi ya kielekezi"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Badilisha kielekezi kiwe cheusi"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Badilisha kielekezi kiwe cha kijani"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Jifunze ishara za padi ya kugusa"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"padi ya kusogeza, padi ya kusogeza, kipanya, kiteuzi, nenda, telezesha kidole, bofya kulia, bofya, kishale"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"bofya kulia, gusa"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Kubofya katikati"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Fungua programu ya Mratibu"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Nenda kwenye ukurasa wa mwanzo"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Rudi nyuma"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Angalia programu za hivi majuzi"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Nenda kwenye ukurasa wa mwanzo"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Telezesha vidole vitatu juu popote kwenye padi yako ya kugusa"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Rudi nyuma"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chagua kitufe kipya cha kurekebisha cha <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Zana za ufikivu kwenye kibodi halisi"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Vitufe vinavyonata, Vitufe vinavyodunda, Vitufe vya kipanya"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Vitufe vya Kurudia Herufi"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Kawia kabla ya kurudia"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Kasi ya Kurudia Herufi"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Bonyeza na ushikilie kitufe ili herufi ijirudie hadi utakapoachilia kitufe hicho"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Muundo wa <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Chaguomsingi"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Otomatiki: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Chungulia kwanza"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Chaguo za kawaida"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Lugha"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Ukubwa wa maandishi"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ukubwa wa manukuu"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Mtindo wa manukuu"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Chaguo maalum"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Rangi ya mandharinyuma"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Rekebisha utumiaji wa nishati"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Furushi zilizojumuishwa"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Programu zinatumia chaji kama kawaida"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Tunapendekeza ubadilishe betri"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Uwezo wa betri na utendaji wa kuchaji umepungua. Tunapendekeza ubadilishe betri."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Chaji ya betri imepungua"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Washa Kiokoa Betri ili uongeze muda wa matumizi ya betri"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Boresha muda wa matumizi ya betri"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ungependa kuondoa VPN hii?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Kata muungnisho"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Toleo"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Toleo la <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Ondoa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Ungependa kubadilisha VPN iliyopo?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ungependa kuweka VPN iliyowashwa kila mara?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"Saa 3 Asubuhi - Saa 11 Jioni siku za wiki\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Matukio ya kalenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} inatumika}=2{{mode_1} na {mode_2} zinatumika}=3{{mode_1}, {mode_2} na {mode_3} zinatumika}other{{mode_1}, {mode_2} na nyingine # zinatumika}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Hali 1 inaweza kuwashwa kiotomatiki}other{Hali # zinaweza kuwashwa kiotomatiki}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Usinisumbue}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"IMEWASHWA"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Haijawekwa"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Imezimwa"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Nimeelewa"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Arifa"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Muda"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Ujumbe, matukio na vikumbusho"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Ukiwasha kipengele cha Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Nimemaliza"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Mipangilio"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Arifa zisionekane wala zisitoe sauti"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Arifa zisitoe sauti"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Hutaona wala kusikia arifa. Simu kutoka anwani zenye nyota na wanaorudia kupiga simu zinaruhusiwa."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Mipangilio ya sasa)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Ungependa kubadilisha mipangilio ya arifa za Usinisumbue?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Sauti za wasifu wa kazini"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Tumia sauti za wasifu wako binafsi"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Tumia sauti sawa na zile za wasifu wako wa binafsi"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Ukishafungua, nenda kwenye skrini uliyotumia mwisho. Arifa hazitaonyeshwa kwenye skrini iliyofungwa. Telezesha kidole chini kutoka juu ili uzione."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrini iliyofungwa, Kufunga skrini, Ruka, Kwepa"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Wakati umefunga wasifu wa kazini"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Kupunguza arifa kwenye skrini iliyofungwa"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Onyesha arifa chache kwenye skrini iliyofungwa"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Onyesha arifa mpya pekee kwenye skrini iliyofungwa"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Ondoa kiotomatiki arifa zilizotazamwa awali kwenye skrini iliyofungwa"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Arifa kwenye skrini iliyofungwa"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Onyesha mazungumzo, arifa chaguomsingi na zisizo na sauti"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Onyesha mazungumzo, arifa chaguomsingi na zisizo na sauti"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Onyesha maudhui yote ya arifa za kazi"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ficha maudhui nyeti ya kazini"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Ungependa arifa za wasifu wako zionekane aje wakati kifaa chako kimefungwa?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Arifa za wasifu"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Arifa"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Arifa za programu"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Unapopokea arifa nyingi ndani ya muda mfupi, kifaa chako kitapunguza sauti na arifa kwa hadi dakika 2. Hali hii haitaathiri simu, kengele na mazungumzo ya kipaumbele. \n\nUnaweza kupata arifa ulizopokea wakati wa kutulizwa kwa arifa kwa kutelezesha kidole chini kutoka sehemu ya juu ya skrini."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Tumia kwenye wasifu wa kazini"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Tumia kwenye programu za wasifu wa kazini"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Arifa zilizowekwa katika vifurushi"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Kimewashwa"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Kimezimwa"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Washa kipengele cha kuweka arifa katika vifurushi"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Arifa zilizo na mandhari sawa zitazimiwa sauti na kupangwa pamoja ili upate hali tulivu zaidi ya utumiaji. Kuweka katika vifurushi kutabatilisha mipangilio ya arifa za kifaa."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Huduma za kisaidizi cha Uhalisia Pepe"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hakuna programu zilizosakinishwa ambazo zinaweza kutekeleza huduma za kisaidizi cha Uhalisia Pepe."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Ungependa kuruhusu huduma za Uhalisia Pepe katika <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"mazungumzo ya kipaumbele"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Hamna"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Hamna}=1{Mazungumzo 1}other{Mazungumzo #}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Mipangilio ya mazungumzo"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Anayeweza kukatiza"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Hata kama programu za kutuma ujumbe au kupiga simu hazitaweza kukuarifu, watu unaowachagua hapa bado wanaweza kukupata kupitia programu hizo"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Simu"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Mipangilio ya anwani"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Mipangilio ya anwani zenye nyota"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Hamna"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Kengele"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 nyingine # zinaweza kukatiza}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Kazini)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Inahesabu…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Mipangilio ya programu"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Ruhusu programu zibatilishe hali"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Programu zinazoweza kukatiza"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Anzisha hali"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Hali maalum"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Jina la hali"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Ni sharti ujaze jina la hali"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Chagua aikoni"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Matukio ya kalenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Ratiba ya wakati wa kulala"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Unapoendesha gari"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Arifa kwenye skrini nzima"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Ruhusu programu hii ionyeshe arifa kwenye skrini nzima"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Ruhusu programu hii ionyeshe arifa kwenye skrini nzima ukiwa umefunga kifaa. Programu zinaweza kutumia arifa hizi kuonyesha kengele, simu unazopigiwa au arifa nyingine muhimu."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Kuandika mapendeleo ya mfumo"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Ruhusu programu hii irekebishe mapendeleo ya mfumo kwa niaba yako"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Ruhusa hii huwezesha programu kurekebisha mapendeleo ya msingi ya mfumo."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Programu za kudhibiti maudhui"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Ruhusu programu idhibiti maudhui"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ikiruhusiwa, programu hii inaweza kubadilisha au kufuta faili za maudhui zilizoundwa na programu zingine bila kukuomba ruhusa. Ni sharti programu iwe na ruhusa ili ifikie faili na maudhui."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Miguso"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Fungua kamera haraka"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Ili ufungue kamera haraka, bofya kitufe cha kuwasha/kuzima mara mbili. Hufanya kazi katika skrini yoyote."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Geuza kamera ili upige selfi"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Hali ya kusogeza"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Kutuma ujumbe kupitia setilaiti"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Tuma na upokee ujumbe wa maandishi kupitia setilaiti. Imejumuishwa kwenye akaunti yako."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Tuma na upokee ujumbe wa maandishi kupitia setilaiti. Haijajumuishwa kwenye akaunti yako."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Kutuma ujumbe kupitia setilaiti"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Kuhusu kutuma ujumbe kupitia setilaiti"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Unaweza kutuma na kupokea ujumbe wa maandishi kupitia setilaiti kama sehemu ya akaunti inayotimiza masharti ya <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Mpango wako wa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Huduma ya kutuma ujumbe kupitia setilaiti imejumuishwa kwenye akaunti yako"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Huduma ya kutuma ujumbe kupitia setilaiti haijajumuishwa kwenye akaunti yako"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Pata Maelezo Zaidi"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Utaratibu wake"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Simu yako itaunganisha kiotomatiki kwenye setilaiti. Kwa muunganisho bora, hakikisha anga inaonekana vizuri."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Baada ya simu yako kuunganisha kwenye setilaiti"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Unaweza kumtumia yeyote ujumbe, ikiwa ni pamoja na huduma za dharura. Simu yako itaunganisha tena kwenye mtandao wa simu ukipatikana."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Huenda huduma ya kutuma ujumbe kupitia setilaiti ikachukua muda mrefu na inapatikana tu katika baadhi ya maeneo. Huenda hali ya hewa na majengo fulani yakaathiri muunganisho wako wa setilaiti. Huduma ya kupiga simu kupitia setilaiti haipatikani. Simu za dharura bado zinaweza kuunganishwa.\n\nInaweza kuchukua muda kabla ya mabadiliko uliyofanya kwenye akaunti yaonekane katika Mipangilio. Wasiliana na mtoa huduma wako ili upate maelezo."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Maelezo zaidi kuhusu kutuma ujumbe wa setilaiti"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Imeshindwa kuwasha <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Ili uwashe <xliff:g id="FUNCTION">%1$s</xliff:g>, zima kwanza muunganisho wa setilaiti"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Muunganisho wa setilaiti"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Majina ya Milango ya Mtandao"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Unatumia hali ya KB 16 kwenye hali isiyotegemea ukubwa wa ukurasa. Hatuwezi kukuhakikishia uadilifu wa programu katika hali hii na huenda data yoyote iliyohifadhiwa kwenye simu wakati programu ya kuwasha mfumo wa uendeshaji imefunguliwa ikawa katika hatari. Baadhi ya vipengele vitazimwa katika hali hizi, kwa hivyo huenda baadhi ya programu zisifanye kazi. Ili uingie tena katika hali ya toleo la umma, ni lazima urudi katika hali ya KB 4 kisha ufunge programu ya kuwasha mfumo wa uendeshaji kwenye kifaa. Hatua hii itarejesha tena mipangilio ambayo kifaa kilitoka nayo kiwandani na kuirejesha katika mipangilio ya toleo la umma. Baada ya kifaa kuwashwa katika Android, zima mipangilio ya kufungua OEM katika Chaguo za wasanidi programu. Iwapo kifaa kitashindwa kuwaka katika Android au si thabiti, weka upya data ya kifaa ukitumia picha mpya kabisa za kiwandani kutoka &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; au utumie &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; kisha uchague \'Futa Kabisa Data Yote Kwenye Kifaa\', \'Funga Programu ya Kuwasha Mfumo wa Uendeshaji\' na \'Lazimisha Kuweka kwenye sehemu zote\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Hali ya KB 16 Isiyotegemea Ukurasa"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Endelea kusoma"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Tekeleza programu katika hali ya uoanifu wa ukubwa wa ukurasa"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Kidhibiti cha ripoti ya hitilafu"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Hubaini programu inayodhibiti njia ya mkato ya Ripoti ya Hitilafu kwenye kifaa chako."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Binafsi"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Sikiliza mtiririko"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Changanua msimbo wa QR wa mtiririko wa maudhui ya sauti ili usikilize kupitia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Huwezi kubadilisha nenosiri mposikiliza pamoja. Ili ubadilishe nenosiri, zima kwanza kipengele cha kusikiliza pamoja."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Nenosiri lako lazima liwe na herufi 4-16 na litumie herufi, namba na alama pekee"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Kichanganuzi cha msimbo wa QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Je, unahitaji usaidizi?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Mipangilio ya Utafutaji"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"anwani, nafasi ya hifadhi, akaunti"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Nafasi ya kuhifadhi ya anwani"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Kifaa tu"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Anwani mpya hazitasawazishwa kwenye akaunti"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Anwani zitahifadhiwa kwenye kifaa chako na kusawazishwa kwenye akaunti yako kwa chaguomsingi"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Hitilafu imetokea wakati wa kuweka akaunti chaguomsingi"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Hujaweka akaunti chaguomsingi"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Kifaa tu"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Kifaa na %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Weka akaunti ili uanze"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Mahali pa kuhifadhi anwani"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Chora Mviringo ili Kutafuta"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Gusa na ushikilie Kitufe cha ukurasa wa mwanzo au ncha ya kusogezea ili utafute ukitumia maudhui yaliyo kwenye skrini yako."</string>
 </resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index ae9eb40ad10..e04eb881fac 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"பனித்துகள்"</item>
     <item msgid="7952183800501346803">"கடற்கரைக் குடை"</item>
     <item msgid="799139025758265891">"பணிமனைக் கருவிகள்"</item>
-    <item msgid="1330084588359129896">"கூடாரம்"</item>
+    <item msgid="8112685757657659269">"பியானோ"</item>
     <item msgid="3861584909935022342">"திரைப்பட ரீல்"</item>
     <item msgid="5827426100157335512">"புத்தகம்"</item>
     <item msgid="8585828346253128384">"தாமரைப் பூ"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index b7630278447..d1c9d6e2c8b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"புதிய சாதனத்தை இணை"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"புளூடூத்"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"தானாகவே நாளை இயக்குதல்"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"புளூடூத்தை முடக்கினால், மறுநாள் அது மீண்டும் இயக்கப்படும்"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"வலதுபுற கருவியை இணை"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"இடதுபுற கருவியை இணை"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"மற்றொரு கருவியை இணைத்தல்"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"புளூடூத் LE ஆடியோவை முடக்கு"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"LE ஆடியோ ஹார்டுவேர்களை சாதனம் ஆதரித்தால் புளூடூத் LE ஆடியோ அம்சத்தை முடக்கும்."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"புளூடூத் LE ஆடியோ பயன்முறை"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"புளூடூத் LE ஆடியோ பிராட்காஸ்ட் UI மாதிரிக்காட்சியை இயக்குதல்"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"தனிப்பட்ட ஆடியோ பகிர்வு மற்றும் தனிப்பட்ட பிராட்காஸ்ட் உட்பட LE ஆடியோ பகிர்வு UI மாதிரிக்காட்சியை இயக்கும்"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"சாதன விவரங்களில் LE ஆடியோ டாகிளை காட்டு"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"புளூடூத் LE ஆடியோ ஏற்புப் பட்டியலை பைபாஸ் செய்தல்"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ஏற்புப் பட்டியல் நிபந்தனைகளை LE ஆடியோ வெளிப்புறச் சாதனம் பூர்த்திசெய்கிறதா என்று சரிபார்க்கப்படவில்லை என்றாலும் LE ஆடியோவை இயல்பாகப் பயன்படுத்தும்."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ஆப்ஸ் மொழி"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"பரிந்துரைக்கப்படும் மொழிகள்"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"எல்லா மொழிகளும்"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"பரிந்துரைக்கப்படுபவை"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"அனைத்து மொழிகளும்"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"அனைத்துப் பிராந்தியங்களும்"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"அனைத்து எண்ணிடுதல் அமைப்புகளும்"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"சிஸ்டம் மொழி"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"சிஸ்டத்தின் இயல்பு"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"அமைப்புகளில் இந்த ஆப்ஸுக்கான மொழித் தேர்வு கிடைக்கவில்லை."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"மாற்று"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s கிடைக்கவில்லை"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"இந்த மொழியை சிஸ்டம் மொழியாகப் பயன்படுத்த முடியாது. ஆனால் நீங்கள் இந்த மொழியை விரும்புகிறீர்கள் என்பதை ஆப்ஸுக்கும் இணையதளங்களுக்கும் தெரிவித்துள்ளீர்கள்."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"தேடு"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"மொழியைச் சேர்த்தல்"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"மண்டல விருப்பம்"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"மொழி பெயரை உள்ளிடுக"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"கூடுதல் மொழி அமைப்புகள்"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"பிராந்தியத்திற்கேற்ற விருப்பங்கள்"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"யூனிட்கள் மற்றும் எண் விருப்பத்தேர்வுகளை அமைக்கலாம்"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"உங்கள் பிராந்தியத்திற்கேற்ற விருப்பங்களை ஆப்ஸுக்குத் தெரிவியுங்கள். இதனால் உங்கள் அனுபவத்தை ஆப்ஸால் பிரத்தியேகமாக்க முடியும்."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"சாத்தியமாக இருக்கும்பட்சத்தில் உங்கள் பிராந்தியத்திற்கேற்ற விருப்பங்களை ஆப்ஸ் பயன்படுத்தும்."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"பிராந்தியத்திற்கேற்ற விருப்பங்கள்"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"வெப்பநிலை"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"வாரத்தின் முதல் நாள்"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"எண்களுக்கான விருப்பத்தேர்வுகள்"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
     <string name="roaming_disable" msgid="729512894708689604">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ரோமிங் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"தானாக நேரத்தை அமை"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"தானாக அமைத்தல்"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"இந்த நிலைமாற்றும் பட்டன் இயக்கப்பட்டிருக்கும்போது நேர மண்டலத்தை அமைக்க இருப்பிடம் பயன்படுத்தப்படும்"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"தேதியையும் நேரத்தையும் தானாகவே அமைத்தல்"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"உங்கள் நெட்வொர்க்கையும் வயர்லெஸ் சிக்னல்களையும் பயன்படுத்தி தானாகவே அமைக்கும்"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"நேர மண்டலத்தைத் தானாகவே கண்டறிதல்"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"உங்களுக்கு அருகிலுள்ள மொபைல் நெட்வொர்க்குகளின் அடிப்படையில் தானாகவே அமைக்கும்"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"உங்கள் சாதன இருப்பிடம் கிடைத்தால், அதைப் பயன்படுத்தி தானாகவே அமைக்கும்"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"உள்ளூர் நேர வடிவத்தைப் பயன்படுத்து"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-மணிநேர வடிவமைப்பு"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"நேரம்"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"விரலை எடுத்துவிட்டு, மீண்டும் சென்சாரைத் தொடவும்"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"கைரேகை சென்சாரைப் பயன்படுத்த முடியவில்லை"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"பழுதுபார்ப்புச் சேவை வழங்குநரைத் தொடர்புகொள்ளவும்."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"திரை ஆஃப் கைரேகை அன்லாக்"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போதும் கைரேகை அன்லாக்கைப் பயன்படுத்தும்"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"திரை ஆஃப், அன்லாக்"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"கூடுதல் பாதுகாப்பு அமைப்புகள்"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"பணிக் கணக்குப் பூட்டு, என்க்ரிப்ஷன் மற்றும் பல"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"என்க்ரிப்ஷன், அனுமதிச் சான்றுகள் மற்றும் பல"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"இரகசிய இடத்திற்கான பேட்டர்னை அமைத்தல்"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"லாக் செய்தல்"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"மறைத்தல்"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"உங்கள் ரகசிய இடத்தின் பேட்டர்னை உறுதிப்படுத்துக"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"உங்கள் ரகசிய இடத்தின் பின்னை மீண்டும் டைப் செய்க"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ரகசிய இடத்தின் கடவுச்சொல்லை மீண்டும் டைப் செய்க"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> கைரேகைகள் வரை சேர்க்கலாம்"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"அனுமதிக்கப்படும் அதிகபட்சக் கைரேகைகளைச் சேர்த்துவிட்டீர்கள்"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"மேலும் கைரேகைகளைச் சேர்க்க முடியவில்லை"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"இயக்கப்பட்டுள்ளது"</string>
     <string name="external_display_off" msgid="5634413756025351374">"முடக்கப்பட்டுள்ளது"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"வெளிப்புற டிஸ்ப்ளே"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"வெளிப்புற டிஸ்ப்ளேவைப் பயன்படுத்துதல்"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"டிஸ்ப்ளே தெளிவுத்திறன்"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"வெளிப்புற டிஸ்ப்ளே முடக்கப்பட்டுள்ளது"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"சுழற்சி அல்லது தெளிவுத்திறனை மாற்றுவது தற்போது இயக்கத்தில் இருக்கும் ஆப்ஸ் அனைத்தையும் நிறுத்தக்கூடும்"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"திரையைப் பிரதிபலிக்க உங்கள் சாதனம் வெளிப்புற டிஸ்ப்ளேயுடன் இணைக்கப்பட்டிருக்க வேண்டும்"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"கூடுதல் விருப்பங்கள்"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"காட்சிகளை மறுவரிசைப்படுத்த பிடித்து இழுங்கள்."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"அலைபரப்பு"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"பிரதிபலித்தல்"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"வயர்லெஸ் காட்சியை இயக்கு"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"கடவுச்சொல்லைச் சரிபார்த்து மீண்டும் முயலவும்"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"சாதன தயாரிப்பாளரைத் தொடர்புகொள்ளவும்"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"இணைப்பைச் சரிபார்த்து மீண்டும் முயலவும்"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"இந்த வைஃபை நெட்வொர்க் தற்போது கிடைக்கவில்லை"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"இந்த QR குறியீட்டில் சிக்கல் உள்ளது. வேறு முறையில் இணைக்க முயலவும்."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"நெட்வொர்க்கைத் தேர்வுசெய்தல்"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"உங்கள் சாதனத்தை இணைப்பதற்கு நெட்வொர்க் ஒன்றைத் தேர்வுசெய்யவும்"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"“<xliff:g id="SSID">%1$s</xliff:g>” இல் சாதனத்தைச் சேர்க்கவா?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"\'தானாகச் சுழற்று\' அமைப்பு குறித்து மேலும் அறிக"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"திரையின் தெளிவுத்திறன்"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"உயர் தெளிவுத்திறன்"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"முழுத் தெளிவுத்திறன்"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"முழுத் தெளிவுத்திறனை அமைத்தால் பேட்டரி அதிகமாகப் பயன்படுத்தப்படும். தெளிவுத்திறனை மாற்றினால் சில ஆப்ஸ் மீண்டும் தொடங்கக்கூடும்."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"வண்ணங்கள்"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"இயற்கை வண்ணம்"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"சூழலுக்கேற்றது"</string>
     <string name="brightness" msgid="6216871641021779698">"ஒளிர்வு நிலை"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"சூழலுக்கேற்ற ஒளிர்வு"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"சூழலுக்கேற்ற ஒளிர்வு குறித்த அறிமுகம்"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"நீங்கள் இருக்கும் சூழலுக்கும், செய்யும் வேலைகளுக்கும் ஏற்றவாறு, தானாகவே உங்களின் திரை ஒளிர்வு கூடும், குறையும். நீங்கள் எவ்வளவு வெளிச்சத்தை விரும்புகிறீர்கள் என்பதைச் சூழலுக்கேற்ற ஒளிர்வு தெரிந்துகொள்ள, ஸ்லைடரைக் கைமுறையாக நகர்த்தலாம்."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ஆன்"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ஆஃப்"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"உறக்கநேரப் பயன்முறை அமைப்புகள்"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{பயன்முறைகள் டார்க் தீமையும் இயக்கலாம்}=1{{mode_1} டார்க் தீமையும் இயக்கும்}=2{{mode_1}, {mode_2} ஆகியவை டார்க் தீமையும் இயக்கும்}=3{{mode_1}, {mode_2}, {mode_3} ஆகியவை டார்க் தீமையும் இயக்கும்}other{{mode_1}, {mode_2} மற்றும் # பயன்முறைகள் டார்க் தீமையும் இயக்கும்}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"பயன்முறைகளுக்கான அமைப்புகள்"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"வெளிச்சத்தை மேலும் குறைத்தல்"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"மிகக் குறைவான வெளிச்சம்"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"சாதனத்தின் வெளிச்சத்தை வழக்கத்தைவிடக் குறைக்க அனுமதிக்கலாம்"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"திரை அணைவு நேரம்"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். மற்றவற்றிற்கும் இதைப் பயன்படுத்தலாம், உதாரணமாக, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துதல்."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"இருப்பிடச் சேவைகள்"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"இருப்பிடச் சேவைகள்"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"இருப்பிடத்தைப் பயன்படுத்துதல்"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"நேர மண்டலத்தை அமைக்க இருப்பிடத்தைப் பயன்படுத்துதல்"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"தானாக நேர மண்டலத்தை அமைக்க முடியாது"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"இருப்பிடம் அல்லது இருப்பிடச் சேவைகள் முடக்கப்பட்டுள்ளன"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"இருப்பிட அமைப்புகள்"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"இதைச் சரிசெய்"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ரத்துசெய்"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"தானியங்கு நேர மண்டலம் முடக்கப்பட்டுள்ளது"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"நேர மண்டலத்தைத் தானாகவே கண்டறிதல் முடக்கப்பட்டிருக்கும்போது கிடைக்காது"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"நேர மண்டலத்தை அமைக்க இருப்பிடம் பயன்படுத்தப்படலாம்"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"உங்கள் சாதனத்தின் இருப்பிடம் கிடைத்தால், உங்கள் நேர மண்டலத்தை அமைக்க அது பயன்படுத்தப்படலாம்"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"சட்டத் தகவல், நிலை மற்றும் மென்பொருள் பதிப்பைக் காட்டு"</string>
     <string name="legal_information" msgid="7509900979811934843">"சட்டத் தகவல்"</string>
     <string name="manual" msgid="3651593989906084868">"கைமுறை"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"விருப்பங்கள்"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"மாற்றுத்திறன் வசதி"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"கைமுறை கீபோர்டு"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"பவுன்ஸ் விசைகள்"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> மில்லி வினாடிக்குள் ஒரே பட்டனைத் தொடர்ச்சியாக அழுத்துவதைக் கீபோர்டு புறக்கணிக்கிறது"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ஒரே பட்டனைத் தொடர்ச்சியாக அழுத்துவதைக் கீபோர்டு விரைவாகப் புறக்கணிக்கிறது"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"பவுன்ஸ் பட்டன் வரம்பு"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"தொடர்ச்சியாகப் பட்டன் அழுத்தப்படுவதைக் கீபோர்டு புறக்கணிப்பதற்கான கால அளவைத் தேர்வுசெய்யுங்கள்"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 வினாடி"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 வினாடி"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 வினாடி"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"பிரத்தியேகம்"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"பிரத்தியேகமான மதிப்பு"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ஸ்லோ கீஸ்"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"ஒரு பட்டனை அழுத்துவதற்கு எடுக்கும் நேரத்தை <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> மில்லி வினாடியாகச் சரிசெய்துகொள்கிறது"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ஒரு பட்டனை அழுத்துவதற்கு எடுக்கும் நேரத்தை மாற்றலாம்"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ஸ்டிக்கி கீஸ்"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ஷார்ட்கட்களுக்கு பட்டன்களை ஒன்றாகப் பிடிப்பதற்குப் பதிலாக ஒரு நேரத்தில் ஒரு பட்டனை அழுத்தலாம்"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"மவுஸ் பட்டன்கள்"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"மவுஸைக் கட்டுப்படுத்த கீபோர்டைப் பயன்படுத்தவும்."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"மவுஸ் பட்டன்களைப் பயன்படுத்துங்கள்"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"பாயிண்ட்டரைக் கட்டுப்படுத்த உங்கள் கீபோர்டைப் பயன்படுத்தலாம்"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"மவுஸ் ரிவர்ஸ் ஸ்க்ரோலிங்"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"பக்கத்தை மேலிருந்து கீழே நகர்த்த மவுஸை முன்னோக்கி ஸ்க்ரோல் செய்யலாம்"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"இடதுபுற மற்றும் வலதுபுற பட்டன்களை மாற்றுதல்"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"இடதுபுற மவுஸ் பட்டனை வலதுபுற பட்டனாகப் பயன்படுத்தலாம்"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>க்கான மவுஸ் பட்டன்கள்"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"மவுஸ் பாயிண்ட்டரை நகர்த்த <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> பட்டன்களைப் பயன்படுத்துங்கள்"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"முதன்மை மவுஸ் பட்டனைக் கிளிக் செய்ய <xliff:g id="CLICK_LABEL">%s</xliff:g> பட்டனைப் பயன்படுத்துங்கள்"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"முதன்மை மவுஸ் பட்டனை அழுத்திப் பிடிக்க <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> பட்டனைப் பயன்படுத்துங்கள்"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"முதன்மை மவுஸ் பட்டனை விடுவிக்க <xliff:g id="RELEASE_LABEL">%s</xliff:g> பட்டனைப் பயன்படுத்துங்கள்"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"நகர்த்துதல் பயன்முறையை நிலைமாற்ற <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> பட்டனைப் பயன்படுத்துங்கள். இதன்மூலம் <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> பட்டன்களைப் பயன்படுத்தி காட்சியை மேலே, கீழே, இடதுபுறம் அல்லது வலதுபுறம் நகர்த்தலாம்"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"இரண்டாவது மவுஸ் பட்டனைக் கிளிக் செய்ய <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> பட்டனைப் பயன்படுத்துங்கள்"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"கீபோர்டு ஷார்ட்கட்கள்"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ஷார்ட்கட்களின் பட்டியலைக் காட்டும்"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"பணிக் கணக்கிற்கான கீபோர்டுகள் &amp; கருவிகள்"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"இயல்பு"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"டச்பேட்"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"டச்பேட் &amp; மவுஸ்"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"மவுஸ்"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"பாயிண்ட்டர் வேகம், சைகைகள்"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"கிளிக் செய்ய தட்டுதல்"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"தட்டி இழுத்தல்"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"கீழ்வலது மூலையில் கிளிக் செய்தல்"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"மேலும் விருப்பங்களுக்கு டச்பேடின் கீழ்வலது மூலையில் தட்டுக"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"பாயிண்ட்டர் வேகம்"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"மூன்று விரலால் தட்டுங்கள்"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"பாயிண்டரின் வண்ணம்"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"பாயிண்ட்டர் ஃபில் ஸ்டைலைக் கருப்பாக மாற்றலாம்"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"பாயிண்ட்டர் ஃபில் ஸ்டைலைப் பச்சையாக மாற்றலாம்"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"டச்பேட் சைகைகளை அறிந்துகொள்ளுங்கள்"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"டிராக்பேட், டிராக் பேட், மவுஸ், கர்சர், ஸ்க்ரோல், ஸ்வைப், வலது கிளிக், கிளிக், பாயிண்ட்டர்"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"வலது கிளிக், தட்டு"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"மிடில் கிளிக்"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistantடைத் தொடங்கு"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"முகப்பிற்குச் செல்"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"பின்செல்"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"சமீபத்திய ஆப்ஸைக் காட்டு"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"முகப்பிற்குச் செல்"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"டச்பேடில் மூன்று விரல்களால் மேல்நோக்கி ஸ்வைப் செய்யுங்கள்"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"பின்செல்"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>க்கு புதிய விசையை தேர்வுசெய்யலாம்:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"கீபோர்டுக்கான மாற்றுத்திறன் வசதி"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ஸ்டிக்கி கீஸ், பவுன்ஸ் கீஸ், மவுஸ் கீஸ்"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"ரிப்பீட் பட்டன்கள்"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"தொடர்ச்சியான எழுத்துகளுக்கு இடையிலான நேர இடைவெளி"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"ரிப்பீட் விகிதம்"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"ஒரு பட்டனை அழுத்திப் பிடித்திருந்து அதை விடுவிக்கும்வரை அதிலுள்ள எழுத்து தொடர்ச்சியாக டைப் செய்யப்படும்"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> தளவமைப்பு"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"இயல்பு"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"தானியங்கு: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2206,7 +2265,7 @@
     <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="7346399253904683940">"அணுகல்தன்மை சைகை"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"இரண்டு விரல்கள் மூலம் மேல்நோக்கி ஸ்வைப் செய்தல்"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"மூன்று விரல்கள் மூலம் மேல்நோக்கி ஸ்வைப் செய்தல்"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software" msgid="6505512764022389951">"அணுகல்தன்மை பட்டன்"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software" msgid="6505512764022389951">"மாற்றுத்திறன் பட்டன்"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_floating_button" msgid="6266489864614886247">"மிதக்கும் பட்டனைத் தட்டவும்"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_by_gesture" msgid="4775049370625630546">"மாற்றுத்திறன் சைகை"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="8315934725362849788">"திரையின் கீழ்ப்பகுதியில் உள்ள அணுகல்தன்மை பட்டனை <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> தட்டுங்கள். அம்சங்களுக்கு இடையே மாற, அணுகல்தன்மை பட்டனைத் தொட்டுப் பிடியுங்கள்."</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"முன்னோட்டம்"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"நிலையான விருப்பங்கள்"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"மொழி"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"எழுத்தின் அளவு"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"வசன எழுத்து வடிவ அளவு"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"வசனத்தின் நடை"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"பிரத்தியேக விருப்பங்கள்"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"பின்புல வண்ணம்"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"உள்ளடங்கும் தொகுப்புகள்"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ஆப்ஸ் வழக்கம்போல் இயங்குகின்றன"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"பேட்டரியை மாற்றும்படி பரிந்துரைக்கப்படுகிறது"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"பேட்டரி திறனும் சார்ஜிங் செயல்திறனும் குறைந்துள்ளன. பேட்டரியை மாற்றும்படி பரிந்துரைக்கப்படுகிறது."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"குறைவான பேட்டரி அளவு"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"பேட்டரி ஆயுளை நீட்டிக்க பேட்டரி சேமிப்பானை இயக்குக"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"பேட்டரி ஆயுளை மேம்படுத்துதல்"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"VPNஐத் துண்டிக்கவா?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"தொடர்பைத் துண்டி"</string>
     <string name="vpn_version" msgid="6344167191984400976">"பதிப்பு"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"பதிப்பு <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNஐ நீக்கு"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"எப்போதும் இயங்கும் VPNஐ அமைக்கவா?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"வாரநாட்களில் காலை 9 மணி முதல் மாலை 5 மணி வரை\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"கேலெண்டர் நிகழ்வுகள்"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} செயலில் உள்ளது}=2{{mode_1} மற்றும் {mode_2} செயலில் உள்ளன}=3{{mode_1}, {mode_2} மற்றும் {mode_3} செயலில் உள்ளன}other{{mode_1}, {mode_2} மற்றும் கூடுதலாக # பயன்முறைகள் செயலில் உள்ளன}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 பயன்முறை தானாக இயங்கலாம்}other{# பயன்முறைகள் தானாக இயங்கலாம்}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{தொந்தரவு செய்ய வேண்டாம்}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ஆன்"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"அமைக்கப்படவில்லை"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"முடக்கப்பட்டுள்ளது"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"புரிந்தது"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"அறிவிப்புகள்"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"கால அளவு"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"மெசேஜஸ், நிகழ்வுகள் &amp; நினைவூட்டல்கள்"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும்போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"முடிந்தது"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"அமைப்புகள்"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"அறிவிப்புகளைப் பார்க்கவோ கேட்கவோ மாட்டீர்கள். நட்சத்திரமிட்ட தொடர்புகள் மற்றும் மீண்டும் அழைப்பவர்களிடமிருந்து வரும் அழைப்புகள் அனுமதிக்கப்படும்."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(தற்போதைய அமைப்பு)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\'தொந்தரவு செய்ய வேண்டாம்\' அறிவிப்பு அமைப்புகளை மாற்றவா?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"பணிக் கணக்கு ஒலிகள்"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"தனிப்பட்ட சுயவிவரத்தின் ஒலிகளைப் பயன்படுத்து"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"தனிப்பட்ட கணக்கின் அதே ஒலிகளைப் பயன்படுத்தும்"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"அன்லாக் செய்ததும், கடைசியாகப் பயன்படுத்திய திரைக்குச் செல்லும். பூட்டுத்திரையில் அறிவிப்புகள் தோன்றாது. அவற்றைப் பார்க்க மேலிருந்து கீழே ஸ்வைப் செய்க."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"லாக் ஸ்கிரீன், லாக்ஸ்கிரீன், தவிர், தவிர்த்துச் செல்"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"பணிக் கணக்கு பூட்டியிருந்தால்"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"பூட்டுத் திரையில் அறிவிப்பைக் குறைத்தல்"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"பூட்டுத் திரையில் அறிவிப்புகளைக் குறைவாகக் காட்டும்"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"பூட்டுத் திரையில் புதிய அறிவிப்புகளை மட்டும் காட்டு"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"ஏற்கெனவே பார்த்த அறிவிப்புகளைப் பூட்டுத் திரையில் இருந்து தானாகவே அகற்றும்"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"லாக்ஸ்கிரீனில் அறிவிப்புகள்"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"உரையாடல்கள், இயல்புநிலை &amp; ஒலியில்லா அறிவிப்புகளைக் காட்டும்"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"உரையாடல், இயல்புநிலை மற்றும் ஒலியில்லா அறிவிப்புகளைக் காட்டு"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"எல்லா பணி அறிவிப்பு விவரத்தையும் காட்டு"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"பாதுகாக்க வேண்டிய பணி உள்ளடக்கத்தை மறை"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"சாதனம் பூட்டப்பட்டிருக்கும் போது, சுயவிவர அறிவிப்புகளை எப்படிக் காட்ட வேண்டும்?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"குறுகிய காலத்தில் பல அறிவிப்புகளைப் பெறும்போது, 2 நிமிடங்கள் வரை உங்கள் சாதனம் அதன் ஒலியளவைக் குறைத்து விழிப்பூட்டல்கள் பெறுவதை நிறுத்திவைக்கும். அழைப்புகள், அலாரங்கள் மற்றும் முக்கியமான உரையாடல்கள் பாதிக்கப்படாது. \n\nதிரையின் மேலிருந்து கீழே இழுப்பதன் மூலம் குறைந்த ஒலியளவில் இருக்கும்போது பெற்ற அறிவிப்புகளைப் பார்க்கலாம்."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"பணிக் கணக்குகளுக்குப் பயன்படுத்துதல்"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"பணிக் கணக்கு ஆப்ஸுக்குப் பயன்படுத்தும்"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"தொகுக்கப்பட்ட அறிவிப்புகள்"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"இயக்கப்பட்டுள்ளது"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"முடக்கப்பட்டுள்ளது"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"அறிவிப்பைத் தொகுத்தலைப் பயன்படுத்துதல்"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"அமைதியான அனுபவத்திற்காக ஒரே மாதிரியான தீம்களுடைய அறிவிப்புகள் ஒலியடக்கப்பட்டு ஒன்றிணைக்கப்படும். தொகுத்தல் ஆப்ஸின் சொந்த அறிவிப்பு அமைப்புகளை மீறிச் செயல்படும்."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR உதவிச் சேவைகள்"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"நிறுவப்பட்ட ஆப்ஸ்களில் எதுவும் VR உதவிச் சேவைகளாக இயங்குவதற்காகக் கோரவில்லை"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ஆனது VR சேவையை அணுக அனுமதிக்கவா?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"முக்கியமான உரையாடல்கள்"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ஏதுமில்லை"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{எதுவுமில்லை}=1{1 உரையாடல்}other{# உரையாடல்கள்}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"உரையாடல்களுக்கான அமைப்புகள்"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"யாரால் குறுக்கிட முடியும்?"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"மெசேஜிங் அல்லது அழைப்பு ஆப்ஸ் உங்களுக்கு அறிவிப்பு அனுப்பவில்லை என்றாலும், நீங்கள் இங்கே தேர்ந்தெடுத்துள்ளவர்களால் அந்த ஆப்ஸ் மூலம் உங்களைத் தொடர்புகொள்ள முடியும்"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"அழைப்புகள்"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"எவரிடம் இருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"தொடர்புகள்"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"தொடர்புகளுக்கான அமைப்புகள்"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"நட்சத்திரமிடப்பட்ட தொடர்புகளுக்கான அமைப்புகள்"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ஏதுமில்லை"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ஏதுமில்லை"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"அலாரங்கள்"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (பணி)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"கணக்கிடுகிறது…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"ஆப்ஸ் அமைப்புகள்"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ஆப்ஸை மீறிச் செயல்பட அனுமதிக்கின்றன"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"குறுக்கிட முடிகின்ற ஆப்ஸ்"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"பயன்முறை உருவாக்குதல்"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"பிரத்தியேகப் பயன்முறை"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"பயன்முறையின் பெயர்"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"பயன்முறை பெயர் காலியாக இருக்கக்கூடாது"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ஐகானைத் தேர்வுசெய்யுங்கள்"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"கேலெண்டர் நிகழ்வுகள்"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"உறக்கநேர வழக்கம்"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"வாகனம் ஓட்டும்போது"</string>
@@ -4128,7 +4210,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
     <string name="zen_modes_access_warning_dialog_title" msgid="8372164559156809659">"<xliff:g id="APP">%1$s</xliff:g> ஆப்ஸுக்குப் பயன்முறைகளுக்கான அணுகலை அனுமதிக்கவா?"</string>
-    <string name="zen_modes_access_warning_dialog_summary" msgid="2432178679607798200">"ஆப்ஸால் \'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தை இயக்க/முடக்க முடியும், பயன்முறையை நிர்வகிக்கவும் செயல்படுத்தவும் முடியும், தொடர்புடைய அமைப்புகளை மாற்ற முடியும்."</string>
+    <string name="zen_modes_access_warning_dialog_summary" msgid="2432178679607798200">"ஆப்ஸால் \'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தை இயக்க/முடக்க முடியும், பயன்முறைகளை நிர்வகிக்கவும் செயல்படுத்தவும் முடியும், தொடர்புடைய அமைப்புகளை மாற்ற முடியும்."</string>
     <string name="zen_modes_access_revoke_warning_dialog_title" msgid="189454396436517964">"<xliff:g id="APP">%1$s</xliff:g> ஆப்ஸின் பயன்முறைகளுக்கான அணுகலைத் தவிர்க்கவா?"</string>
     <string name="zen_modes_access_revoke_warning_dialog_summary" msgid="4669243849023204217">"இந்த ஆப்ஸ் உருவாக்கிய அனைத்துப் பயன்முறைகளும் அகற்றப்படும்."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"மேம்படுத்த வேண்டாம்"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"முழுத்திரை அறிவிப்புகள்"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"இந்த ஆப்ஸிலிருந்து முழுத்திரை அறிவிப்புகளைக் காட்ட அனுமதித்தல்"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"சாதனம் பூட்டப்பட்டிருக்கும்போது முழுத்திரையில் அறிவிப்புகளைக் காட்ட இந்த ஆப்ஸை அனுமதிக்கும். அலாரங்கள், உள்வரும் அழைப்புகள் அல்லது பிற அவசர அறிவிப்புகளைத் தனிப்படுத்திக் காட்ட ஆப்ஸ் இவற்றைப் பயன்படுத்தக்கூடும்."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"சிஸ்டம் விருப்பத்தேர்வுகளை எழுதுதல்"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"உங்கள் சார்பாக சிஸ்டம் விருப்பத்தேர்வுகளை மாற்ற இந்த ஆப்ஸை அனுமதித்தல்"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"இந்த அனுமதியைக் கொண்டுள்ள ஆப்ஸால் முக்கியமான சிஸ்டம் விருப்பத்தேர்வுகளை மாற்ற முடியும்."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"மீடியா நிர்வாக ஆப்ஸ்"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"மீடியாவை நிர்வகிக்க ஆப்ஸை அனுமதித்தல்"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"அனுமதி வழங்கப்பட்டால், பிற ஆப்ஸ் மூலம் உருவாக்கப்பட்ட மீடியா ஃபைல்களை உங்களிடம் கேட்காமலேயே இந்த ஆப்ஸால் மாற்றவோ நீக்கவோ முடியும். ஃபைல்களையும் மீடியாவையும் அணுக ஆப்ஸுக்கு அனுமதி வேண்டும்."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"சைகைகள்"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"கேமராவை விரைவாகத் திறத்தல்"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"கேமராவை விரைவாகத் திறக்க, பவர் பட்டனை இருமுறை அழுத்தவும். எந்தத் திரையிலும் கேமரா இயங்கும்."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"செல்ஃபி எடுக்க கேமராவை ஃப்ளிப் செய்தல்"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"வழிசெலுத்தல் பயன்முறை"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"சாட்டிலைட் மெசேஜிங்"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"சாட்டிலைட் மூலம் மெசேஜ்களை அனுப்பவும் பெறவும் முடியும். உங்கள் கணக்கில் சேர்க்கப்பட்டுள்ளது."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"சாட்டிலைட் மூலம் மெசேஜ்களை அனுப்பலாம் பெறலாம். இந்தச் சேவை உங்கள் கணக்கிற்கு இல்லை."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"சாட்டிலைட் மெசேஜிங்"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"சாட்டிலைட் மெசேஜிங் பற்றிய அறிமுகம்"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"தகுதியான <xliff:g id="CARRIER_NAME">%1$s</xliff:g> கணக்கின் ஒரு பகுதியாக நீங்கள் சாட்டிலைட் மூலம் மெசேஜ்களை அனுப்பலாம் பெறலாம்"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"உங்கள் <xliff:g id="CARRIER_NAME">%1$s</xliff:g> திட்டம்"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"சாட்டிலைட் மெசேஜிங் உங்கள் கணக்கில் சேர்க்கப்பட்டுள்ளது"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"சாட்டிலைட் மெசேஜிங் உங்கள் கணக்கில் சேர்க்கப்படவில்லை"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"மேலும் அறிக"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"இது செயல்படும் விதம்"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"உங்கள் மொபைல் சாட்டிலைட்டுடன் தானாக இணைக்கப்படும். சிறந்த இணைப்பிற்கு வானம் தெளிவாகத் தெரியும் இடத்தில் வையுங்கள்."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"சாட்டிலைட்டுடன் மொபைல் இணைக்கப்பட்ட பிறகு"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"அவசரகாலச் சேவைகள் உட்பட எவருக்கும் நீங்கள் மெச்செஜ் அனுப்பலாம். மொபைல் நெட்வொர்க் கிடைக்கும்போது அதனுடன் உங்கள் மொபைல் மீண்டும் இணையும்."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"சாட்டிலைட் மெசேஜிங் மூலம் மெசேஜ் அனுப்புவதற்கு அதிக நேரம் ஆகலாம். மேலும் சில பகுதிகளில் மட்டுமே இந்தச் சேவை கிடைக்கும். வானிலை மற்றும் சில கட்டமைப்புகள் உங்கள் சாட்டிலைட் இணைப்பைப் பாதிக்கக்கூடும். சாட்டிலைட் மூலம் அழைக்க முடியவில்லை. அவசர அழைப்புகளை இப்போதும் தொடர்புகொள்ளலாம்.\n\nஅமைப்புகளில் கணக்கு மாற்றங்கள் காட்டப்படுவதற்குச் சிறிது நேரம் ஆகலாம். விவரங்களுக்கு உங்கள் மொபைல் நெட்வொர்க்கைத் தொடர்புகொள்ளுங்கள்."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"சாட்டிலைட் மெசேஜிங் குறித்த கூடுதல் தகவல்கள்"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> ஐ இயக்க முடியவில்லை"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> ஐ இயக்க, முதலில் சாட்டிலைட் இணைப்பை முடக்கவும்"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"சாட்டிலைட் இணைப்புநிலை"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ஆக்சஸ் பாயிண்ட் நேம்கள்"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"பக்கம் சாராத பயன்முறையின் 16 கி.பை. பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, 4 கி.பை. பயன்முறைக்கு அமைத்து சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். இது சாதனத்தை மீண்டும் ஆரம்பநிலைக்கு மீட்டமைக்கும் மற்றும் தயாரிப்பு அமைப்புகளுக்கு மீட்டெடுக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும். சாதனம் Androidல் தொடங்கவில்லை அல்லது நிலையற்றதாக இருந்தால் &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; பக்கத்தில் இருந்து சமீபத்திய ஃபேக்டரி பிரதி மூலம் சாதனத்தை மீண்டும் ஃபிளாஷ் செய்யவும் அல்லது &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; இணைப்பைப் பயன்படுத்தி \'சாதனத்தைப் படிக்க முடியாதபடி செய்\', \'பூட்லோடரைப் பூட்டு\' மற்றும் \'அனைத்துப் பார்டிஷன்களையும் வேகமாக ஃபிளாஷ் செய்\' என்பதைத் தேர்ந்தெடுக்கவும்."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 கி.பை. பக்கம் சாராத பயன்முறை"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"மேலும் காட்டு"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"பக்க அளவு இணக்கப் பயன்முறையில் ஆப்ஸை இயக்குதல்"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"பிழை அறிக்கை ஹேண்ட்லர்"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"உங்கள் சாதனத்தில் பிழை அறிக்கைக்கான ஷார்ட்கட்டை எந்த ஆப்ஸ் கையாள வேண்டும் என்பதைத் தீர்மானிக்கும்."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"தனிப்பட்டது"</string>
@@ -5003,7 +5155,7 @@
     <string name="default_app_none" msgid="5420632042222036264">"ஏதுமில்லை"</string>
     <string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"இனி இந்தத் தேர்வைப் பயன்படுத்த முடியாது. மீண்டும் முயலவும்."</string>
     <string name="power_menu_setting_name" msgid="2394440932633137229">"பவர் பட்டனை அழுத்திப் பிடித்தல்"</string>
-    <string name="power_menu_long_press_category_title" msgid="1051146091093775002">"பவர் பட்டனை அழுத்திப் பிடிக்கையில், இதை அணுகு"</string>
+    <string name="power_menu_long_press_category_title" msgid="1051146091093775002">"இதை அணுக, பவர் பட்டனை அழுத்திப் பிடிக்கவும்"</string>
     <string name="power_menu_long_press_for_power_menu_title" msgid="477584639843663599">"பவர் மெனு"</string>
     <string name="power_menu_long_press_for_assistant_title" msgid="6557738348262616455">"டிஜிட்டல் அசிஸ்டண்ட்"</string>
     <string name="power_menu_summary_long_press_for_assistant" msgid="32706459458422952">"டிஜிட்டல் அசிஸ்டண்ட்டை அணுக"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ஸ்ட்ரீமைக் கேளுங்கள்"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> மூலம் கேட்க ஆடியோ ஸ்ட்ரீமின் QR குறியீட்டை ஸ்கேன் செய்யுங்கள்"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"பகிரும்போது கடவுச்சொல்லை மாற்ற முடியாது. கடவுச்சொல்லை மாற்ற, முதலில் ஆடியோ பகிர்வை முடக்கவும்."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"கடவுச்சொல் 4-16 எழுத்துகளைக் கொண்டிருக்க வேண்டும். அதில் எழுத்துகள், எண்கள், குறியீடுகளை மட்டுமே பயன்படுத்த வேண்டும்."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR குறியீடு ஸ்கேனர்"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"உதவி தேவையா?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"அமைப்புகளைத் தேடுங்கள்"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"தொடர்புகள், சேமிப்பகம், கணக்கு"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"தொடர்புகள் சேமிப்பகம்"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"சாதனம் மட்டும்"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"புதிய தொடர்புகளை ஒரு கணக்குடன் ஒத்திசைக்க முடியாது"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"இயல்பாகவே தொடர்புகள் உங்கள் சாதனத்தில் சேமிக்கப்படும், உங்கள் கணக்குடன் ஒத்திசைக்கப்படும்"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"இயல்புக் கணக்கை அமைப்பதில் பிழை"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"இயல்புக் கணக்கு அமைக்கப்படவில்லை"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"சாதனம் மட்டும்"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"சாதனம் மற்றும் %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"தொடங்குவதற்கு ஒரு கணக்கைச் சேருங்கள்"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"தொடர்புகளைச் சேமிக்கும் இடம்"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"வட்டமிட்டுத் தேடல்"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"முகப்பு பட்டனைத் தொட்டுப் பிடித்திருக்கவும் அல்லது திரையில் உள்ள உள்ளடக்கத்தைப் பயன்படுத்தித் தேடுவதற்கு ஹேண்டிலுக்குச் செல்லவும்."</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 6bc726692a6..55b418ea143 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"స్నోఫ్లేక్"</item>
     <item msgid="7952183800501346803">"బీచ్ గొడుగు"</item>
     <item msgid="799139025758265891">"వర్క్‌షాప్ టూల్స్"</item>
-    <item msgid="1330084588359129896">"టెంట్"</item>
+    <item msgid="8112685757657659269">"పియానో"</item>
     <item msgid="3861584909935022342">"ఫిల్మ్ రీల్"</item>
     <item msgid="5827426100157335512">"పుస్తకం"</item>
     <item msgid="8585828346253128384">"తామర పువ్వు"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e553fbb78b6..ba48d518cb8 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"కొత్త పరికరాన్ని పెయిర్ చేయండి"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"బ్లూటూత్"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"రేపు ఆటోమేటిక్‌గా ఆన్ చేయండి"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"మీరు బ్లూటూత్‌ను ఆఫ్ చేస్తే, మర్నాడు అది మళ్లీ ఆన్ అవుతుంది"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"కుడి చెవి పెయిర్"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"ఎడమ చెవి పెయిర్"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"మీ మరో చెవిని పెయిర్ చేయి"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"బ్లూటూత్ LE ఆడియోను డిజేబుల్ చేయండి"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"పరికరం గనుక LE ఆడియో హార్డ్‌వేర్ సామర్థ్యాలను సపోర్ట్ చేస్తే బ్లూటూత్ LE ఆడియో ఫీచర్‌ను డిజేబుల్ చేస్తుంది."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"బ్లూటూత్ LE ఆడియో మోడ్"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"బ్లూటూత్ LE ఆడియో ప్రసార UI ప్రివ్యూను ఎనేబుల్ చేయండి"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"వ్యక్తిగత ఆడియో షేరింగ్, ప్రైవేట్ ప్రసారంతో పాటు LE ఆడియో షేరింగ్ UI ప్రివ్యూను ఎనేబుల్ చేస్తుంది"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"పరికర వివరాలలో LE ఆడియో టోగుల్‌ను చూపండి"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"బ్లూటూత్ LE ఆడియో వైట్‌లిస్ట్‌ను బైపాస్ చేయండి"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"వైట్‌లిస్ట్ ప్రమాణాలకు అనుగుణంగా LE ఆడియో పెరిఫెరల్ వెరిఫై చేయబడనప్పటికీ ఆటోమేటిక్‌గా LE ఆడియోను ఉపయోగించండి."</string>
@@ -136,7 +139,7 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"అన్నీ చూడండి"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"అన్నింటినీ చూడండి"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"స్టయిలస్"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"స్టయిలస్ బటన్‌ను నొక్కండి"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"టెయిల్ బటన్‌ను నొక్కండి"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (వర్క్ ప్రొఫైల్)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"టెక్స్ట్ ఫీల్డ్‌లలో రాయండి"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"అన్ని స్టయిలస్ బటన్ ప్రెస్‌లను విస్మరించండి"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"యాప్ భాష"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"సూచించిన భాషలు"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"అన్ని భాషలు"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"సూచించబడినవి"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"అన్ని భాషలు"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"అన్ని ప్రాంతాలు"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"అన్ని నంబరింగ్ సిస్టమ్‌లు"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"సిస్టమ్ భాష"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"సిస్టమ్ ఆటోమేటిక్ సెట్టింగ్"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"ఈ యాప్ కోసం భాష ఎంపిక సెట్టింగ్‌లలో అందుబాటులో లేదు."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"మార్చండి"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s అందుబాటులో లేదు"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ఈ భాషను సిస్టమ్ భాషగా ఉపయోగించలేరు, కానీ మీరు ఇది మీ ప్రాధాన్య భాష అని యాప్‌లకు, వెబ్‌సైట్‌లకు తెలియజేశారు."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"సెర్చ్"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"భాషను జోడించండి"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ప్రాంతం ప్రాధాన్యత"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"భాష పేరును టైప్ చేయండి"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"మరిన్ని భాషా సెట్టింగ్‌లు"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ప్రాంతీయ ప్రాధాన్యతలు"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"యానిట్‌లు, నంబర్ ప్రాధాన్యతలను సెట్ చేయండి"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"యాప్‌లకు మీ ప్రాంతీయ ప్రాధాన్యతలను తెలియజేయండి, తద్వారా అవి మీ అనుభవాన్ని వ్యక్తిగతీకరించగలుగుతాయి."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"యాప్‌లు సాధ్యమైన చోట మీ ప్రాంతీయ ప్రాధాన్యతలను ఉపయోగిస్తాయి."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ప్రాంతీయ ప్రాధాన్యతలు"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"ఉష్ణోగ్రత"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"వారంలో మొదటి రోజు"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"నంబర్‌ల ప్రాధాన్యతలు"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సర్వీసులకు కనెక్ట్ చేయండి"</string>
     <string name="roaming_disable" msgid="729512894708689604">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సర్వీసులకు కనెక్ట్ చేయండి"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"రోమింగ్ ఛార్జీలు వర్తించవచ్చు."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ఆటోమేటిక్‌గా టైమ్‌ను సెట్ చేయండి"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ఆటోమేటిక్‌గా సెట్ చేయండి"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ఈ టోగుల్ ఆన్‌లో ఉన్నప్పుడు టైమ్ జోన్‌ను సెట్ చేయడానికి లొకేషన్ ఉపయోగించబడుతుంది"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"ఆటోమేటిక్ తేదీ, సమయం"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"మీ నెట్‌వర్క్, వైర్‌లెస్ సిగ్నల్స్‌ను ఉపయోగించి ఆటోమేటిక్‌గా సెట్ చేయండి"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"ఆటోమేటిక్ టైమ్ జోన్"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"మీకు దగ్గరలో ఉన్న మొబైల్ నెట్‌వర్క్‌ల ఆధారంగా ఆటోమేటిక్‌గా సెట్ చేయబడింది"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"అందుబాటులో ఉంటే, మీ పరికర లొకేషన్‌తో ఆటోమేటిక్‌గా సెట్ చేయండి"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ఈ భాష‌లో వాడే ఫార్మాట్‌ను ఆటోమేటిక్‌ సెట్టింగ్‌గా ఉప‌యోగించండి"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-గంటల ఫార్మాట్‌ను ఉప‌యోగించండి"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"సమయం"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"వేలిని పైకి ఎత్తి, ఆపై మళ్లీ సెన్సార్‌ను తాకండి"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"వేలిముద్ర సెన్సార్‌ను ఉపయోగించడం సాధ్యం కాదు"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"రిపెయిర్ ప్రొవైడర్‌ను చూడండి."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"స్క్రీన్-ఆఫ్ వేలిముద్ర అన్‌లాక్ చేయండి"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు కూడా వేలిముద్ర అన్‌లాక్ ఫీచర్‌ను ఉపయోగించండి"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"స్క్రీన్-ఆఫ్, అన్‌లాక్ చేయండి"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"మరిన్ని సెక్యూరిటీ సెట్టింగ్‌లు"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"వర్క్ ప్రొఫైల్ లాక్, ఎన్‌క్రిప్షన్, మరిన్ని"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"ఎన్‌క్రిప్షన్, ఆధారాలు, మరిన్ని"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"మీ ప్రైవేట్ స్పేస్ కోసం ఆకృతి సెట్ చేయి"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"లాక్ చేయండి"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"దాచండి"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"మీ ప్రైవేట్ స్పేస్ ఆకృతిని నిర్ధారించండి"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"మీ ప్రైవేట్ స్పేస్ PINను మళ్లీ ఎంటర్ చేయండి"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"మీ ప్రైవేట్ స్పేస్ పాస్‌వర్డ్‌ను రీ-ఎంటర్ చేయండి"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"మీరు గరిష్ఠంగా <xliff:g id="COUNT">%d</xliff:g> వేలిముద్రలను జోడించవచ్చు"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"మీరు గరిష్ట సంఖ్యలో వేలిముద్రలను జోడించారు"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"మరిన్ని వేలిముద్రలను జోడించడం సాధ్యపడదు"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"ఆన్ అయింది"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ఆఫ్ అయింది"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"ఎక్స్‌టర్నల్ డిస్‌ప్లే"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"బిల్ట్-ఇన్ డిస్‌ప్లే"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ఎక్స్‌టర్నల్ డిస్‌ప్లేను ఉపయోగించండి"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"డిస్‌ప్లే రిజల్యూషన్"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ఎక్స్‌టర్నల్ డిస్‌ప్లే డిస్‌కనెక్టయింది"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"రొటేషన్‌ను లేదా రిజల్యూషన్‌ను మార్చడం వలన, ప్రస్తుతం రన్ అవుతున్న యాప్‌లు ఏవైనా ఉంటే, అవి ఆపివేయబడవచ్చు"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"మీ స్క్రీన్‌ను మిర్రర్ చేయాలంటే, మీ పరికరం తప్పనిసరిగా ఎక్స్‌టర్నల్ డిస్‌ప్లేకు కనెక్ట్ చేసి ఉండాలి"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"మరిన్ని ఆప్షన్‌లు"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"డిస్‌ప్లేల వరుస మార్చడానికి పట్టుకొని, లాగండి"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ప్రసారం చేయండి"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"మిర్రర్"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించండి"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"మీ పాస్‌వర్డ్‌ని సరిచూసుకొని, మళ్లీ ట్రై చేయండి"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"పరికరం తయారీదారుని సంప్రదించండి"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"కనెక్షన్‌ను పరిశీలించి, మళ్లీ ట్రై చేయండి"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"ఈ Wi-Fi నెట్‌వర్క్ ప్రస్తుతం అందుబాటులో లేదు"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"ఈ QR కోడ్‌తో సమస్య ఉంది. వేరొక విధంగా కనెక్ట్ చేయడానికి ట్రై చేయండి."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"నెట్‌వర్క్‌ను ఎంచుకోండి"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"మీ పరికరాన్ని కనెక్ట్ చేయడానికి ఒక నెట్‌వర్క్‌ని ఎంచుకోండి"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"“<xliff:g id="SSID">%1$s</xliff:g>”కి ఈ పరికరాన్ని జోడించాలా?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ఆటో-రొటేట్ గురించి మరింత తెలుసుకోండి"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"స్క్రీన్ రిజల్యూషన్"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"అధిక రిజల్యూషన్"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"పూర్తి రిజల్యూషన్"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"పూర్తి రిజల్యూషన్, మీ బ్యాటరీని ఎక్కువగా వినియోగిస్తుంది. పూర్తి రిజల్యూషన్‌కు మారడం వల్ల కొన్ని యాప్‌లు రీస్టార్ట్ అయ్యే అవకాశం ఉంది."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"పూర్తి రిజల్యూషన్"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"పూర్తి రిజల్యూషన్, మీ బ్యాటరీని ఎక్కువగా వినియోగిస్తుంది. పూర్తి రిజల్యూషన్‌కు మారడం వల్ల కొన్ని యాప్‌లు రీస్టార్ట్ అయ్యే అవకాశం ఉంది."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"ఎంచుకోబడింది"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"రంగులు"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"సహజం"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"అనుకూలం"</string>
     <string name="brightness" msgid="6216871641021779698">"ప్రకాశం స్థాయి"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"పరిసర అనుకూల ప్రకాశం"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"పరిసర అనుకూల ప్రకాశం గురించి పరిచయం"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"మీ స్క్రీన్ బ్రైట్‌నెస్, ఆటోమేటిక్‌గా మీ పరిసరాల‌కు, యాక్టివిటీలకు అనుగుణంగా అడ్జస్ట్ అవుతుంది. మీ ప్రాధాన్యతలను అర్థం చేసుకోవడంలో అనుకూల ప్రకాశానికి సహాయపడటం కోసం స్లయిడర్‌ను మీరు మాన్యువల్‌గా లాగవచ్చు."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"ఆన్"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ఆఫ్"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"నిద్రించే సమయ మోడ్ సెట్టింగ్‌లు"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{మోడ్‌లు డార్క్ థీమ్‌ను కూడా యాక్టివేట్ చేయగలవు}=1{{mode_1} డార్క్ థీమ్‌ను కూడా యాక్టివేట్ చేయగలదు}=2{{mode_1}, {mode_2} డార్క్ థీమ్‌ను కూడా యాక్టివేట్ చేయగలవు}=3{{mode_1}, {mode_2}, {mode_3} డార్క్ థీమ్‌ను కూడా యాక్టివేట్ చేయగలవు}other{{mode_1}, {mode_2}, మరో # డార్క్ థీమ్‌ను కూడా యాక్టివేట్ చేయగలవు}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"మోడ్‌ల సెట్టింగ్‌లు"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"సాధారణ స్థాయి కంటే తక్కువ"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"కాంతిని మరింత డిమ్ చేయండి"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"పరికర లైటింగ్‌ను సాధారణ స్థాయి కంటే తక్కువగా ఉంచండి"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ఆటోమేటిక్ స్క్రీన్ గడువు ముగింపు"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ఇన్‌యాక్టివ్‌గా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సర్వీస్‌లను అనుమతించండి. ఈ అనుమతి, లొకేషన్ ఆధారిత ఫీచర్‌లను, సర్వీస్‌లను మెరుగుపరచడానికి ఉపయోగించబడుతుంది. అనుమతి వల్ల కలిగే ప్రయోజనాలకు ఇది ఒక ఉదాహరణ మాత్రమే."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"లొకేషన్ సర్వీస్‌లు"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"లొకేషన్ సర్వీస్‌లు"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"లొకేషన్‌ను ఉపయోగించండి"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"టైమ్ జోన్ కోసం లొకేషన్‌ను ఉపయోగించండి"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"టైమ్ జోన్‌ను ఆటోమేటిక్‌గా సెట్ చేయడం సాధ్యం కాదు"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"లొకేషన్ లేదా లొకేషన్ సర్వీస్‌లు ఆఫ్‌లో ఉన్నాయి"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"లొకేషన్ సెట్టింగ్‌లు"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"దీనిని సరి చేయండి"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"రద్దు చేయండి"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ఆటోమేటిక్ టైమ్ జోన్ ఆఫ్‌లో ఉంది"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ఆటోమేటిక్ టైమ్ జోన్ ఆఫ్‌లో ఉన్నప్పుడు అందుబాటులో ఉండదు"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"టైమ్ జోన్‌ను సెట్ చేయడానికి లొకేషన్‌ను ఉపయోగించవచ్చు."</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"మీ పరికర లొకేషన్ అందుబాటులో ఉన్నట్లయితే, ఇది మీ టైమ్ జోన్‌ను సెట్ చేయడానికి ఉపయోగించబడవచ్చు"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"చట్టపరమైన సమాచారం, స్టేటస్‌, సాఫ్ట్‌వేర్ వెర్షన్‌ను చూడండి"</string>
     <string name="legal_information" msgid="7509900979811934843">"చట్టపరమైన సమాచారం"</string>
     <string name="manual" msgid="3651593989906084868">"మాన్యువల్"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ఆప్షన్‌లు"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"యాక్సెసిబిలిటీ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"భౌతిక కీబోర్డ్"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"బౌన్స్ కీలు"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"ఏదైనా ఒక కీని <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> మిల్లీ సెకన్ల లోపు తిరిగి నొక్కితే కీబోర్డ్ దాన్ని విస్మరిస్తుంది"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ఏదైనా ఒక కీని వేగంగా మళ్లీ మళ్లీ నొక్కుతుంటే, కీబోర్డ్ దాన్ని విస్మరిస్తుంది"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"బౌన్స్ కీ పరిమితి"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ఏదైనా ఒక కీని మళ్లీ మళ్లీ నొక్కుతుంటే మీ కీబోర్డ్ దాన్ని ఎంత సమయం పాటు విస్మరించాలో ఎంచుకోండి"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 సెకన్లు"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 సెకన్లు"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 సెకన్లు"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"అనుకూలంగా మార్చుకోండి"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"అనుకూల విలువ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"నిదానంగా పనిచేసే కీలు"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"ఒక కీని నొక్కితే, అది యాక్టివేట్ అయ్యేందుకు పట్టే సమయాన్ని <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> మిల్లీ సెకన్లకు మార్చుతుంది"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ఒక కీని నొక్కితే, అది యాక్టివేట్ అయ్యేందుకు పట్టే సమయాన్ని సర్దుబాటు చేస్తుంది"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"స్టిక్కీ కీలు"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"షార్ట్‌కట్‌ల కోసం కీలను కలిపి హోల్డ్ చేయడానికి బదులు ఒకసారి ఒక కీని నొక్కండి"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"మౌస్ కీలు"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"మౌస్‌ను కంట్రోల్ చేయడానికి ఫిజికల్ కీబోర్డ్‌ను ఉపయోగించండి."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"మౌస్ కీలను ఉపయోగించండి"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"మీ కీబోర్డ్‌ను ఉపయోగించి పాయింటర్‌ను కంట్రోల్ చేయండి"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"మౌస్ రివర్స్ స్క్రోలింగ్"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"పేజీని కిందికి కదిలించడానికి పైకి స్క్రోల్ చేయండి"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ఎడమ, కుడి బటన్‌లను మార్చండి"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ఎడమ మౌస్ బటన్‌ను, కుడి బటన్‌గా ఉపయోగించండి"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> కోసం మౌస్ కీలు"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"మౌస్ పాయింటర్‌ను తరలించడానికి <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> కీలను ఉపయోగించండి"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ప్రైమరీ మౌస్ బటన్‌ను క్లిక్ చేయడానికి <xliff:g id="CLICK_LABEL">%s</xliff:g> కీని ఉపయోగించండి"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ప్రైమరీ మౌస్ బటన్‌ను నొక్కి &amp; పట్టుకోవడానికి <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> కీని ఉపయోగించండి"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ప్రైమరీ మౌస్ బటన్‌ను రిలీజ్ చేయడానికి <xliff:g id="RELEASE_LABEL">%s</xliff:g> కీని ఉపయోగించండి"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"స్క్రోల్ మోడ్‌ను టోగుల్ చేయడానికి <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> కీని ఉపయోగించండి. ఇది <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> కీలకు సంబంధించిన వీక్షణను పైకి, కిందకి, ఎడమ లేదా కుడి వైపునకు స్క్రోల్ చేస్తుంది"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"సెకండరీ మౌస్ బటన్‌ను క్లిక్ చేయడానికి <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> కీని ఉపయోగించండి"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"కీబోర్డ్ షార్ట్‌కట్‌లు"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"షార్ట్‌కట్‌ల లిస్ట్‌ను చూడండి"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"కార్యాలయ ప్రొఫైల్ కీబోర్డ్‌లు &amp; సాధనాలు"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ఆటోమేటిక్ సెట్టింగ్"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"టచ్‌ప్యాడ్"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"టచ్‌ప్యాడ్ &amp; మౌస్"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"మౌస్"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"పాయింటర్ స్పీడ్, సంజ్ఞలు"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"క్లిక్ కోసం ట్యాప్ చేయండి"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ట్యాప్ చేసి లాగండి"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"దిగువున కుడి వైపున క్లిక్ చేయడం"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"మరిన్ని ఆప్షన్‌లకై టచ్‌ప్యాడ్ కింద కుడి మూలన క్లిక్ చేయండి"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"పాయింటర్ స్పీడ్"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"\'మూడు వేళ్లతో ట్యాప్ చేయండి\'ని ఉపయోగించండి"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"పాయింటర్ కలర్"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"పాయింటర్ ఫిల్ స్టయిల్‌ను నలుపు రంగుకి మార్చండి"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"పాయింటర్ ఫిల్ స్టయిల్‌ను ఆకుపచ్చ రంగుకి మార్చండి"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ట‌చ్‌ప్యాడ్ సంజ్ఞల‌ను తెలుసుకోండి"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ట్రాక్‌ప్యాడ్, ట్రాక్ ప్యాడ్, మౌస్, కర్సర్, స్క్రోల్, స్వైప్, కుడి క్లిక్, క్లిక్, పాయింటర్"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"కుడి క్లిక్, ట్యాప్"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"మిడిల్ క్లిక్"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistantను ప్రారంభించండి"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"మొదటి ట్యాబ్‌కు వెళ్లండి"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"వెనుకకు వెళ్లండి"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ఇటీవలి యాప్‌లను చూడండి"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"మొదటి ట్యాబ్‌కు వెళ్లండి"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"మీ టచ్‌ప్యాడ్‌పై ఎక్కడైనా మూడు వేళ్లతో పైకి స్వైప్ చేయండి"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"వెనుకకు వెళ్లండి"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> కొసం కొత్త కీని ఎంచుకోండి:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ఫిజికల్ కీబోర్డ్ యాక్సెసిబిలిటీ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"స్టిక్కీ కీలు, బౌన్స్ కీలు, మౌస్ కీలు"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"కీలను రిపీట్ చేయండి"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"రిపీట్ చేయడానికి ముందు జరిగిన ఆలస్యం"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"రిపీట్ రేటు"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"కీని వదిలేంత వరకు దాని క్యారెక్టర్‌ను రిపీట్ చేయడానికి ఆ కీని నొక్కి పట్టుకోండి"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> లేఅవుట్"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ఆటోమేటిక్"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"ఆటోమేటిక్: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ప్రివ్యూ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"స్టాండర్డ్ ఆప్షన్‌లు"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"భాష"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"టెక్స్ట్ సైజ్"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"క్యాప్షన్ సైజ్"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"క్యాప్షన్ స్టయిల్"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"అనుకూల ఎంపికలు"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"నేపథ్య రంగు"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"శక్తి వినియోగాన్ని సర్దుబాటు చేయండి"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"చేర్చబడిన ప్యాకేజీలు"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"యాప్‌లు సాధారణంగా అమలు అవుతున్నాయి"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"బ్యాటరీని రీప్లేస్ చేయమని సిఫార్సు చేయబడింది"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"బ్యాటరీ సామర్థ్యం, ఛార్జింగ్ పనితీరు తగ్గింది, బ్యాటరీని రీప్లేస్ చేయమని సిఫార్సు చేయబడింది."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"బ్యాటరీ స్థాయి తక్కువగా ఉంది"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"బ్యాటరీ జీవితకాలాన్ని పెంచడానికి బ్యాటరీ సేవర్‌ను ఆన్ చేయండి"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"బ్యాటరీ జీవితకాలాన్ని మెరుగుపరుచుకోండి"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"డిస్‌కనెక్ట్ చేయండి"</string>
     <string name="vpn_version" msgid="6344167191984400976">"వెర్షన్"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNని విస్మరించు"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 AM - 5 PM వారపు రోజులు\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"క్యాలెండర్ ఈవెంట్‌లు"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} యాక్టివ్‌గా ఉంది}=2{{mode_1}, {mode_2} యాక్టివ్‌గా ఉన్నాయి}=3{{mode_1}, {mode_2}, {mode_3} యాక్టివ్‌గా ఉన్నాయి}other{{mode_1}, {mode_2}, మరో # యాక్టివ్‌గా ఉన్నాయి}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 మోడ్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది}other{# మోడ్‌లు ఆటోమేటిక్‌గా ఆన్ అవుతాయి}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{అంతరాయం కలిగించవద్దు}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ఆన్ అయింది"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"సెట్ చేసి లేదు"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"డిజేబుల్ చేయబడింది"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"అర్థమైంది"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"నోటిఫికేషన్‌లు"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"వ్యవధి"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"మెసేజ్‌లు, ఈవెంట్‌లు &amp; రిమైండర్‌లు"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"అంతరాయం కలిగించవద్దు మోడ్ ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించిన ఐటమ్‌లు మినహా, మెసేజ్‌లు, రిమైండర్లు, ఈవెంట్లు మ్యూట్ చేయబడతాయి. మీ ఫ్రెండ్స్, ఫ్యామిలీ మెంబర్లు లేదా ఇతర పరిచయస్తులు మిమ్మల్ని కాంటాక్ట్ చేయడానికి అనుమతించేలా మెసేజ్‌ల సెట్టింగ్‌లను మీరు అడ్జస్ట్ చేయవచ్చు."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"పూర్తయింది"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"సెట్టింగ్‌లు"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"నోటిఫికేషన్‌లు కనిపించవు, వినిపించవు"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"నోటిఫికేషన్‌ల సౌండ్ రాదు"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు. స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌ల మరియు రిపీట్ కాలర్‌‌ల నుండి కాల్స్‌ అనుమతించబడతాయి."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ప్రస్తుత సెట్టింగ్)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"అంతరాయం కలిగించవద్దు నోటిఫికేషన్‌ సెట్టింగ్‌లను మార్చాలా?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"వర్క్ ప్రొఫైల్ సౌండ్స్"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"వ్యక్తిగత ప్రొఫైల్ సౌండ్స్ ఉంచు"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"మీ వ్యక్తిగత ప్రొఫైల్‌లో ఉన్న సౌండ్స్‌నే ఉపయోగించండి"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"అన్‌లాక్ చేశాక, చివరిగా ఉపయోగించిన స్క్రీన్‌కు వెళ్లండి. లాక్ స్క్రీన్‌లో నోటిఫికేషన్‌లు కనిపించవు. వాటిని చూడటానికి పై నుండి కిందికి స్వైప్ చేయండి."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"లాక్ స్క్రీన్, లాక్ స్క్రీన్, దాటవేయి, బైపాస్"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"వర్క్ ప్రొఫైల్ లాక్ అయినప్పుడు"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"లాక్ స్క్రీన్ నోటిఫికేషన్ మినిమలిజం"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"లాక్ స్క్రీన్‌పై కొన్ని నోటిఫికేషన్‌లను చూపండి"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"లాక్ స్క్రీన్‌లో కొత్త నోటిఫికేషన్‌లను మాత్రమే చూడండి"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"లాక్ స్క్రీన్ నుండి మునుపు చూసిన నోటిఫికేషన్‌లను ఆటోమేటిక్‌గా తీసివేయండి"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"లాక్‌స్క్రీన్‌లో నోటిఫికేషన్‌లు"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"సంభాషణలు, ఆటోమేటిక్, నిశ్శబ్దం - ఈ నోటిఫికేషన్‌లను చూపండి"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"సంభాషణలు, ఆటోమేటిక్, నిశ్శబ్దం - ఈ నోటిఫికేషన్లను చూపాలి"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"మొత్తం వర్క్ నోటిఫికేషన్ కంటెంట్‌ను చూపు"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"గోప్యమైన వర్క్ ప్లేస్ కంటెంట్‌ను దాచండి"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"మీరు మీ పరికరాన్ని లాక్ చేసినప్పుడు, ప్రొఫైల్ నోటిఫికేషన్‌లు ఎలా కనిపించాలనుకుంటున్నారు?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"తక్కువ వ్యవధిలో మీరు పలు నోటిఫికేషన్‌లను పొందినప్పుడు, 2 నిమిషాలకు మీ పరికర వాల్యూమ్‌ను తగ్గించి, అలర్ట్‌లను కుదిస్తుంది. కాల్స్, అలారాలు, ప్రాధాన్య సంభాషణలు ప్రభావితం కావు. \n\nకూల్‌డౌన్ సమయంలో అందుకున్న నోటిఫికేషన్‌లను, స్క్రీన్‌ను పై నుండి కిందికి లాగడం ద్వారా కనుగొనవచ్చు."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"వర్క్ ప్రొఫైల్‌లకు వర్తింపజేయండి"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"వర్క్ ప్రొఫైల్ యాప్‌లకు వర్తింపజేయండి"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"బండిల్ చేసిన నోటిఫికేషన్‌లు"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"ఆన్‌లో ఉంది"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ఆఫ్‌లో ఉంది"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"నోటిఫికేషన్‌లను బండిల్ చేయడాన్ని ఉపయోగించండి"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ఒకేరకమైన థీమ్‌లతో కూడిన నోటిఫికేషన్‌లు మ్యూట్ చేయబడతాయి, ఇంకా నిశ్శబ్ద ఎక్స్‌పీరియన్స్ కోసం గ్రూప్ చేయబడతాయి. బండిల్ చేయడం అనేది యాప్‌నకు సంబంధించిన నోటిఫికేషన్ సెట్టింగ్‌లను ఓవర్‌రైడ్ చేస్తుంది."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR సహాయక సర్వీసులు"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ వాటిని VR సహాయక సర్వీసులుగా రన్ చేయాల్సిందిగా రిక్వెస్ట్ చేయలేదు."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం VR సేవ యాక్సెస్‌ను అనుమతించాలా?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ప్రాధాన్య సంభాషణలు"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ఏదీ లేదు"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ఏవీ లేవు}=1{1 సంభాషణ}other{# సంభాషణలు}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"సంభాషణల సెట్టింగ్‌లు"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ఎవరు అంతరాయం కలిగించగలరు"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"మెసేజింగ్ లేదా కాలింగ్ యాప్‌లు మీకు నోటిఫై చేయకపోయినా, మీరు ఇక్కడ ఎంపిక చేసిన వ్యక్తులు ఇప్పటికీ ఆ యాప్‌ల ద్వారా మిమ్మల్ని చేరుకోగలరు"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"కాల్స్‌"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ఎవరైనా"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"కాంటాక్ట్‌ల సెట్టింగ్‌లు"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"స్టార్ ఉన్న కాంటాక్ట్‌ల సెట్టింగ్‌లు"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ఏవీ లేవు"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ఏవీ లేవు"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"అలారాలు"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ఆఫీస్)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"లెక్కిస్తోంది…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"యాప్‌ల సెట్టింగ్‌లు"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"భర్తీ చేయడానికి యాప్‌లను అనుమతించండి"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"అంతరాయం కలిగించగల యాప్‌లు"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"మోడ్ క్రియేట్ చేయండి"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"అనుకూల మోడ్"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"మోడ్ పేరు"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"మోడ్ పేరు ఖాళీగా ఉండకూడదు"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"చిహ్నాన్ని ఎంచుకోండి"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"క్యాలెండర్ ఈవెంట్‌లు"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"నిద్రించే సమయ రొటీన్"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"డ్రైవింగ్‌లో ఉన్నప్పుడు"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"ఫుల్ స్క్రీన్ నోటిఫికేషన్‌లు"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"ఈ యాప్ నుండి ఫుల్ స్క్రీన్ నోటిఫికేషన్‌లను అనుమతించండి"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"పరికరం లాక్‌లో ఉన్నప్పుడు నోటిఫికేషన్లను చూపడానికి ఈ యాప్‌ను అనుమతించండి. ఈ నోటిఫికేషన్లు ఫుల్ స్క్రీన్‌లో కనిపిస్తాయి. అలారాలు, ఇన్‌కమింగ్ కాల్స్ లేదా ఇతర అత్యవసర నోటిఫికేషన్‌లను హైలైట్ చేయడానికి యాప్‌లు వీటిని ఉపయోగించవచ్చు."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"సిస్టమ్ ప్రాధాన్యతలను రాయండి"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"మీ తరపున సిస్టమ్ ప్రాధాన్యతలను ఎడిట్ చేయడానికి ఈ యాప్‌ను అనుమతించండి"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"ఈ అనుమతి కోర్ సిస్టమ్ ప్రాధాన్యతలను ఎడిట్ చేయడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"మీడియా మేనేజ్‌మెంట్ యాప్‌లు"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"మీడియాను మేనేజ్ చేయడానికి యాప్‌ను అనుమతించండి"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"అనుమతిస్తే, ఈ యాప్ మిమ్మల్ని అడగకుండానే, ఇతర యాప్‌లను ఉపయోగించి క్రియేట్ చేసిన మీడియా ఫైళ్లను ఎడిట్ చేస్తుంది లేదా తొలగిస్తుంది. ఫైళ్లను, మీడియాను యాక్సెస్ చేయడానికి యాప్‌నకు అనుమతి ఉండాలి."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"సంజ్ఞలు"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"కెమెరాను త్వరగా తెరవండి"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"కెమెరాను త్వరగా తెరవడానికి, పవర్ బటన్‌ను రెండుసార్లు నొక్కండి. ఏ స్క్రీన్‌ నుండైనా పని చేస్తుంది."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"సెల్ఫీ కోసం కెమెరాను తిప్పండి"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"నావిగేషన్ మోడ్"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"శాటిలైట్ మెసేజింగ్"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"శాటిలైట్ ద్వారా టెక్స్ట్ మెసేజ్‌లను పంపండి, స్వీకరించండి. మీ ఖాతాతో చేర్చబడింది."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"శాటిలైట్ ద్వారా టెక్స్ట్ మెసేజ్‌లను పంపండి, పొందండి. మీ ఖాతాతో చేర్చలేదు."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"శాటిలైట్ మెసేజింగ్"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"శాటిలైట్ మెసేజింగ్ గురించిన సమాచారం"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"శాటిలైట్ మెసేజింగ్, శాటిలైట్ కనెక్టివిటీ"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> గురించి"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"మీరు అర్హత కలిగిన <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ఖాతాలో భాగంగా శాటిలైట్ ద్వారా టెక్స్ట్ మెసేజ్‌లను పంపవచ్చు, స్వీకరించవచ్చు"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"మీ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ప్లాన్"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"మీ ఖాతాతో శాటిలైట్ మెసేజింగ్ చేర్చబడింది"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"మీ ఖాతాతో మెసేజింగ్ చేర్చబడింది"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"మీ ఖాతాతో శాటిలైట్ మెసేజింగ్ చేర్చబడలేదు"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"మరింత తెలుసుకోండి"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"ఇది ఎలా పని చేస్తుంది"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"మీ ఫోన్ శాటిలైట్‌కు ఆటోమేటిక్‌గా కనెక్ట్ అవుతుంది. ఉత్తమ కనెక్షన్ కోసం, దయచేసి ఆకాశం స్పష్టంగా కనిపించే ప్రాంతంలో ఉంచండి."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"మీ ఫోన్ శాటిలైట్‌కు కనెక్ట్ అయిన తర్వాత"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"మీరు ఎమర్జెన్సీ సర్వీసులతో సహా ఎవరికైనా టెక్స్ట్ మెసేజ్ పంపవచ్చు. అందుబాటులో ఉన్నప్పుడు మీ ఫోన్ మొబైల్ నెట్‌వర్క్‌కు మళ్లీ కనెక్ట్ అవుతుంది."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"శాటిలైట్ మెసేజింగ్ కోసం ఎక్కువ సమయం పట్టవచ్చు, ఇది కొన్ని ప్రాంతాలలో మాత్రమే అందుబాటులో ఉంటుంది. వాతావరణం, నిర్దిష్ట నిర్మాణాలు మీ శాటిలైట్ కనెక్షన్‌ను ప్రభావితం చేయవచ్చు. శాటిలైట్ ద్వారా కాల్ చేయడం అందుబాటులో లేదు. ఎమర్జెన్సీ కాల్‌లు ఇప్పటికీ కనెక్ట్ చేయబడవచ్చు.\n\nఖాతా మార్పులు సెట్టింగ్‌లలో కనిపించడానికి కొంత సమయం పట్టవచ్చు. వివరాల కోసం మీ క్యారియర్‌ను సంప్రదించండి."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"శాటిలైట్ మెసేజింగ్ గురించి మరింత సమాచారం"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> కోసం ఎక్కువ సమయం పట్టవచ్చు, ఇది కొన్ని ప్రాంతాలలో మాత్రమే అందుబాటులో ఉంటుంది. వాతావరణం, నిర్దిష్ట నిర్మాణాలు మీ శాటిలైట్ కనెక్షన్‌ను ప్రభావితం చేయవచ్చు. శాటిలైట్ ద్వారా కాల్ చేయడం అందుబాటులో లేదు. శాటిలైట్ ద్వారా కాల్ చేయడం అందుబాటులో లేదు.\n\nఖాతా మార్పులు సెట్టింగ్‌లలో కనిపించడానికి కొంత సమయం పట్టవచ్చు. వివరాల కోసం <xliff:g id="CARRIER_NAME">%1$s</xliff:g>‌ను సంప్రదించండి."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> గురించి మరింత సమాచారం"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g>‌ను ఆన్ చేయడం సాధ్యపడలేదు"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g>‌ను ఆన్ చేయడానికి, ముందుగా శాటిలైట్ కనెక్షన్‌ను డిస్‌కనెక్ట్ చేయండి"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"శాటిలైట్ కనెక్టివిటీ"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"శాటిలైట్ కనెక్టివిటీ"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"శాటిలైట్ కనెక్టివిటీ"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"శాటిలైట్ మెసేజింగ్"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"మీ ఖాతాతో డేటా వినియోగం చేర్చబడింది"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"ఎమర్జెన్సీ శాటిలైట్ సహాయం"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"మీరు మొబైల్ లేదా Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ కాలేనప్పుడు, ఎమర్జెన్సీ సర్వీసులకు మెసేజ్ పంపండి"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"ఎమర్జెన్సీ శాటిలైట్ సహాయం, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"ఎమర్జెన్సీ శాటిలైట్ సహాయాన్ని గురించి"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"మొబైల్/Wi-Fi నెట్‌వర్క్ లేనప్పుడు ఎమర్జెన్సీ సర్వీసులకు మెసేజ్ పంపవచ్చు, మీ లొకేషన్‌ను షేర్ చేయవచ్చు. ఈ సర్వీసు అన్ని వేళలా అన్ని లొకేషన్‌లలో/పరిస్థితులలో అందుబాటులో ఉండకపోవచ్చు."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ఎమర్జెన్సీ సర్వీసులకు కాల్ చేయండి లేదా టెక్స్ట్ మెసేజ్ పంపండి"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ఎమర్జెన్సీ గురించిన ప్రశ్నలకు సమాధానం ఇవ్వండి"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"శాటిలైట్‌కు కనెక్ట్ చేయడానికి దశలను ఫాలో అవ్వండి"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"మీకు మొబైల్ నెట్‌వర్క్ లేకుంటే, ఎమర్జెన్సీ శాటిలైట్ సహాయాన్ని ఉపయోగించే ఆప్షన్ కనిపిస్తుంది"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"మీకు సరిగ్గా అవసరమైన సహాయాన్ని అందించేలా చేయడానికి ఎమర్జెన్సీ సర్వీసులకు సమాధానాలను పంపండి"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"మీరు కనెక్ట్ అయిన తర్వాత, మీరు ఎమర్జెన్సీ సర్వీసులకు మెసేజ్‌ను పంపవచ్చు"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"డెమోను ట్రై చేయండి"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"మీరు శాటిలైట్ ద్వారా ఎమర్జెన్సీ సర్వీసులకు కనెక్ట్ చేసినప్పుడు, మీ పేరు, ఈమెయిల్, ఫోన్ నంబర్, లొకేషన్, పరికర సమాచారం (IMEI, భాష, మోడల్, బ్యాటరీ స్థాయి), ఎమర్జెన్సీ కాంటాక్ట్ సమాచారాలను, ఎమర్జెన్సీ సర్వీసులతోను, శాటిలైట్ సర్వీస్ ప్రొవైడర్‌లతోను షేర్ చేయడం జరుగుతుంది. \n\nఎమర్జెన్సీ శాటిలైట్ సహాయాన్ని ఉపయోగించడానికి, Google Messages తప్పనిసరిగా మీ ఆటోమేటిక్ SMS యాప్‌గా సెట్ చేసి ఉండాలి. \n\nఆటోమేటిక్ నెట్‌వర్క్ ఎంపిక ఆఫ్‌లో ఉంటే, అది ఆన్ అవుతుంది, ఇంకా మీ పరికరం ఆటోమేటిక్‌గా ఏదైనా నెట్‌వర్క్‌కు కనెక్ట్ అవుతుంది."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"ప్రాధాన్యతలను షేర్ చేయడం"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ఎమర్జెన్సీ కాంటాక్ట్‌లు"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"మీ Google ఖాతా"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ఎమర్జెన్సీ సర్వీసులతో షేర్ చేసే సమాచారాన్ని రివ్యూ చేయండి లేదా అప్‌డేట్ చేయండి"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"యాక్సెస్ పాయింట్ పేర్లు"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"మీరు పేజీ సైజ్ ప్రభావం చూపని మోడ్‌కు సంబంధించిన 16KB మోడ్‌లో ఉన్నారు. ఈ మోడ్‌లో సాఫ్ట్‌వేర్ ఇంటిగ్రిటీకి (ఖచ్చితత్వానికి) హామీ ఉండదు, బూట్‌లోడర్ అన్‌లాక్ చేయబడినప్పుడు ఫోన్‌లో స్టోర్ అయిన ఏదైనా డేటా రిస్క్‌లో పడే అవకాశం ఉంది. ఈ మోడ్‌లలో కొన్ని ఫీచర్‌లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్‌లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్‌లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా 4KB మోడ్‌కు స్విచ్ అవ్వాలి, ఆపై పరికరం తాలూకు బూట్‌లోడర్‌ను లాక్ చేయాలి. ఇది పరికరాన్ని మళ్లీ ఫ్యాక్టరీ రీసెట్ చేసి, ప్రొడక్షన్ సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది. పరికరం విజయవంతంగా Androidలోకి బూట్ అయిన తర్వాత, డెవలపర్ ఆప్షన్‌లలో OEM అన్‌లాకింగ్‌ను డిజేబుల్ చేయండి. పరికరం Androidలో బూట్ చేయడంలో విఫలమైతే లేదా స్థిరంగా లేకపోతే &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; వెబ్‌సైట్ నుండి తాజా ఫ్యాక్టరీ ఫర్మ్‌వేర్ ఇమేజ్‌లతో పరికరాన్ని మళ్లీ ఫ్లాష్ చేయండి లేదా &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; వెబ్‌సైట్‌ను ఉపయోగించండి, అలాగే \'పరికరాన్ని పూర్తిగా తొలగించండి\', \'బూట్‌లోడర్‌ను లాక్ చేయండి\', \'అన్ని పార్టిషన్‌లను బలవంతంగా ఫ్లాష్ చేయండి\' వంటి ఆప్షన్‌లను ఎంచుకోండి."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB పేజీ అగ్నోస్టిక్ మోడ్"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"మరింత చదవండి"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"పేజీ సైజ్ కాంపాక్ట్ మోడ్‌తో యాప్‌ను రన్ చేయండి"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"బగ్ రిపోర్ట్‌ హ్యాండ్లర్"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"మీ డివైజ్‌లో బగ్ రిపోర్ట్ షార్ట్‌కట్‌ను ఏ యాప్ నిర్వహించాలో నిర్ణయిస్తుంది."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"వ్యక్తిగతం"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"స్ట్రీమ్ వినండి"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‌తో వినడానికి ఆడియో స్ట్రీమ్ QR కోడ్‌ను స్కాన్ చేయండి"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"షేర్ చేస్తున్నప్పుడు పాస్‌వర్డ్‌ను ఎడిట్ చేయడం సాధ్యం కాదు. పాస్‌వర్డ్ మార్చడానికి, ముందుగా ఆడియో షేరింగ్‌ను ఆఫ్ చేయండి."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"మీ పాస్‌వర్డ్ తప్పనిసరిగా 4-16 క్యారెక్టర్‌లను కలిగి ఉండాలి, ఇంకా అక్షరాలు, నంబర్‌లు, లేదా చిహ్నాలను మాత్రమే ఉపయోగించాలి"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR కోడ్ స్కానర్"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"సహాయం కావాలా?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"సెట్టింగ్‌లలో సెర్చ్ చేయండి"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"కాంటాక్ట్‌లు, స్టోరేజ్, ఖాతా"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"కాంటాక్ట్‌ల స్టోరేజ్"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"పరికరం మాత్రమే"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"కొత్త కాంటాక్ట్‌లు ఖాతాతో సింక్ అవ్వవు"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"కాంటాక్ట్‌లు మీ పరికరంలో సేవ్ అయ్యి, ఆటోమేటిక్‌గా మీ ఖాతాకు సింక్ అవుతాయి"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ఆటోమేటిక్ ఖాతాను సెట్ చేయడంలో ఎర్రర్ ఏర్పడింది"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ఆటోమేటిక్ సెట్టింగ్ సెట్ చేయబడలేదు"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"పరికరం మాత్రమే"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"పరికరం, %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ప్రారంభించడానికి ఒక ఖాతాను జోడించండి"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"కాంటాక్ట్‌లను ఎక్కడ సేవ్ చేయాలి"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"సెర్చ్ చేయడానికి సర్కిల్ గీయండి"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"మీ స్క్రీన్‌పై ఉన్న కంటెంట్‌ను ఉపయోగించి సెర్చ్ చేయడానికి హోమ్ బటన్ లేదా నావిగేషన్ హ్యాండిల్‌ను నొక్కి, పట్టుకోండి."</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 3d5a22f90fd..665a87a72fd 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"เกล็ดหิมะ"</item>
     <item msgid="7952183800501346803">"ร่มชายหาด"</item>
     <item msgid="799139025758265891">"เครื่องมือเวิร์กช็อป"</item>
-    <item msgid="1330084588359129896">"เต็นท์"</item>
+    <item msgid="8112685757657659269">"เปียโน"</item>
     <item msgid="3861584909935022342">"ม้วนฟิล์ม"</item>
     <item msgid="5827426100157335512">"หนังสือ"</item>
     <item msgid="8585828346253128384">"ดอกบัว"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6fbfacb875a..ca1b2a3919b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"บลูทูธ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"เปิดอัตโนมัติในวันพรุ่งนี้"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"หากปิดบลูทูธ อุปกรณ์จะเปิดบลูทูธอีกครั้งในวันถัดไป"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"จับคู่หูฟังข้างขวา"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"จับคู่หูฟังข้างซ้าย"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"จับคู่หูฟังอีกข้าง"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"ปิดใช้ Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"ปิดใช้ฟีเจอร์ Bluetooth LE Audio หากอุปกรณ์รองรับความสามารถของฮาร์ดแวร์ LE Audio"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"โหมด Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"เปิดใช้ตัวอย่าง UI ที่เกี่ยวข้องกับการออกอากาศผ่าน Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"เปิดใช้ตัวอย่าง UI ที่เกี่ยวข้องกับการแชร์ LE Audio ซึ่งรวมถึงการแชร์เสียงส่วนตัวและการออกอากาศส่วนตัว"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"แสดงปุ่มสลับ LE Audio ในรายละเอียดอุปกรณ์"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"ข้ามรายการที่อนุญาต Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"ใช้ LE Audio โดยค่าเริ่มต้นแม้ว่าอุปกรณ์ต่อพ่วง LE Audio จะไม่ได้รับการยืนยันว่าเป็นไปตามเกณฑ์รายการที่อนุญาตก็ตาม"</string>
@@ -136,7 +139,7 @@
     <string name="previous_connected_see_all" msgid="7759413145713251328">"ดูทั้งหมด"</string>
     <string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"ดูทั้งหมด"</string>
     <string name="stylus_device_details_title" msgid="7618295136015480864">"สไตลัส"</string>
-    <string name="stylus_default_notes_app" msgid="4165657465911764628">"กดปุ่มตรงปลาย"</string>
+    <string name="stylus_default_notes_app" msgid="4165657465911764628">"การกดปุ่มตรงปลาย"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (โปรไฟล์งาน)"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"เขียนในช่องข้อความ"</string>
     <string name="stylus_ignore_button" msgid="7734540973145241391">"ไม่ต้องสนใจการกดปุ่มสไตลัสทั้งหมด"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ภาษาของแอป"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"ภาษาที่แนะนำ"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"ทุกภาษา"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"แนะนำ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"ทุกภาษา"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"ภูมิภาคทั้งหมด"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"ระบบลำดับตัวเลขทั้งหมด"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"ภาษาของระบบ"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"ค่าเริ่มต้นของระบบ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"การเลือกภาษาสำหรับแอปนี้ไม่พร้อมให้ใช้งานจากการตั้งค่า"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"เปลี่ยน"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"ภาษา%sไม่พร้อมใช้งาน"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"ภาษานี้ใช้เป็นภาษาของระบบไม่ได้ แต่คุณได้แจ้งให้แอปและเว็บไซต์ต่างๆ ทราบว่าคุณต้องการใช้ภาษานี้"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"ค้นหา"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"เพิ่มภาษา"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"ค่ากำหนดตามพื้นที่"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"พิมพ์ชื่อภาษา"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"การตั้งค่าภาษาเพิ่มเติม"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"ค่ากำหนดตามพื้นที่"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"ตั้งค่ากำหนดหน่วยและตัวเลข"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"บอกให้แอปทราบค่ากำหนดตามพื้นที่เพื่อให้แอปปรับเปลี่ยนประสบการณ์การใช้งานให้เหมาะกับคุณ"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"แอปจะใช้ค่ากำหนดตามพื้นที่หากเป็นไปได้"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"ค่ากำหนดตามพื้นที่"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"อุณหภูมิ"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"วันแรกของสัปดาห์"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"ค่ากำหนดตัวเลข"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"เชื่อมต่ออินเทอร์เน็ตขณะโรมมิ่ง"</string>
     <string name="roaming_disable" msgid="729512894708689604">"เชื่อมต่ออินเทอร์เน็ตขณะโรมมิ่ง"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"อาจมีค่าบริการโรมมิ่ง"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"ตั้งเวลาอัตโนมัติ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"ตั้งค่าอัตโนมัติ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"ระบบจะใช้ตำแหน่งเพื่อตั้งค่าเขตเวลาเมื่อเปิดการตั้งค่านี้"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"วันที่และเวลาอัตโนมัติ"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"ตั้งค่าอัตโนมัติโดยใช้เครือข่ายและสัญญาณไร้สาย"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"เขตเวลาอัตโนมัติ"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"ตั้งค่าโดยอัตโนมัติตามเครือข่ายมือถือที่อยู่ใกล้คุณ"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"ตั้งค่าโดยอัตโนมัติโดยใช้ตำแหน่งของอุปกรณ์ หากมี"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ใช้รูปแบบเริ่มต้นในท้องถิ่น"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ใช้รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"เวลา"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ยกนิ้วขึ้น แล้วแตะเซ็นเซอร์อีกครั้ง"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"ใช้เซ็นเซอร์ลายนิ้วมือไม่ได้"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"โปรดติดต่อผู้ให้บริการซ่อม"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"การปลดล็อกด้วยลายนิ้วมือเมื่อหน้าจอปิด"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"ใช้การปลดล็อกด้วยลายนิ้วมือแม้หน้าจอจะปิดอยู่"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"ปิดหน้าจอ ปลดล็อก"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"การตั้งค่าการรักษาความปลอดภัยเพิ่มเติม"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"ล็อกโปรไฟล์งาน การเข้ารหัส และอื่นๆ"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"การเข้ารหัส ข้อมูลเข้าสู่ระบบ และอื่นๆ"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"ตั้งรูปแบบสำหรับพื้นที่ส่วนตัว"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"ล็อก"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"ซ่อน"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"ยืนยันรูปแบบสำหรับพื้นที่ส่วนตัว"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"ป้อน PIN สำหรับพื้นที่ส่วนตัวอีกครั้ง"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"ป้อนรหัสผ่านสำหรับพื้นที่ส่วนตัวอีกครั้ง"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"คุณสามารถเพิ่มได้ถึง <xliff:g id="COUNT">%d</xliff:g> ลายนิ้วมือ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"คุณได้เพิ่มลายนิ้วมือถึงขีดจำกัดสูงสุดแล้ว"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"เพิ่มลายนิ้วมืออีกไม่ได้แล้ว"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"เปิด"</string>
     <string name="external_display_off" msgid="5634413756025351374">"ปิด"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"จอแสดงผลภายนอก"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"จอแสดงผลในตัว"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"ใช้จอแสดงผลภายนอก"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ความละเอียดของจอแสดงผล"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"ยกเลิกการเชื่อมต่อกับจอแสดงผลภายนอกแล้ว"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"การเปลี่ยนการหมุนหรือความละเอียดอาจหยุดแอปที่กำลังทำงานอยู่"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"อุปกรณ์ของคุณต้องเชื่อมต่อกับจอแสดงผลภายนอกเพื่อมิเรอร์หน้าจอ"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"ตัวเลือกเพิ่มเติม"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"กดค้างแล้วลากเพื่อจัดเรียงจอแสดงผลใหม่"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"แคสต์"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"มิเรอร์"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"ตรวจสอบรหัสผ่านและลองอีกครั้ง"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"ติดต่อผู้ผลิตอุปกรณ์"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"เครือข่าย Wi-Fi นี้ไม่พร้อมใช้งานในขณะนี้"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"คิวอาร์โค้ดนี้มีปัญหา โปรดลองเชื่อมต่อด้วยวิธีอื่น"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"เลือกเครือข่าย"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"หากต้องการเชื่อมต่ออุปกรณ์ ให้เลือกเครือข่าย"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"เพิ่มอุปกรณ์นี้ไปยัง “<xliff:g id="SSID">%1$s</xliff:g>” ไหม"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"ดูข้อมูลเพิ่มเติมเกี่ยวกับการหมุนอัตโนมัติ"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"ความละเอียดของหน้าจอ"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"ความละเอียดสูง"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"ความละเอียดเต็ม"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"ความละเอียดแบบเต็มจะใช้แบตเตอรี่มากขึ้น การเปลี่ยนความละเอียดอาจทำให้บางแอปรีสตาร์ท"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"ความละเอียดสูงสุด"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"ความละเอียดสูงสุดจะใช้แบตเตอรี่มากขึ้น การเปลี่ยนความละเอียดอาจทำให้บางแอปรีสตาร์ท"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"เลือกแล้ว"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"สี"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ธรรมชาติ"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"ปรับอัตโนมัติ"</string>
     <string name="brightness" msgid="6216871641021779698">"ระดับความสว่าง"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"ปรับความสว่างอัตโนมัติ"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"เกี่ยวกับฟีเจอร์ปรับความสว่างอัตโนมัติ"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"ความสว่างของหน้าจอจะปรับให้เหมาะสมกับสภาพแวดล้อมและกิจกรรมที่คุณทำโดยอัตโนมัติ คุณเลื่อนแถบเลื่อนด้วยตนเองได้เพื่อช่วยให้การปรับความสว่างอัตโนมัติทราบความสว่างที่คุณต้องการ"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"เปิด"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"ปิด"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"การตั้งค่าโหมดเวลาเข้านอน"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{โหมดยังเปิดใช้งานธีมมืดได้ด้วย}=1{{mode_1}ยังเปิดใช้งานธีมมืดด้วย}=2{{mode_1}และ{mode_2}ยังเปิดใช้งานธีมมืดด้วย}=3{{mode_1}, {mode_2} และ{mode_3}ยังเปิดใช้งานธีมมืดด้วย}other{{mode_1}, {mode_2} และอีก # โหมดยังเปิดใช้งานธีมมืดด้วย}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"การตั้งค่าโหมด"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"หรี่แสงมากยิ่งขึ้น"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"หรี่แสงเพิ่มเติม"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"อนุญาตให้อุปกรณ์หรี่แสงมากกว่าปกติ"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ระยะหมดเวลาหน้าจอ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อทำสิ่งต่างๆ เช่น ปรับปรุงฟีเจอร์และบริการตามสถานที่"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"บริการตำแหน่ง"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"บริการตำแหน่ง"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"ใช้ตำแหน่ง"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ใช้ตำแหน่งสำหรับเขตเวลา"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"ตั้งค่าเขตเวลาโดยอัตโนมัติไม่ได้"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"ตำแหน่งหรือบริการตำแหน่งปิดอยู่"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"การตั้งค่าตำแหน่ง"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"แก้ไขปัญหานี้"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ยกเลิก"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"เขตเวลาอัตโนมัติปิดอยู่"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"ไม่พร้อมใช้งานเมื่อเขตเวลาอัตโนมัติปิดอยู่"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"ระบบอาจใช้ตำแหน่งเพื่อตั้งค่าเขตเวลา"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"หากตำแหน่งของอุปกรณ์พร้อมใช้งาน ระบบอาจใช้ตำแหน่งดังกล่าวเพื่อตั้งค่าเขตเวลา"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"ดูข้อมูลกฎหมาย สถานะ รุ่นซอฟต์แวร์"</string>
     <string name="legal_information" msgid="7509900979811934843">"ข้อมูลทางกฎหมาย"</string>
     <string name="manual" msgid="3651593989906084868">"คู่มือ"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"ตัวเลือก"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"การช่วยเหลือพิเศษ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"แป้นพิมพ์จริง"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"เครื่องมือเลือกรูปแบบแป้นพิมพ์จริง"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"คีย์ตีกลับ"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"แป้นพิมพ์จะละเว้นการกดปุ่มเดียวกันซ้ำๆ อย่างรวดเร็วภายใน <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> มิลลิวินาที"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"แป้นพิมพ์จะละเว้นการกดปุ่มเดียวกันซ้ำๆ อย่างรวดเร็ว"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"เกณฑ์คีย์ตีกลับ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"เลือกระยะเวลาที่แป้นพิมพ์จะละเว้นการกดปุ่มซ้ำ"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 วินาที"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 วินาที"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 วินาที"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"กำหนดเอง"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"ค่าที่กำหนดเอง"</string>
     <string name="slow_keys" msgid="2891452895499690837">"เพิ่มระยะเวลาในการกดปุ่ม"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"ปรับเวลาที่ใช้ในการกดปุ่มเพื่อเปิดใช้เป็น <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> มิลลิวินาที"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ปรับเวลาที่ใช้ในการกดปุ่มเพื่อเปิดใช้งาน"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"คีย์ติดหนึบ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"กดทีละปุ่มเพื่อใช้แป้นพิมพ์ลัดแทนการกดปุ่มค้างไว้พร้อมกัน"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"แป้นเมาส์"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ใช้แป้นพิมพ์จริงเพื่อควบคุมเมาส์"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ใช้แป้นเมาส์"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ใช้แป้นพิมพ์เพื่อควบคุมตัวชี้"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"การเลื่อนเมาส์แบบกลับด้าน"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"เลื่อนขึ้นเพื่อเลื่อนหน้าลง"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"สลับปุ่มซ้ายและขวา"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ใช้ปุ่มเมาส์ด้านซ้ายเป็นปุ่มขวา"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"แป้นเมาส์สำหรับ <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ใช้แป้น <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> เพื่อเลื่อนเคอร์เซอร์เมาส์"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"ใช้แป้น <xliff:g id="CLICK_LABEL">%s</xliff:g> เพื่อคลิกปุ่มหลักของเมาส์"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"ใช้แป้น <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> เพื่อกดปุ่มหลักของเมาส์ค้างไว้"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"ใช้แป้น <xliff:g id="RELEASE_LABEL">%s</xliff:g> เพื่อปล่อยปุ่มหลักของเมาส์"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"ใช้แป้น <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> เพื่อเปิด/ปิดโหมดเลื่อน ซึ่งจะทำให้แป้น <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> เลื่อนมุมมองขึ้น ลง ไปทางซ้าย หรือขวา"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ใช้แป้น <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> เพื่อคลิกปุ่มรองของเมาส์"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"แป้นพิมพ์ลัด"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"แสดงรายการแป้นพิมพ์ลัด"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"แป้นพิมพ์และเครื่องมือของโปรไฟล์งาน"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ค่าเริ่มต้น"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ทัชแพด"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ทัชแพดและเมาส์"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"เมาส์"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ความเร็วของตัวชี้ ท่าทางสัมผัส"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"แตะเพื่อคลิก"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"การแตะแล้วลาก"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"คลิกด้านขวาล่าง"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"คลิกที่มุมขวาล่างของทัชแพดเพื่อดูตัวเลือกเพิ่มเติม"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"ความเร็วของตัวชี้"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"ใช้ 3 นิ้วแตะ"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"สีของตัวชี้"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"เปลี่ยนรูปแบบการเติมพื้นตัวชี้เป็นสีดำ"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"เปลี่ยนรูปแบบการเติมพื้นตัวชี้เป็นสีเขียว"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"เรียนรู้ท่าทางสัมผัสของทัชแพด"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"แทร็กแพด, แทร็ก แพด, เมาส์, เคอร์เซอร์, เลื่อน, ปัด, คลิกขวา, คลิก, Pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"คลิกขวา แตะ"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"คลิกตรงกลาง"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"เปิดใช้งาน Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ไปที่หน้าแรก"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"ย้อนกลับ"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"ดูแอปล่าสุด"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"ไปที่หน้าจอหลัก"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"ใช้ 3 นิ้วปัดขึ้นจากตำแหน่งใดก็ได้บนทัชแพด"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"ย้อนกลับ"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"เลือกคีย์ใหม่สำหรับ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"การช่วยเหลือพิเศษด้วยแป้นพิมพ์จริง"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"คีย์ติดหนึบ คีย์ตีกลับ แป้นเมาส์"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"แป้นพิมพ์ซ้ำ"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"หน่วงเวลาก่อนพิมพ์ซ้ำ"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"อัตราการพิมพ์ซ้ำ"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"กดแป้นค้างไว้เพื่อพิมพ์อักขระซ้ำจนกว่าจะปล่อยแป้น"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"เลย์เอาต์ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ค่าเริ่มต้น"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"อัตโนมัติ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ดูตัวอย่าง"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ตัวเลือกมาตรฐาน"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ภาษา"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ขนาดข้อความ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"ขนาดคำบรรยายแทนเสียง"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"รูปแบบคำบรรยายแทนเสียง"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ตัวเลือกที่กำหนดเอง"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"สีพื้นหลัง"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"ปรับการใช้พลังงาน"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"แพ็คเก็จที่รวมมาด้วย"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"แอปทำงานตามปกติ"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"แนะนำให้เปลี่ยนแบตเตอรี่"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"ความจุแบตเตอรี่และประสิทธิภาพการชาร์จลดลง และขอแนะนำให้เปลี่ยนแบตเตอรี่"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"ระดับแบตเตอรี่อ่อน"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"เปิดโหมดประหยัดแบตเตอรี่เพื่อยืดอายุการใช้งานแบตเตอรี่"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"เพิ่มอายุการใช้งานแบตเตอรี่"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ยกเลิกการเชื่อมต่อ VPN นี้ไหม"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ยกเลิกการเชื่อมต่อ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"รุ่น"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"เวอร์ชัน <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"ลืม VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"แทนที่ VPN ที่มีอยู่หรือไม่"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09:00-17:00 น. วันธรรมดา\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"กิจกรรมในปฏิทิน"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} ทำงานอยู่}=2{{mode_1} และ {mode_2} ทำงานอยู่}=3{{mode_1}, {mode_2} และ {mode_3} ทำงานอยู่}other{{mode_1}, {mode_2} และอีก # โหมดทำงานอยู่}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 โหมดสามารถเปิดได้โดยอัตโนมัติ}other{# โหมดสามารถเปิดได้โดยอัตโนมัติ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ห้ามรบกวน}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"เปิด"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"ไม่ได้ตั้งค่า"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"ปิดอยู่"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"รับทราบ"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"การแจ้งเตือน"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ระยะเวลา"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ข้อความ เหตุการณ์ และการช่วยเตือน"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"เสร็จ"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"การตั้งค่า"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ไม่แสดงภาพหรือเสียงเวลาแจ้งเตือน"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ไม่มีเสียงเวลาแจ้งเตือน"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"คุณจะไม่เห็นหรือยินเสียงการแจ้งเตือน อนุญาตการโทรจากรายชื่อติดต่อที่ติดดาวและผู้โทรซ้ำ"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(การตั้งค่าปัจจุบัน)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"เปลี่ยนการตั้งค่าการแจ้งเตือนห้ามรบกวนไหม"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"เสียงในโปรไฟล์งาน"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ใช้เสียงในโปรไฟล์ส่วนตัว"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ใช้เสียงเดียวกับโปรไฟล์ส่วนตัว"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"ไปยังหน้าจอที่ใช้ล่าสุดโดยตรงหลังจากปลดล็อกแล้ว การแจ้งเตือนจะไม่แสดงบนหน้าจอล็อก ปัดลงจากด้านบนเพื่อดูการแจ้งเตือนเหล่านี้"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"หน้าจอล็อก, ข้าม, เลี่ยง"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"เมื่อโปรไฟล์งานล็อกอยู่"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"การแจ้งเตือนแบบเรียบง่ายบนหน้าจอล็อก"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"แสดงการแจ้งเตือนน้อยลงในหน้าจอล็อก"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"แสดงเฉพาะการแจ้งเตือนใหม่บนหน้าจอล็อก"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"นำการแจ้งเตือนที่ดูแล้วก่อนหน้านี้ออกจากหน้าจอล็อกโดยอัตโนมัติ"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"การแจ้งเตือนบนหน้าจอล็อก"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"แสดงการสนทนา ค่าเริ่มต้น และการแจ้งเตือนที่ปิดเสียง"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"แสดงการสนทนา ค่าเริ่มต้น และการแจ้งเตือนที่ปิดเสียง"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"แสดงเนื้อหาการแจ้งเตือนงานทั้งหมด"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"ซ่อนเนื้อหางานที่ละเอียดอ่อน"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"เมื่ออุปกรณ์ล็อกอยู่ คุณต้องการให้แสดงการแจ้งเตือนโปรไฟล์อย่างไร"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"เมื่อคุณได้รับการแจ้งเตือนจำนวนมากภายในเวลาสั้นๆ อุปกรณ์จะลดระดับเสียงและจำนวนการแจ้งเตือนสูงสุด 2 นาที โดยที่การโทร การปลุก และการสนทนาสำคัญจะไม่ได้รับผลกระทบ \n\nดูการแจ้งเตือนที่ได้รับระหว่างระยะเวลาพักได้โดยการดึงลงจากด้านบนของหน้าจอ"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"ใช้กับโปรไฟล์งาน"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"ใช้กับแอปในโปรไฟล์งาน"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"การแจ้งเตือนแบบรวมกลุ่ม"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"เปิด"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"ปิด"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"ใช้การรวมกลุ่มการแจ้งเตือน"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"การแจ้งเตือนที่มีธีมคล้ายกันจะถูกปิดเสียงและจัดกลุ่มไว้ด้วยกันเพื่อให้คุณได้รับประสบการณ์การใช้งานที่เงียบกว่า การรวมกลุ่มจะลบล้างการตั้งค่าการแจ้งเตือนของแอปนั้นๆ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"บริการตัวช่วย VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"แอปที่ติดตั้งอยู่ไม่ได้ขอให้เรียกใช้เป็นบริการตัวช่วย VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"อนุญาตให้ <xliff:g id="SERVICE">%1$s</xliff:g> เข้าถึงบริการ VR ไหม"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"การสนทนาสำคัญ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ไม่มี"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ไม่มี}=1{การสนทนา 1 รายการ}other{การสนทนา # รายการ}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"การตั้งค่าการสนทนา"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ผู้ที่รบกวนคุณได้"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"ผู้ที่คุณเลือกในส่วนนี้จะยังคงติดต่อคุณผ่านแอปการรับส่งข้อความหรือการโทรได้ แม้ว่าแอปเหล่านั้นจะแจ้งเตือนไม่ได้ก็ตาม"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"การโทร"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ทุกคน"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"รายชื่อติดต่อ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"รายชื่อติดต่อที่ติดดาว"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"การตั้งค่ารายชื่อติดต่อ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"การตั้งค่ารายชื่อติดต่อที่ติดดาว"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ไม่มี"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"ไม่มี"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"การปลุก"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (งาน)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"กำลังคำนวณ…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"การตั้งค่าแอป"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"อนุญาตให้แอปลบล้าง"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"แอปที่รบกวนคุณได้"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"สร้างโหมด"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"โหมดที่กำหนดเอง"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ชื่อโหมด"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"ต้องระบุชื่อโหมด"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"เลือกไอคอน"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"กิจกรรมในปฏิทิน"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"กิจวัตรเข้านอน"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ขณะขับรถ"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"การแจ้งเตือนแบบเต็มหน้าจอ"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"อนุญาตให้แอปนี้แสดงการแจ้งเตือนแบบเต็มหน้าจอ"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"อนุญาตให้แอปนี้แสดงการแจ้งเตือนได้เต็มหน้าจอเมื่ออุปกรณ์ล็อกอยู่ แอปอาจใช้การแจ้งเตือนเหล่านี้เพื่อให้เห็นการปลุก สายเรียกเข้า หรือการแจ้งเตือนอื่นๆ ที่เร่งด่วนได้อย่างเด่นชัด"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"เขียนค่ากำหนดของระบบ"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"อนุญาตให้แอปนี้แก้ไขค่ากำหนดของระบบในนามของคุณ"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"สิทธิ์นี้อนุญาตให้แอปแก้ไขค่ากำหนดหลักของระบบได้"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"แอปการจัดการสื่อ"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"อนุญาตให้แอปจัดการสื่อ"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"หากอนุญาต แอปนี้จะแก้ไขหรือลบไฟล์สื่อที่สร้างขึ้นด้วย​แอปอื่นๆ ได้โดยไม่ต้องถามคุณ ทั้งนี้แอปต้องมีสิทธิ์เข้าถึงไฟล์และสื่อ"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"ท่าทางสัมผัส"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"เปิดกล้องอย่างรวดเร็ว"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"หากต้องการเปิดกล้องอย่างรวดเร็ว ให้กดปุ่มเปิด/ปิด 2 ครั้งจากหน้าจอใดก็ได้"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"พลิกกล้องเพื่อถ่ายเซลฟี"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"โหมดการไปยังส่วนต่างๆ"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"การรับส่งข้อความผ่านดาวเทียม"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"รับส่งข้อความผ่านดาวเทียม รวมอยู่ในบัญชี"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"รับส่งข้อความผ่านดาวเทียม ไม่รวมอยู่ในบัญชี"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"การรับส่งข้อความผ่านดาวเทียม"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"เกี่ยวกับการรับส่งข้อความผ่านดาวเทียม"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"การรับส่งข้อความผ่านดาวเทียม การเชื่อมต่อผ่านดาวเทียม"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"เกี่ยวกับ <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"คุณรับส่งข้อความผ่านดาวเทียมได้โดยเป็นส่วนหนึ่งของบัญชี <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ที่มีสิทธิ์"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"แพ็กเกจ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ของคุณ"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"การรับส่งข้อความผ่านดาวเทียมรวมอยู่ในบัญชีของคุณ"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"การรับส่งข้อความรวมอยู่ในบัญชีของคุณ"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"การรับส่งข้อความผ่านดาวเทียมไม่รวมอยู่ในบัญชีของคุณ"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"ดูข้อมูลเพิ่มเติม"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"วิธีการทำงาน"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"โทรศัพท์ของคุณจะเชื่อมต่อกับดาวเทียมโดยอัตโนมัติ โปรดอยู่ในพื้นที่ที่มองเห็นท้องฟ้าได้อย่างชัดเจนเพื่อรับการเชื่อมต่อที่ดีที่สุด"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"หลังจากที่โทรศัพท์เชื่อมต่อกับดาวเทียม"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"คุณส่งข้อความถึงใครก็ได้ รวมถึงบริการช่วยเหลือฉุกเฉิน โดยโทรศัพท์จะเชื่อมต่อกับเครือข่ายมือถืออีกครั้งเมื่อมีให้ใช้งาน"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"การรับส่งข้อความผ่านดาวเทียมอาจใช้เวลานานกว่าปกติและพร้อมให้ใช้งานเฉพาะในบางพื้นที่ โปรดทราบว่าสภาพอากาศและโครงสร้างบางอย่างอาจส่งผลต่อการติดต่อผ่านดาวเทียม การโทรผ่านดาวเทียมไม่พร้อมใช้งาน การโทรฉุกเฉินอาจยังเชื่อมต่ออยู่\n\nระบบอาจใช้เวลาสักครู่กว่าที่การเปลี่ยนแปลงในบัญชีจะแสดงในการตั้งค่า โปรดติดต่อสอบถามรายละเอียดจากผู้ให้บริการ"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"ข้อมูลเพิ่มเติมเกี่ยวกับการรับส่งข้อความผ่านดาวเทียม"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> อาจใช้เวลานานกว่าปกติและพร้อมให้ใช้งานเฉพาะในบางพื้นที่ โปรดทราบว่าสภาพอากาศและโครงสร้างบางอย่างอาจส่งผลต่อการติดต่อผ่านดาวเทียม การโทรผ่านดาวเทียมไม่พร้อมใช้งาน การโทรฉุกเฉินอาจยังเชื่อมต่ออยู่\n\nระบบอาจใช้เวลาสักครู่กว่าที่การเปลี่ยนแปลงในบัญชีจะแสดงในการตั้งค่า โปรดติดต่อ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> เพื่อสอบถามรายละเอียด"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"ข้อมูลเพิ่มเติมเกี่ยวกับ <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"เปิด <xliff:g id="FUNCTION">%1$s</xliff:g> ไม่ได้"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"หากต้องการเปิด <xliff:g id="FUNCTION">%1$s</xliff:g> ให้หยุดการเชื่อมต่อดาวเทียมก่อน"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"การเชื่อมต่อผ่านดาวเทียม"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"การเชื่อมต่อผ่านดาวเทียม"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"การเชื่อมต่อผ่านดาวเทียม"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"การรับส่งข้อความผ่านดาวเทียม"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"การใช้ข้อมูลรวมอยู่ในบัญชีของคุณ"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS ดาวเทียม"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"ส่งข้อความหาบริการช่วยเหลือฉุกเฉินเมื่อคุณไม่สามารถเชื่อมต่อเครือข่ายมือถือหรือ Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"SOS ดาวเทียม, SOS"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"เกี่ยวกับ SOS ดาวเทียม"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"คุณจะส่งข้อความหาบริการช่วยเหลือฉุกเฉินและแชร์ตำแหน่งของคุณได้แม้ในเวลาที่ไม่สามารถเชื่อมต่อเครือข่ายมือถือหรือ Wi-Fi บริการนี้อาจใช้งานไม่ได้ในบางครั้ง บางตำแหน่ง หรือบางสถานการณ์"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"โทรหรือส่งข้อความหาบริการช่วยเหลือฉุกเฉิน"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ตอบคำถามเกี่ยวกับเหตุฉุกเฉิน"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"ทำตามขั้นตอนเพื่อเชื่อมต่อกับดาวเทียม"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"หากไม่มีเครือข่ายมือถือ คุณจะเห็นตัวเลือกในการใช้ SOS ดาวเทียม"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ส่งคำตอบไปยังบริการช่วยเหลือฉุกเฉินเพื่อให้ได้รับความช่วยเหลืออย่างเหมาะสม"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"เมื่อเชื่อมต่อแล้ว คุณจะส่งข้อความหาบริการช่วยเหลือฉุกเฉินได้"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ลองใช้เดโม"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"เมื่อคุณเชื่อมต่อกับบริการช่วยเหลือฉุกเฉินผ่านดาวเทียม ระบบจะแชร์ชื่อ อีเมล หมายเลขโทรศัพท์ ตำแหน่ง ข้อมูลอุปกรณ์ (IMEI, ภาษา, รุ่น, ระดับแบตเตอรี่) และข้อมูลผู้ติดต่อกรณีฉุกเฉินของคุณกับบริการช่วยเหลือฉุกเฉินและผู้ให้บริการดาวเทียม \n\nGoogle Messages ต้องเป็นแอป SMS เริ่มต้นจึงจะใช้ SOS ดาวเทียมได้ \n\nระบบจะเปิดการเลือกเครือข่ายอัตโนมัติหากปิดอยู่ก่อนหน้านี้ และอุปกรณ์ของคุณจะเชื่อมต่อกับเครือข่ายโดยอัตโนมัติ"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"ค่ากำหนดการแชร์"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ผู้ติดต่อกรณีฉุกเฉิน"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"บัญชี Google ของคุณ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ตรวจสอบหรืออัปเดตข้อมูลที่จะแชร์กับบริการช่วยเหลือฉุกเฉิน"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"จุดเข้าใช้งาน"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ใช้ไม่ได้เมื่อเชื่อมต่อกับ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"คุณอยู่ในโหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้า ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องเปลี่ยนกลับไปใช้โหมด 4KB แล้วล็อก Bootloader ของอุปกรณ์ การดำเนินการนี้จะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้นอีกครั้งและคืนค่าเป็นโหมดโปรดักชัน หลังจากที่อุปกรณ์เปิดเครื่องเพื่อเข้าสู่ Android ได้สำเร็จ ให้ปิดการปลดล็อก OEM ในตัวเลือกสำหรับนักพัฒนาแอป หากอุปกรณ์ไม่สามารถเปิดเครื่องเพื่อเข้าสู่ Android หรือไม่เสถียร ให้แฟลชอุปกรณ์อีกครั้งโดยใช้ค่าเริ่มต้นล่าสุดจาก &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; หรือใช้ &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; และเลือก \"ล้างข้อมูลอุปกรณ์\" \"ล็อก Bootloader\" และ \"บังคับให้แฟลชทุกพาร์ติชัน\""</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"โหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"อ่านเพิ่มเติม"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"เรียกใช้แอปด้วยโหมดความเข้ากันได้กับหน้าหน่วยความจำ"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"เครื่องจัดการรายงานข้อบกพร่อง"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"เลือกแอปที่จะให้จัดการทางลัดรายงานข้อบกพร่องในอุปกรณ์"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ส่วนตัว"</string>
@@ -5161,7 +5282,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB ไม่พร้อมใช้งานในตำแหน่งปัจจุบัน"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"ใช้ Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread ช่วยเชื่อมต่ออุปกรณ์สมาร์ทโฮมของคุณ โดยเพิ่มประสิทธิภาพการทำงาน\n\nเมื่อเปิดใช้ อุปกรณ์นี้จะมีสิทธิ์เข้าร่วมเครือข่าย Thread ซึ่งช่วยให้สามารถควบคุมอุปกรณ์ที่รองรับ Matter ผ่านโทรศัพท์เครื่องนี้"</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread ช่วยเชื่อมต่อและเพิ่มประสิทธิภาพการทำงานให้อุปกรณ์สมาร์ทโฮมของคุณ\n\nเมื่อเปิดใช้ อุปกรณ์นี้จะมีสิทธิ์เข้าร่วมเครือข่าย Thread ซึ่งช่วยให้สามารถควบคุมอุปกรณ์ที่รองรับ Matter ผ่านโทรศัพท์เครื่องนี้"</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"ดูข้อมูลเพิ่มเติมเกี่ยวกับ Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"สิทธิ์เข้าถึงกล้อง"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"สิทธิ์เข้าถึงไมโครโฟน"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"ฟังสตรีม"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"สแกนคิวอาร์โค้ดของสตรีมเสียงเพื่อฟังกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"แก้ไขรหัสผ่านในระหว่างการแชร์ไม่ได้ หากต้องการเปลี่ยนรหัสผ่าน โปรดปิดการแชร์เสียงก่อน"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"รหัสผ่านต้องมีอักขระ 4-16 ตัว และใช้ได้เฉพาะตัวอักษร ตัวเลข และสัญลักษณ์เท่านั้น"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"ตัวสแกนคิวอาร์โค้ด"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"หากต้องการความช่วยเหลือ"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ค้นหาการตั้งค่า"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"รายชื่อติดต่อ พื้นที่เก็บข้อมูล บัญชี"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"พื้นที่เก็บข้อมูลรายชื่อติดต่อ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"อุปกรณ์เท่านั้น"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"รายชื่อติดต่อใหม่จะไม่ซิงค์กับบัญชี"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ระบบจะบันทึกรายชื่อติดต่อไว้ในอุปกรณ์และซิงค์กับบัญชีของคุณโดยค่าเริ่มต้น"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"เกิดข้อผิดพลาดในการตั้งค่าบัญชีเริ่มต้น"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ไม่ได้ตั้งค่าบัญชีเริ่มต้น"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"อุปกรณ์เท่านั้น"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"อุปกรณ์และ %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"เพิ่มบัญชีเพื่อเริ่มต้นใช้งาน"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ตำแหน่งที่จะบันทึกรายชื่อติดต่อ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"วงเพื่อค้นหา"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"แตะปุ่มหน้าแรกหรือแฮนเดิลนำทางค้างไว้เพื่อค้นหาโดยใช้เนื้อหาบนหน้าจอ"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 2a1366224b0..6d1a8819867 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Mga tool sa workshop"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Libro"</item>
     <item msgid="8585828346253128384">"Bulaklak na lotus"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5a8b0d09ca2..b045a61f2d6 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Magpares ng bagong device"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Awtomatikong i-on bukas"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Kung io-off ang Bluetooth, mag-o-on ito sa susunod na araw"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Ipares ang kanan"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Ipares ang kaliwa"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Ipares ang kabila"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"I-disable ang Bluetooth LE audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Dini-disable ang feature na Bluetooth LE audio kung sinusuportahan ng device ang mga kakayahan ng LE audio hardware."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio mode"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"I-enable ang preview ng UI ng Broadcast ng Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Ine-enable ang preview ng UI ng LE Audio Sharing kasama na ang personal na pagbabahagi ng audio at pribadong broadcast"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Ipakita ang toggle ng LE audio sa Mga Detalye ng Device"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"I-bypass ang Allowlist ng Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Gamitin ang LE Audio bilang default kahit na hindi pa na-verify ang peripheral ng LE Audio para matugunan ang mga pamantayan sa Allowlist."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Wika ng app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Mga iminumungkahing wika"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Lahat ng wika"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Iminumungkahi"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Lahat ng wika"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Lahat ng rehiyon"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Lahat ng system ng numero"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Wika ng system"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Default ng system"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Hindi available sa Mga Setting ang pagpili ng wika para sa app na ito."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Palitan"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Hindi available ang %s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Hindi puwedeng gamitin ang wikang ito bilang wika ng system, pero ipinaalam mo sa mga app at website na gusto mo ang wikang ito."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Maghanap"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Magdagdag ng wika"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Kagustuhan sa rehiyon"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"I-type ang wika"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Higit pang setting ng wika"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Mga panrehiyong preference"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Magtakda ng mga kagustuhan sa mga yunit at numero"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Ipaalam sa mga app kung ano ang mga panrehiyong preference mo para ma-personalize ng mga ito ang iyong experience."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Gagamitin ng mga app ang iyong mga panrehiyong preference kapag posible."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Mga rehiyonal na preference"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatura"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Unang araw ng linggo"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Mga kagustuhan sa mga numero"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Puwedeng magkaroon ng mga singil sa roaming."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Awtomatikong itakda ang oras"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Awtomatikong itakda"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Gagamitin ang lokasyon para sa pagtatakda ng time zone kapag naka-on ang toggle na ito"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Awtomatikong petsa at oras."</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Awtomatikong itakda gamit ang iyong network at mga wireless na signal"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Awtomatikong time zone"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Awtomatikong itakda batay sa mga mobile network na malapit sa iyo"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Awtomatikong itakda gamit ang lokasyon ng iyong device, kung available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gamitin ang lokal na default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gamitin ang format na 24-oras"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Oras"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Iangat ang daliri, pagkatapos ay pindutin ulit ang sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Hindi magamit ang sensor para sa fingerprint"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Bumisita sa provider ng pagkukumpuni."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Pag-unlock Gamit ang Fingerprint nang naka-off ang screen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Gamitin ang Pag-unlock Gamit ang Fingerprint kahit na naka-off ang screen"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Naka-off ang screen, I-unlock"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Higit pang setting ng seguridad"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Lock ng profile sa trabaho, pag-encrypt, at higit pa"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Pag-encrypt, mga kredensyal, at higit pa"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Magtakda ng pattern sa pribadong space"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"I-lock"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"I-hide"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Kumpirmahin ang pattern ng pribadong space mo"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Ilagay ulit ang PIN ng pribadong space mo"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Ilagay ulit ang password ng pribadong space mo"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puwede kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) fingerprint"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Naidagdag mo na ang maximum na bilang ng mga fingerprint"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Hindi na makapagdagdag ng higit pang fingerprint"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Naka-on"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Naka-off"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"External na Display"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Built-in na display"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Gumamit ng external na display"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Resolution ng display"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Nadiskonekta ang external na display"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Posibleng huminto ang anumang app na kasalukuyang gumagana kapag binago ang pag-rotate o resolution"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Dapat nakakonekta sa external na display ang iyong device para ma-mirror ang screen mo"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Higit pang opsyon"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"I-hold at i-drag para baguhin ang ayos ng mga display."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"I-cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"I-enable ang wireless display"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Suriin ang password at subukan ulit"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Makipag-ugnayan sa manufacturer ng device"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Suriin ang koneksyon at subukan ulit"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Hindi available sa ngayon ang Wi‑Fi network na ito"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"May problema sa QR code na ito. Subukang kumonekta sa ibang paraan."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Pumili ng network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Para maikonekta ang iyong device, pumili ng network"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Idagdag ang device na ito sa “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Matuto pa tungkol sa auto-rotate"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Resolusyon ng screen"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Mataas na resolution"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Buong resolution"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Mas malakas gumamit ng iyong baterya ang buong resolution. Kapag pinalitan mo ang iyong resolution, posible itong maging sanhi ng pag-restart ng ilang app."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Max na resolution"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Mas malakas gumamit ng iyong baterya ang max na resolution. Kapag pinalitan mo ang iyong resolution, posible itong maging sanhi ng pag-restart ng ilang app."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Napili"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Mga Kulay"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
     <string name="brightness" msgid="6216871641021779698">"Level ng brightness"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Adaptive brightness"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Tungkol sa adaptive brightness"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Awtomatikong maa-adjust ang brightness ng iyong screen sa kapaligiran at mga aktibidad mo. Maaari mong manual na galawin ang slider para matulungan ang adaptive brightness na matutunan ang iyong mga preference."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Naka-on"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Naka-off"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Mga setting ng Bedtime mode"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Maa-activate din ng mga mode ang madilim na tema}=1{Maa-activate din ng {mode_1} ang madilim na tema}=2{Maa-activate din ng {mode_1} at {mode_2} ang madilim na tema}=3{Maa-activate din ng {mode_1}, {mode_2}, at {mode_3} ang madilim na tema}one{Maa-activate din ng {mode_1}, {mode_2}, at # pa ang madilim na tema}other{Maa-activate din ng {mode_1}, {mode_2}, at # pa ang madilim na tema}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Mga setting ng mga mode"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Mas madilim pa"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Extra dim"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Payagan ang device na mas dumilim kaysa karaniwan"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Timeout ng screen"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Mga serbisyo ng lokasyon"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Mga serbisyo ng lokasyon"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Gamitin ang lokasyon"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Gamitin ang lokasyon para sa time zone"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Hindi awtomatikong maitakda ang time zone"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Naka-off ang Lokasyon o Mga Serbisyo ng Lokasyon"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Mga setting ng lokasyon"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Ayusin ito"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Kanselahin"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Naka-off ang awtomatikong time zone"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Hindi available kapag naka-off ang awtomatikong 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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Posibleng gamitin ang lokasyon para itakda ang time zone"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Kung available ang lokasyon ng iyong device, posibleng gamitin ito para itakda ang time zone mo"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Tingnan ang impormasyong legal, katayuan, bersyon ng software"</string>
     <string name="legal_information" msgid="7509900979811934843">"Legal na impormasyon"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Mga Opsyon"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Pisikal na keyboard"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Mga bounce key"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Binabalewala ng keyboard ang mabilis na paulit-ulit na pagpindot sa parehong key sa loob ng <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Binabalewala ng keyboard ang mabilis na paulit-ulit na pagpindot sa iisang key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limitasyon ng bounce key"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Piliin kung gaano katagal babalewalain ng iyong keyboard ang paulit-ulit na pagpindot sa key"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Custom"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"custom na bilang"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Mga slow key"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Ina-adjust sa <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms kung gaano dapat katagal pindutin ang key para mag-activate"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"I-adjust kung gaano katagal bago ma-activate ang pagpindot ng key"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Mga sticky key"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Paisa-isang pumindot ng key para sa mga shortcut sa halip na sabay-sabay na pindutin ang mga key"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mga mouse key"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Gamitin ang pisikal na keyboard para kontrolin ang mouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Gamitin ang mga mouse key"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gamitin ang iyong keyboard para kontrolin ang pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Reverse na pag-scroll ng mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Mag-scroll pataas para ibaba ang page"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Pagpalitin ang kaliwa at kanang button"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gamitin ang kaliwang button ng mouse bilang iyong kanan"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Mga mouse key para sa <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Gamitin ang mga <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> key para igalaw ang pointer ng mouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Gamitin ang <xliff:g id="CLICK_LABEL">%s</xliff:g> key para i-click ang pangunahing mouse button"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Gamitin ang <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> key para pindutin nang matagal ang pangunahing mouse button"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Gamitin ang <xliff:g id="RELEASE_LABEL">%s</xliff:g> key para i-release ang pangunahing mouse button"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Gamitin ang <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> key para i-toggle ang scroll mode. Ipapa-scroll nito sa mga <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> key ang view pataas, pababa, pakaliwa, o pakanan"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Gamitin ang <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> key para i-click ang ikalawang mouse button"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Mga keyboard shortcut"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ipakita ang listahan ng mga shortcut"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Mga keyboard at tool ng profile sa trabaho"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Default"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Touchpad"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Touchpad at mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Mouse"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Bilis ng pointer, mga galaw"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"I-tap upang i-click"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Pag-tap para mag-drag"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Pag-click sa kanang bahagi sa ibaba"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"I-click ang kanang sulok sa ibaba ng touchpad para sa opsyon"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Bilis ng pointer"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Gumamit ng pag-tap gamit ang tatlong daliri"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Kulay ng pointer"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Gawing itim ang fill ng pointer"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Gawing berde ang fill ng pointer"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Matuto ng mga galaw sa touchpad"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Pag-middle click"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Ilunsad ang Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Pumunta sa home"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Bumalik"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Tingnan ang mga kamakailang app"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Pumunta sa home"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Mag-swipe pataas gamit ang 3 daliri saanman sa touchpad mo"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Bumalik"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pumili ng bagong key para sa <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibility ng pisikal na keyboard"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Mga sticky key, Mga bounce key, Mga mouse key"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Mga Umuulit na Key"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Pagkaantala bago umulit"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Rate ng Pag-uulit"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Pindutin nang matagal ang isang key para ulitin ang character nito hanggang sa bitawan ang key"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Layout na <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Awtomatiko: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"I-preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Mga karaniwang pagpipilian"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Wika"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Laki ng text"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Laki ng caption"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Istilo ng caption"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Mga custom na pagpipilian"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Kulay ng background"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Isaayos ang paggamit ng power"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Mga kasamang package"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Gumagana nang normal ang mga app"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Inirerekomendang palitan ang baterya"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Bawas na ang kapasidad ng baterya at performance ng pag-charge, at inirerekomendang palitan ang baterya."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Paubos na ang baterya"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"I-on ang Pantipid ng Baterya para patagalin ang baterya"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Patagalin ang baterya"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putulin ang koneksyon ng VPN na ito?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Putulin ang koneksyon"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Bersyon"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Bersyon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Kalimutan ang VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Gusto mo bang palitan ang dati nang VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Gusto mo bang itakda ang VPN na palaging naka-on?"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 AM - 5 PM tuwing weekday\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Mga event sa kalendaryo"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Aktibo ang {mode_1}}=2{Aktibo ang {mode_1} at {mode_2}}=3{Aktibo ang {mode_1}, {mode_2}, at {mode_3}}one{Aktibo ang {mode_1}, {mode_2}, at # pa}other{Aktibo ang {mode_1}, {mode_2}, at # pa}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mode ang puwedeng awtomatikong mag-on}one{# mode ang puwedeng awtomatikong mag-on}other{# na mode ang puwedeng awtomatikong mag-on}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Huwag Istorbohin}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"NAKA-ON"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Hindi nakatakda"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Naka-disable"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Mga Notification"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Tagal"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mga mensahe, event, at paalala"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mga mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Tapos na"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Mga Setting"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Walang visual o tunog mula sa mga notification"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Walang tunog mula sa mga notification"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Wala kang makikita o maririnig na mga notification. Pinapayagan ang mga tawag mula sa mga naka-star na contact at umuulit na tumatawag."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Kasalukuyang setting)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Baguhin ang mga setting ng notification na Huwag Istorbohin?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Mga tunog sa profile sa trabaho"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Gamitin ang tunog sa personal na profile"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Gamitin ang mga tunog na ginagamit din sa iyong personal na profile"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Pagka-unlock, direktang pumunta sa huling screen. Hindi ipapakita sa lock screen ang mga notification. Mag-swipe pababa para makita ang mga ito."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Laktawan, I-bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Kapag naka-lock ang work profile"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Pag-minimalize ng notification sa lock screen"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Magpakita ng mas kaunting notification sa lock screen"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Ipakita ang mga bagong notification lang sa lock screen"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Awtomatikong alisin ang mga natingnan nang notification sa lock screen"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Mga notification sa lock screen"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Ipakita ang mga pag-uusap, default, at naka-silent"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Ipakita ang mga pag-uusap, default, at naka-silent"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Ipakita, lahat ng content ng notification sa trabaho"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Itago ang sensitibong content ng trabaho"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Kapag naka-lock ang iyong device, paano mo gustong lumabas ang mga notification tungkol sa profile?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Mga notification sa profile"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Mga Notification"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Notification sa app"</string>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kapag nakatanggap ka ng maraming notification sa loob ng maikling panahon, hihinaan ng iyong device ang volume nito at imi-minimize nito ang mga alerto sa loob ng hanggang 2 minuto. Hindi maaapektuhan ang mga tawag, alarm, at priyoridad na pag-uusap. \n\nMakikita ang mga notification na matatanggap habang cooldown sa pamamagitan ng paghila pababa mula sa itaas ng screen."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Ilapat sa mga profile sa trabaho"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Ilapat sa mga app ng profile sa trabaho"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Mga naka-bundle na notification"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Naka-on"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Naka-off"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Gamitin ang pag-bundle ng notification"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Imu-mute at pagsasama-samahin ang mga notification na may magkakatulad na tema para sa mas tahimik na experience. Io-override ng pag-bundle ang sariling mga setting ng notification ng app."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Mga serbisyong pantulong sa VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Walang mga naka-install na app ang humiling na mapagana bilang mga serbisyong pantulong sa VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Payagan ang access sa serbisyo ng VR para sa <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"mga priyoridad na pag-uusap"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Mga setting ng mga pag-uusap"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Sino ang puwedeng umabala"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Kahit na hindi ka mabigyan ng notification ng mga app sa pagmemensahe o pagtawag, maaabot ka pa rin ng mga taong pipiliin mo rito sa pamamagitan ng mga app na iyon"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Mga Tawag"</string>
@@ -3826,6 +3900,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Mga setting ng mga contact"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Mga setting ng mga naka-star na contact"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Wala"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Wala"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Mga Alarm"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Walang app na 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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Trabaho)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Nagkakalkula…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Mga setting ng mga app"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Payagan ang mga app na mag-override"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Mga app na puwedeng umabala"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Gumawa ng mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Custom na mode"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Pangalan ng mode"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Hindi puwedeng walang mode name"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Pumili ng icon"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Mga event sa kalendaryo"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine sa oras ng pagtulog"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Habang nagmamaneho"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Mga full-screen na notification"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Payagan ang mga full-screen na notification mula sa app na ito"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Payagan ang app na ito na magpakita ng mga notification na sakop ang buong screen kapag naka-lock ang device. Puwedeng gamitin ng mga app ang mga ito para mag-highlight ng mga alarm, papasok na tawag, o iba pang agarang notification."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"I-write ang mga preference sa system"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Payagan ang app na ito na baguhin ang mga preference sa system para sa iyo"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga pangunahing preference sa system."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Mga app sa pamamahala ng media"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Payagan ang app na mamahala ng media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Kung papayagan, mababago o made-delete ng app na ito ang mga media file na ginawa gamit ang iba pang app nang hindi nanghihingi ng pahintulot sa iyo. May pahintulot dapat ang app na i-access ang mga file at media."</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Mga Galaw"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Mabilis na buksan ang camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para mabuksan kaagad ang camera, pindutin ang power button nang dalawang beses. Gumagana ito sa anumang screen."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"I-flip ang camera para sa selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigation mode"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Satellite na pagmemensahe"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Magpadala at makatanggap ng mga text message sa pamamagitan ng satellite. Kasama sa iyong account."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Magpadala at makatanggap ng mga text message sa pamamagitan ng satellite. Hindi kasama sa iyong account."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Satellite na pagmemensahe"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Tungkol sa satellite na pagmemensahe"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Satellite messaging, koneksyon sa satellite"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Tungkol sa <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Puwede kang magpadala at makatanggap ng mga text message sa pamamagitan ng satellite bilang bahagi ng isang kwalipikadong <xliff:g id="CARRIER_NAME">%1$s</xliff:g> account"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ang iyong plan sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Kasama ang satellite na pagmemensahe sa iyong account"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Kasama sa iyong account ang pagmemensahe"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Hindi kasama ang satellite na pagmemensahe sa iyong account"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Matuto Pa"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Paano ito gumagana"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Awomatikong kokonekta ang iyong telepono sa satellite. Para sa pinakamahusay na koneksyon, manatili sa kung saan may malinaw na view ng kalangitan."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Kapag nakakoenekta na ang iyong telepono sa satellite"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Puwede kang mag-text sa kahit sino, kasama ang mga serbisyong pang-emergency. Kokonekta ulit ang iyong telepono sa mobile network kapag available."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Posibleng mas magtagal ang satellite na pagmemensahe at available lang sa ilang lugar. Puwedeng makaapekto sa iyong koneksyon sa satellite ang lagay ng panahon at ilang partikular na istruktura. Hindi available ang pagtawag gamit ang satellite. Posibleng kumonekta pa rin ang mga emergency na tawag.\n\nPosibleng abutin nang ilang sandali bago lumabas ang mga pagbabago sa account sa Mga Setting. Makipag-ugnayan sa iyong carrier para sa mga detalye."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Higit pa tungkol sa satellite na pagmemensahe"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"Posibleng mas matagal at available lang sa ilang lugar ang <xliff:g id="SUBJECT">%1$s</xliff:g>. Puwedeng makaapekto sa iyong koneksyon sa satellite ang lagay ng panahon at ilang partikular na istruktura. Hindi available ang pagtawag gamit ang satellite. Posibleng kumonekta pa rin ang mga emergency na tawag.\n\nPosibleng abutin nang ilang sandali bago lumabas ang mga pagbabago sa account sa Mga Setting. Makipag-ugnayan sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g> para sa mga detalye."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Higit pa tungkol sa <xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Hindi ma-on ang <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Para i-on ang <xliff:g id="FUNCTION">%1$s</xliff:g>, wakasan muna ang koneksyon sa satellite"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Koneksyon sa satellite"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Koneksyon sa satellite"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"koneksyon sa satellite"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"satellite messaging"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Kasama sa iyong account ang paggamit ng data"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"SOS Gamit ang Satellite"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Magmensahe sa mga serbisyong pang-emergency kapag hindi ka makakonekta sa mobile o Wi‑Fi network"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sos gamit ang satellite, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Tungkol sa SOS Gamit ang Satellite"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Puwede kang magpadala ng mensahe sa mga serbisyong pang-emergency at magbahagi ng lokasyon mo lokasyon kapag hindi ka makakonekta sa mobile o Wi-Fi network. Posibleng hindi available ang serbisyong ito sa lahat ng oras sa lahat ng lokasyon o sitwasyon."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Tumawag o mag-text sa mga serbisyong pang-emergency"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Magsagot ng mga tanong tungkol sa emergency"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Sundin ang mga hakbang para kumonekta sa satellite"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Kung wala kang mobile network, makakakita ka ng opsyong gamitin ang SOS gamit ang satellite"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Magpadala ng mga sagot sa mga serbisyong pang-emergency para makuha mo ang naaangkop na uri ng tulong"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Kapag nakakonekta ka na, puwede ka nang magmensahe sa mga serbisyong pang-emergency"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Sumubok ng demo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Kapag kumonekta ka sa mga serbisyong pang-emergency sa pamamagitan ng satellite, ibabahagi ang iyong pangalan, email, numero ng telepono, lokasyon, impormasyon ng device (IMEI, wika, modelo, level ng baterya), at impormasyon ng pang-emergency na contact sa mga serbisyong pang-emergency at service provider ng satellite. \n\nPara gamitin ang SOS gamit ang satellite, dapat ay Google Messages ang default mong SMS app. \n\nKung naka-off ang awtomatikong pagpili ng network, mao-on ito, at awtomatikong kokonekta sa anumang network ang iyong device."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Mga preference sa pagbabahagi"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Mga pang-emergency na contact"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Iyong Google Account"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Suriin o i-update ang impormasyong ibabahagi sa mga serbisyong pang-emergency"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Mga Access Point Name"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Hindi available kapag nakakonekta sa <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Nasa 16KB mode ka ng page-agnostic mode. Hindi magagarantiya ang integridad ng software sa mode na ito, at posibleng malagay sa panganib ang anumang data na naka-store sa telepono habang naka-unlock ang bootloader. Madi-disable ang ilang feature sa mga mode na ito, kaya posibleng hindi gumana ang ilang application. Para makabalik sa production mode, kailangan mong bumalik sa 4KB mode at pagkatapos ay i-lock ang bootloader ng device. Ifa-factory reset nito ulit ang device at ire-restore ito sa mga setting sa production. Pagkatapos mag-boot ng device sa Android, i-disable ang OEM na pag-unlock sa Mga opsyon ng developer. Kung hindi magbu-boot sa Android ang device o unstable ito, mag-flash ulit sa device ng mga pinakabagong factory image mula sa &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; o gamitin ang &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; at piliin ang \'I-wipe ang Device,\' \'I-lock ang Bootloader,\' at \'Sapilitang I-flash ang lahat ng partition.\'"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB Page-agnostic Mode"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Magbasa pa"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Paganahin ang app sa page size compat mode"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Tagapangasiwa ng ulat ng bug"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Tinutukoy kung aling app ang mangangasiwa sa shortcut ng Ulat ng Bug sa iyong device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
@@ -5161,7 +5284,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Hindi available sa kasalukuyang lokasyon ang UWB"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Gamitin ang Thread"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Nakakatulong ang Thread na ikonekta ang iyong mga device para sa smart na tahanan, na nagbu-boost ng efficiency, at performance.\n\nKapag naka-enable, kwalipikado ang device na ito na sumali sa isang Thread network, na nagbibigay-daan sa pagkontrol sa mga device na sinusuportahan ng Matter sa pamamagitan ng teleponong ito."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Nakakatulong ang Thread na ikonekta ang iyong mga device para sa smart na tahanan, na nagbu-boost ng efficiency at performance.\n\nKapag naka-enable, kwalipikado ang device na ito na sumali sa isang Thread network, na nagbibigay-daan sa pagkontrol sa mga device na sinusuportahan ng Matter sa pamamagitan ng teleponong ito."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Matuto pa tungkol sa Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Access sa camera"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Access sa mikropono"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Makinig sa stream"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Mag-scan ng QR code ng audio stream para makinig sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Hindi mae-edit ang password habang nagbabahagi. Para palitan ang password, i-off muna ang pag-share ng audio."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Dapat may 4-16 na character ang password mo at mga titik, numero, at simbolo lang dapat ang nilalaman nito"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Scanner ng QR code"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Kailangan ng tulong?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Maghanap sa Mga Setting"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"mga contact, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Storage ng mga contact"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device lang"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Hindi masi-sync sa account ang mga bagong contact"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Ise-save sa iyong device at isi-sync sa iyong account bilang default ang mga contact"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Nagka-error sa pagtatakda ng default na account"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Walang itinakdang default"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device lang"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device at %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Magdagdag ng account para magsimula"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Saan ise-save ang mga contact"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Pindutin nang matagal ang button ng Home o handle ng navigation para maghanap gamit ang content sa iyong screen."</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b7e2f648622..0a50c87f116 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Kar tanesi"</item>
     <item msgid="7952183800501346803">"Plaj şemsiyesi"</item>
     <item msgid="799139025758265891">"Atölye araçları"</item>
-    <item msgid="1330084588359129896">"Çadır"</item>
+    <item msgid="8112685757657659269">"Piyano"</item>
     <item msgid="3861584909935022342">"Film rulosu"</item>
     <item msgid="5827426100157335512">"Kitap"</item>
     <item msgid="8585828346253128384">"Nilüfer çiçeği"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 48e41f9a69c..7f880fc28a5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Yeni cihaz eşle"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Yarın otomatik olarak aç"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth\'u kapatırsanız sonraki gün tekrar açılır"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Sağ kulağı eşle"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Sol kulağı eşle"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Diğer kulağınızı eşleyin"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audio\'yu devre dışı bırak"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Cihaz, LE Audio donanımı özelliklerini destekliyorsa Bluetooth LE Audio özelliğini devre dışı bırakır."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio modu"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio Broadcast kullanıcı arayüzü önizlemesini etkinleştir"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Kişisel ses paylaşımı ve özel yayın dahil olmak üzere LE Audio Sharing kullanıcı arayüzü önizlemesini etkinleştirir"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Cihaz Ayrıntıları\'nda LE Audio açma/kapatmayı göster"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio izin verilenler listesini atla"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio çevre biriminin, izin verilenler listesi kriterlerini karşıladığı doğrulanmamış olsa bile varsayılan olarak LE Audio\'yu kullanın."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Uygulama dili"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Önerilen diller"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Tüm diller"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Önerilen"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Tüm diller"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Tüm bölgeler"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tüm sayı sistemleri"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Sistem dili"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Sistem varsayılanı"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Ayarlar\'da bu uygulama için dil seçimi mevcut değil."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Değiştir"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s kullanılamıyor"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bu dil sistem dili olarak kullanılamaz, ancak uygulamalara ve web sitelerine bu dili tercih ettiğinizi bildirdiniz."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Ara"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Dil ekle"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Bölge tercihi"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Dil adını yazın"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Diğer dil ayarları"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Bölgesel tercihler"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Birimleri ve sayı tercihlerini ayarlayın"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Deneyiminizin kişiselleştirilebilmesi için bölgesel tercihlerinizi uygulamalarla paylaşın."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Uygulamalar, mümkün olduğunda bölgesel tercihlerinizi kullanır."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Bölgesel tercihler"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Sıcaklık"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Haftanın ilk günü"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Sayı tercihleri"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Dolaşımdayken veri hizmetlerine bağlan"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Dolaşımdayken veri hizmetlerine bağlan"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Dolaşım ücretleri alınabilir."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Saati otomatik olarak ayarla"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Otomatik olarak ayarla"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Bu anahtar açık konuma getirildiğinde saat dilimini ayarlamak için konum kullanılır"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Otomatik tarih ve saat"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Ağınızı ve kablosuz sinyallerinizi kullanarak otomatik olarak ayarlayın"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Otomatik saat dilimi"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Yakınınızdaki mobil ağlara göre otomatik olarak ayarlayın"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Varsa cihazınızın konumu ile otomatik olarak ayarlanır"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Yerel ayar varsayılan değerini kullan"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat biçimini kullan"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Saat"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Parmağınızı kaldırın ve sensöre tekrar dokunun"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Parmak izi sensörü kullanılamıyor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Bir onarım hizmeti sağlayıcıyı ziyaret edin."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekran Kapalıyken Parmak İzi Kilidi ile Kilit Açma"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Parmak İzi Kilidi\'ni ekran kapalıyken de kullanın"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekran kapalı, Kilidi aç"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Daha fazla güvenlik ayarı"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"İş profili kilidi, şifreleme ve daha fazlası"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Şifreleme, kimlik bilgisi ve daha fazlası"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Özel alanınız için desen ayarlayın"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kilitle"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Gizle"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Özel alan deseninizi onaylayın"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Özel alan PIN\'inizi yeniden girin"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Özel alan şifrenizi yeniden girin"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Maksimum sayıda parmak izi eklediniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Daha fazla parmak izi eklenemez"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Açık"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Kapalı"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Harici Ekran"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Harici ekran kullanın"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ekran çözünürlüğü"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Harici ekranın bağlantısı kesildi"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Döndürme veya çözünürlük ayarını değiştirmek, çalışmakta olan uygulamaları durdurabilir"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Ekranınızı yansıtmak için cihazınızın harici bir ekrana bağlı olması gerekir"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Diğer seçenekler"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Ekranları yeniden düzenlemek için basılı tutup sürükleyin."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayın"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ayna"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kablosuz görüntülemeyi etkinleştir"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Şifreyi kontrol edip tekrar deneyin"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Cihazın üreticisiyle iletişim kurun"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Bağlantıyı kontrol edip tekrar deneyin"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Bu kablosuz ağ şu anda kullanılamıyor"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Bu QR koduyla ilgili bir sorun var. Başka bir şekilde bağlanmayı deneyin."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Ağ seçin"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Cihazınızı bağlamak için bir ağ seçin"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Bu cihaz “<xliff:g id="SSID">%1$s</xliff:g>” ağına eklensin mi?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Otomatik döndürme hakkında daha fazla bilgi edinin"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekran çözünürlüğü"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Yüksek çözünürlük"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Tam çözünürlük"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Tam çözünürlük daha fazla pil kullanır. Çözünürlük değiştirildiğinde bazı uygulamalar yeniden başlatılabilir."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Seçili"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Renkler"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Doğal"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Uyarlanabilir"</string>
     <string name="brightness" msgid="6216871641021779698">"Parlaklık düzeyi"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Otomatik parlaklık"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Otomatik parlaklık hakkında"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekranınızın parlaklığı, bulunduğunuz ortama ve aktivitelerinize göre otomatik olarak ayarlanır. Otomatik parlaklık özelliğinin tercihlerinizi öğrenmesine yardımcı olmak için kaydırma çubuğunu manuel olarak hareket ettirebilirsiniz."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Açık"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Kapalı"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Uyku Vakti modu ayarları"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Modlar koyu temayı da etkinleştirebilir}=1{{mode_1}, koyu temayı da etkinleştirir}=2{{mode_1} ve {mode_2}, koyu temayı da etkinleştirir}=3{{mode_1}, {mode_2} ve {mode_3}, koyu temayı da etkinleştirir}other{{mode_1}, {mode_2} ve diğer # mod koyu temayı da etkinleştirir}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Mod ayarları"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Daha düşük parlaklık"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ekstra loş"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Cihazın parlaklığı daha fazla düşürmesine izin verin"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekran zaman aşımı"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -1623,7 +1650,7 @@
     <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 verir. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Konum hizmetleri"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Konum hizmetleri"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Konumu kullan"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Saat dilimi için konumu kullan"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Saat dilimi otomatik olarak ayarlanamıyor"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Konum veya Konum Hizmetleri kapalı"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Konum ayarları"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Bunu düzelt"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"İptal"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Otomatik saat dilimi algılama kapalı"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Otomatik saat dilimi algılama kapalıyken kullanılamaz"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Konum bilgisi, saat dilimini ayarlamak için kullanılabilir"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Cihazınızın konumu kullanılabilir durumdaysa saat diliminizi ayarlamak için kullanılabilir"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Yasal bilgileri, durumu, yazılım sürümünü görüntüle"</string>
     <string name="legal_information" msgid="7509900979811934843">"Yasal bilgiler"</string>
     <string name="manual" msgid="3651593989906084868">"Manuel"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Seçenekler"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Erişilebilirlik"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziksel klavye"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Geri sekme tuşları"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Klavye, aynı tuşa <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms. içinde hızlı bir şekilde tekrarlanan basma işlemlerini yoksayar"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klavye, aynı tuşa hızlı bir şekilde tekrarlanan basma işlemlerini yoksayar"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Tekrarlı basmayı yoksayma tuş eşiği"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klavyenizin, tuşlara ne kadar süre içinde tekrarlanan basma işlemlerini yoksayacağını seçin"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 saniye"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 saniye"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 saniye"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Özel"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"özel değer"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Yavaş tuşlar"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Bir tuşa basma işleminin etkinleştirileceği süreyi <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms. olarak ayarlar"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Bir tuşa basma işleminin etkinleştirileceği süreyi ayarlar"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Yapışkan tuşlar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tuşları aynı anda basılı tutmak yerine kısayollar için tek seferde bir tuşa basın"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Fare tuşları"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Fareyi kontrol etmek için fiziksel klavye kullanılsın"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Fare tuşlarını kullan"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"İşaretçiyi kontrol etmek için klavyenizi kullanın"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Fare ters kaydırma"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sayfayı aşağı taşımak için yukarı kaydırın"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sol ve sağ düğmeleri değiştir"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sol fare düğmesini sağ fare düğmesi olarak kullanın"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> için fare tuşları"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Fare işaretçisini hareket ettirmek için <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> tuşlarını kullanın"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Birincil fare düğmesini tıklamak için <xliff:g id="CLICK_LABEL">%s</xliff:g> tuşunu kullanın"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Birincil fare düğmesini basılı tutmak için <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> tuşunu kullanın"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Birincil fare düğmesini bırakmak için <xliff:g id="RELEASE_LABEL">%s</xliff:g> tuşunu kullanın"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Kaydırma modları arasında geçiş yapmak için <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> tuşunu kullanın. Bu durumda <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> tuşları, görünümü yukarı, aşağı, sola veya sağa kaydırır"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"İkincil fare düğmesini tıklamak için <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> tuşunu kullanın"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klavye kısayolları"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Kısayol listesini göster"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"İş profili klavyeleri ve araçları"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Varsayılan"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Dokunmatik alan"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Dokunmatik alan ve fare"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Fare"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"İşaretçi hızı, hareketler"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Tıklamak için dokunma"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Dokunarak sürükleme"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Sağ alt tarafı tıkla"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Seçenekler için dokunmatik alanın sağ alt köşesini tıklayın"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"İşaretçi hızı"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Üç parmakla dokunmayı kullan"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"İşaretçi rengi"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"İşaretçi dolgu stilini siyah yapın"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"İşaretçi dolgu stilini yeşil yapın"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Dokunmatik alan hareketlerini öğrenin"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"dokunmatik yüzey, dokunma yüzeyi, fare, imleç, kaydırma, sağ tıklama, tıklama, işaretçi"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"sağ tıklama, dokunma"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Orta tıklama"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Asistan\'ı başlat"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Ana sayfaya git"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Geri dön"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Son uygulamaları göster"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Ana ekrana gidin"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Dokunmatik alanda üç parmağınızla yukarı kaydırın"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Geri dön"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> için yeni bir tuş seçin:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziksel klavye erişilebilirliği"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Yapışkan tuşlar, geri sekme tuşları, fare tuşları"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Tuşları tekrarla"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Tekrardan önce geciktir"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Tekrarlama oranı"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Aynı karakteri tekrarlamak için ilgili tuşu basılı tutun. Tuş basılı tutulduğu sürece karakter tekrarlanır"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> düzeni"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Varsayılan"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Otomatik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Önizle"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart seçenekler"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Dil"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Metin boyutu"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Altyazı boyutu"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Altyazı stili"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Özel seçenekler"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Arka plan rengi"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Pil kullanımını ayarla"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Dahil olan paketler"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Uygulamalar normal şekilde çalışıyor"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Pilin değiştirilmesi önerilir"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Pil kapasitesi ve şarj performansı azaldı. Pilin değiştirilmesi önerilir."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Düşük pil seviyesi"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Pil ömrünü uzatmak için Pil Tasarrufu özelliğini aç"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Pil ömrünü iyileştirme"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN\'nin bağlantısı kesilsin mi?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Bağlantıyı kes"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Sürüm"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Sürüm <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN\'yi unut"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mevcut VPN değiştirilsin mi?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Her zaman açık VPN ayarlansın mı?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"hafta içi 09:00-17:00\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Takvim etkinlikleri"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} etkin}=2{{mode_1} ve {mode_2} etkin}=3{{mode_1}, {mode_2} ve {mode_3} etkin}other{{mode_1}, {mode_2} ve # mod daha etkin}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 mod otomatik olarak etkinleştirilebilir}other{# mod otomatik olarak etkinleştirilebilir}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Rahatsız Etmeyin}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"AÇIK"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Ayarlanmadı"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Devre dışı"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Anladım"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Bildirimler"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Süre"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mesajlar, etkinlikler ve hatırlatıcılar"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Bitti"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Ayarlar"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bildirimlerden görsel veya sesli uyarı yok"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bildirimlerden sesli uyarı yok"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Bildirimleri görmeyecek veya duymayacaksınız. Yıldız işaretli kişilerden ve tekrar arayanlardan gelen aramalara izin verilir."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Geçerli ayar)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Rahatsız Etmeyin bildirim ayarları değiştirilsin mi?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"İş profili sesleri"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Kişisel profil seslerini kullan"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Kişisel profilimle aynı sesleri kullan"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Kilit açıldıktan sonra, doğrudan son kullanılan ekrana gider. Bildirimler kilit ekranında gösterilmez. Bildirimleri görmek için üstten aşağıya kaydırın."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Kilit ekranı, Kilitekranı, Atla, Geç"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"İş profili kilitli olduğunda"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Kilit ekranında gösterilecek bildirim sayısını azaltma"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Kilit ekranında daha az bildirim göster"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Kilit ekranında yalnızca yeni bildirimleri göster"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Daha önce görüntülenen bildirimleri kilit ekranından otomatik olarak kaldır"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Kilit ekranındaki bildirimler"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Varsayılan ve sessiz görüşmeleri göster"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Varsayılan ve sessiz görüşmeleri göster"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Tüm iş bildirimi içeriklerini göster"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hassas iş içeriğini gizle"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Cihazınız kilitliyken profil bildirimlerinin nasıl gösterilmesini istersiniz?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profil bildirimleri"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Bildirimler"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Uygulama bildirimleri"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Kısa süre içinde çok sayıda bildirim aldığınızda cihazınız 2 dakika boyunca sesi kısar ve uyarıları azaltır. Aramalar, alarmlar ve öncelikli görüşmeler bu durumdan etkilenmez. \n\nBildirim şiddeti düşürülürken aldığınız bildirimlere ekranın üst tarafından aşağı doğru çekerek ulaşabilirsiniz."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"İş profillerine uygula"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"İş profili uygulamalarına uygulayın"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Gruplandırılmış bildirimler"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Açık"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Kapalı"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Bildirim gruplandırmayı kullan"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Benzer temalara sahip bildirimler sessize alınıp gruplandırılarak daha sessiz bir deneyim sunulur. Gruplandırma, uygulamanın kendi bildirim ayarlarını geçersiz kılar."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR yardımcı hizmetleri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Yüklü hiçbir uygulama VR yardımcı hizmetleri olarak çalışma isteğinde bulunmadı."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> için VR hizmetine erişim izni verilsin mi?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"öncelikli görüşmeler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Görüşme ayarları"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kimler rahatsız edebilir?"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Mesajlaşma veya arama uygulamaları size bildirim gönderemese bile burada seçtiğiniz kişiler bu uygulamalar üzerinden size erişebilirler"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Aramalar"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kişiler ayarları"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Yıldız işaretli kişiler ayarları"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Hiç kimse"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Hiç kimse"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmlar"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Hiçbir uygulama araya giremez}=1{{app_1} araya girebilir}=2{{app_1} ve {app_2} araya girebilir}=3{{app_1}, {app_2} ve {app_3} araya girebilir}other{{app_1}, {app_2} ve # uygulama daha araya girebilir}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (İş)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Hesaplanıyor…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Uygulama ayarları"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Uygulamaların geçersiz kılmasına izin ver"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Araya girebilecek uygulamalar"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Mod oluşturun"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Özel mod"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Mod adı"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Mod adı boş bırakılamaz"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Simge seçin"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Takvim etkinlikleri"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Uyku vakti rutini"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Araç kullanırken"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Tam ekran bildirimler"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Bu uygulamanın tam ekran bildirim göstermesine izin ver"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Cihaz kilitliyken bu uygulamanın tüm ekranı kaplayan bildirimler göstermesine izin verin. Uygulamalar bunu alarmları, gelen aramaları ve diğer acil bildirimleri göstermek için kullanabilir."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Sistem tercihlerini yaz"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Bu uygulamanın sizin adınıza sistem tercihlerini değiştirmesine izin verin"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Bu izin, bir uygulamanın temel sistem tercihlerini değiştirmesine olanak sağlar."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Medya yönetimi uygulamaları"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Uygulamaya medya dosyalarını yönetme izni ver"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"İzin verilirse bu uygulama, diğer uygulamalarla oluşturulan medya dosyalarını size sormadan değiştirebilir ya da silebilir. Bu uygulamanın dosyalara ve medyaya erişim izni olmalıdır."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Hareketler"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kamerayı hızlı aç"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Kamerayı çabuk açmak için güç düğmesine iki kez dokunun. Tüm ekranlarda çalışır."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Selfie için kamerayı değiştir"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Gezinme modu"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Uydu üzerinden mesajlaşma"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Uydu üzerinden kısa mesaj gönderip alın. Hesabınıza dahil edilir."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Uydu üzerinden kısa mesaj gönderip alın. Bu hizmet, hesabınızda sunulmaz."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Uydu üzerinden mesajlaşma"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Uydu üzerinden mesajlaşma hakkında"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Uygun bir <xliff:g id="CARRIER_NAME">%1$s</xliff:g> hesabınız varsa uydu üzerinden kısa mesaj gönderip alabilirsiniz"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> planınız"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Uydu üzerinden mesajlaşma, hesabınıza dahil edilir"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Uydu üzerinden mesajlaşma, hesabınıza dahil edilmez"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Daha Fazla Bilgi"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"İşleyiş şekli"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefonunuz otomatik olarak bir uyduya bağlanır. En iyi bağlantıyı kurmak için gökyüzünü net bir şekilde görmeniz gerekir."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Telefonunuz bir uyduya bağlandıktan sonra"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Acil durum hizmetleri de dahil istediğiniz kişilere mesaj gönderebilirsiniz. Telefonunuz, mevcut olduğunda mobil ağa tekrar bağlanır."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Uydu üzerinden mesajlaşma daha uzun sürebilir ve yalnızca bazı bölgelerde kullanılabilir. Uydu bağlantınız, hava durumundan ve bazı yapılardan etkilenebilir. Uydu üzerinden arama yapılamaz. Ancak, acil durum aramaları bağlanabilir.\n\nHesapta yapılan değişikliklerin, Ayarlar\'da görünmesi biraz zaman alabilir. Ayrıntılı bilgiler için operatörünüzle iletişime geçin."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Uydu üzerinden mesajlaşma hakkında daha fazla bilgi"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> etkinleştirilemiyor"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> işlevini etkinleştirmek için önce uydu bağlantısını sonlandırın"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Uydu bağlantısı"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Erişim Noktası Adları"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Sayfadan bağımsız moddaki 16 KB modundasınız. Bu modda yazılım bütünlüğü garanti edilemez ve bootloader\'ın kilidi açıkken telefonda saklanan veriler risk altında olabilir. Bu modlarda bazı özellikler devre dışı bırakılacağı için bir takım uygulamalar çalışmayabilir. Üretim moduna tekrar girmek için 4 KB moduna geçtikten sonra cihazın bootloader\'ını kilitlemeniz gerekir. Bu durumda cihaz tekrar fabrika ayarlarına sıfırlanır ve üretim ayarlarına geri döner. Cihaz başarılı bir şekilde Android\'de başlatıldıktan sonra Geliştirici seçeneklerinde OEM kilit açma özelliğini devre dışı bırakın. Cihaz Android\'de başlatılamıyorsa veya kararsızsa cihazı &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; adresindeki en güncel fabrika ayarı görüntüleriyle yeniden yükleyin veya &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; adresine gidip \"Cihazı Temizle\", \"Bootloader\'ı Kilitle\" ve \"Tüm bölümleri zorla yükle\"yi seçin."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB Sayfadan Bağımsız Mod"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Devamı"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Uygulamayı sayfa boyutu uyumluluk moduyla çalıştır"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Hata raporu işleyici"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Cihazınızda Hata Raporu kısayolunun hangi uygulama tarafından işleneceğini belirler."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Kişisel"</string>
@@ -5161,7 +5313,7 @@
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Ultra Geniş Bant geçerli konumda kullanılamaz"</string>
     <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
     <string name="thread_network_settings_main_switch_title" msgid="3859168481929323474">"Thread\'i kullanın"</string>
-    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread, akıllı ev cihazlarınızı bağlamanıza yardımcı olarak verimliliği ve performansı artırır.\n\nEtkinleştirildiğinde bu cihaz bir Thread ağına katılmaya uygun olur ve Matter destekli cihazlar bu telefon aracılığıyla kontrol edilebilir."</string>
+    <string name="thread_network_settings_footer_title" msgid="7385600318850220927">"Thread, akıllı ev cihazlarınızı birbirine bağlamanıza yardımcı olarak verimliliği ve performansı artırır.\n\nEtkinleştirildiğinde bu cihaz bir Thread ağına katılmaya uygun olur ve Matter destekli cihazlar bu telefon aracılığıyla kontrol edilebilir."</string>
     <string name="thread_network_settings_learn_more" msgid="8278498005848565050">"Thread hakkında daha fazla bilgi"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Kamera erişimi"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Mikrofon erişimi"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Yayını dinle"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihazda dinlemek için ses yayını QR kodunu tarayın"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Şifre, paylaşım sırasında düzenlenemez. Şifreyi değiştirmek için önce ses paylaşımını kapatın."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Şifreniz 4-16 karakterden oluşmalı, yalnızca harf, sayı ve sembol içermelidir"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR kodu tarayıcı"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Yardıma mı ihtiyacınız var?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Ayarlar\'da ara"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kişiler, depolama alanı, hesap"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kişi deposu"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Yalnızca cihaz"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yeni kişiler bir hesapla senkronize edilmez"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kişiler varsayılan olarak cihazınıza kaydedilir ve hesabınızla senkronize edilir"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Varsayılan hesap ayarlanırken hata oluştu"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Varsayılan ayar yok"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Yalnızca cihaz"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Cihaz ve %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamak için hesap ekleyin"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kişilerin kaydedileceği yer"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Seçerek Arat"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Ekranınızdaki içerikleri kullanarak arama yapmak için ana sayfa düğmesine veya gezinme tutma yerine dokunup basılı tutun."</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 45639e5e90f..47028b90afb 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Сніжинка"</item>
     <item msgid="7952183800501346803">"Пляжна парасоля"</item>
     <item msgid="799139025758265891">"Інструменти для майстерні"</item>
-    <item msgid="1330084588359129896">"Намет"</item>
+    <item msgid="8112685757657659269">"Піаніно"</item>
     <item msgid="3861584909935022342">"Кіноплівка"</item>
     <item msgid="5827426100157335512">"Книга"</item>
     <item msgid="8585828346253128384">"Квітка лотоса"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 310611b194d..9ff93b3a334 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Підключити новий пристрій"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматично ввімкнути завтра"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Якщо вимкнути Bluetooth, він ввімкнеться наступного дня"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Підключити правий"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Підключити лівий"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Підключити другий"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Вимкнути Bluetooth LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Вимикає функцію Bluetooth LE Audio, якщо пристрій підтримує апаратні можливості LE Audio."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Режим Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Увімкнути попередній перегляд інтерфейсу для трансляції Bluetooth LE Audio"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Увімкнути попередню версію інтерфейсу для спільного доступу до LE Audio, включно з особистим надсиланням аудіо й приватною трансляцією"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Перемикач LE Audio в інф. про пристрій"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Обходити білий список Bluetooth LE Audio"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio використовуватиметься за умовчанням, навіть якщо периферійний пристрій LE Audio не перевірено на відповідність критеріям білого списку."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Мова додатка"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Пропоновані мови"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Усі мови"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Пропоновані"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Усі мови"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Усі регіони"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Усі системи нумерації"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Мова системи"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Налаштування системи за умовчанням"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Вибір мови для цього додатка в налаштуваннях неможливий"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Змінити"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"Вибрана мова (%s) недоступна"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Цю мову не можна використовувати як мову системи, однак додатки й веб-сайти знатимуть, що ви надаєте їй перевагу."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Пошук"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Додайте мову"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Вибір регіону"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Введіть назву мови"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Інші налаштування мови"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Регіональні налаштування"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Установіть параметри одиниць і чисел"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Укажіть регіональні налаштування, щоб додатки могли персоналізувати для вас свій інтерфейс."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"За можливості додатки використовуватимуть ваші регіональні налаштування."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Регіональні налаштування"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Температура"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Перший день тижня"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Параметри чисел"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Підключатися до служб передавання даних у роумінгу"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Підключатися до служб передавання даних у роумінгу"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Може стягуватися плата за роумінг."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Налаштовувати час автоматично"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Налаштовувати автоматично"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Коли цей перемикач увімкнено, для встановлення часового поясу використовуватимуться геодані"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Автоматичні дата й час"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Визначати автоматично за допомогою мережі й бездротових сигналів"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Автоматичний часовий пояс"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Визначати автоматично на основі мобільних мереж поблизу"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Визначати автоматично на основі геоданих пристрою (якщо доступно)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Використовувати місцеві налаштування за умовчанням"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-годинний формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Підніміть палець і знову торкніться датчика"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Не вдається скористатися сканером відбитків пальців"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Зверніться до постачальника послуг із ремонту."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Розблокування відбитком пальця, коли екран вимкнено"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Використовувати розблокування відбитком пальця, навіть коли екран вимкнено"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Екран вимкнено, розблокування"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Інші налаштування безпеки"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Блокування робочого профілю, шифрування тощо"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Шифрування, облікові дані тощо"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Налаштуйте ключ для приватного простору"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Блокування"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Приховування"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Підтвердьте ключ для приватного простору"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Введіть PIN-код для приватного простору ще раз"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Введіть пароль приватного простору ще раз"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можна додати максимум стільки відбитків: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ви додали максимальну кількість відбитків пальців"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Більше не можна додати відбитки пальців"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Увімкнено"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Вимкнено"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Зовнішній дисплей"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Використовувати зовнішній дисплей"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Роздільна здатність дисплея"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Зовнішній дисплей відключено"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Якщо змінити кут обертання або роздільну здатність, це може зупинити роботу додатків, які в цей момент запущені"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Щоб дублювати ваш екран, пристрій має бути підключено до зовнішнього дисплея"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Інші опції"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Щоб змінити порядок екранів, утримуйте й перетягуйте їх."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляція"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дзеркалювання"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Увімкнути бездротовий екран"</string>
@@ -922,7 +946,7 @@
     <string name="nfc_secure_settings_title" msgid="4906958426927741485">"NFC лише після розблокування"</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Передавання даних Android"</string>
     <string name="android_beam_on_summary" msgid="6067720758437490896">"Вміст додатка готовий до передачі через NFC"</string>
-    <string name="android_beam_off_summary" msgid="5693961375631325042">"Вимк."</string>
+    <string name="android_beam_off_summary" msgid="5693961375631325042">"Вимкнено"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"Недоступно, оскільки NFC вимкнено"</string>
     <string name="android_beam_explained" msgid="5684416131846701256">"Увімкнувши цю функцію, ви можете передавати вміст додатка на інший пристрій, який підтримує NFC, притуливши до нього свій пристрій. Наприклад, можна передавати веб-сторінки, відео YouTube, контактні дані тощо.\n\nПросто притуліть пристрої один до одного (зазвичай тильними сторонами) і торкніться екрана. Додаток визначить, який вміст можна передавати."</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Перевірте пароль і повторіть спробу"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Зв\'яжіться з виробником пристрою"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Перевірте підключення й повторіть спробу"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ця мережа Wi‑Fi зараз недоступна"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Із цим QR-кодом виникла проблема. Спробуйте підключитися іншим способом."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Вибрати мережу"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Виберіть мережу, до якої потрібно підключити пристрій"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Додати цей пристрій до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Докладніше про автообертання"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Роздільна здатність екрана"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Висока роздільна здатність"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Максимальна роздільна здатність"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Коли екран працює з максимальною роздільною здатністю, акумулятор розряджається швидше. Якщо змінити роздільну здатність, деякі додатки можуть перезапуститися."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Вибрано"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Кольори"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природні"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Адаптивні"</string>
     <string name="brightness" msgid="6216871641021779698">"Рівень яскравості"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Адаптивна яскравість"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Про адаптивну яскравість"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Яскравість екрана автоматично пристосовується до середовища й ваших дій. Ви можете пересунути повзунок вручну, щоб відкоригувати яскравість за власним бажанням."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Увімкнено"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Вимкнено"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Налаштування нічного режиму"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Режими можуть також активувати темну тему}=1{Режим \"{mode_1}\" також активує темну тему}=2{Режими \"{mode_1}\" і \"{mode_2}\" також активують темну тему}=3{Режими \"{mode_1}\", \"{mode_2}\" і \"{mode_3}\" також активують темну тему}one{Режими \"{mode_1}\", \"{mode_2}\" і ще # також активують темну тему}few{Режими \"{mode_1}\", \"{mode_2}\" і ще # також активують темну тему}many{Режими \"{mode_1}\", \"{mode_2}\" і ще # також активують темну тему}other{Режими \"{mode_1}\", \"{mode_2}\" і ще # також активують темну тему}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Налаштування режимів"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ще темніше"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Додаткове зменшення яскравості"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Дозволити затемнювати екран пристрою більше ніж зазвичай"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Час вимкнення екрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -1323,7 +1350,7 @@
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Коли в док-станції"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Ніколи"</string>
     <string name="screensaver_settings_summary_on" msgid="4210827304351483645">"Увімкнено / <xliff:g id="SCREEN_SAVER">%1$s</xliff:g>"</string>
-    <string name="screensaver_settings_summary_off" msgid="8720357504939106923">"Вимк."</string>
+    <string name="screensaver_settings_summary_off" msgid="8720357504939106923">"Вимкнено"</string>
     <string name="screensaver_settings_when_to_dream" msgid="8145025742428940520">"Коли почати"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"Підняти, щоб активувати"</string>
     <string name="ambient_display_screen_title" msgid="8615947016991429325">"Активація екрана"</string>
@@ -1623,7 +1650,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Геолокація"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Геолокація"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Використовувати геодані"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Визначати часовий пояс на основі геоданих"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Не вдається встановити часовий пояс автоматично"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Доступ до геоданих або геолокацію вимкнено"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Доступ до моїх геоданих"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Виправити"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Скасувати"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматичне визначення часового поясу вимкнено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Недоступно, якщо автоматичне визначення часового поясу вимкнено"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Часовий пояс може визначатися за місцезнаходженням"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Якщо дані про місцеположення пристрою доступні, на їх основі може визначатися ваш часовий пояс"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
     <string name="legal_information" msgid="7509900979811934843">"Правова інформація"</string>
     <string name="manual" msgid="3651593989906084868">"Посібник"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Опції"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Доступність"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Фізична клавіатура"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Ігнорувати повторне натискання"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Клавіатура ігнорує кілька натискань однієї клавіші протягом <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> мс"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Клавіатура ігнорує кілька натискань однієї клавіші поспіль"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Поріг ігнорування повт. натискання"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Виберіть, протягом якого часу клавіатура ігноруватиме кілька натискань однієї клавіші"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 с"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 с"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 с"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Спеціальне"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"Спеціальне значення"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Повільні клавіші"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Установлює проміжок часу, через який клавіша реагує на натискання: <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> мс"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Установлює проміжок часу, через який клавіша реагує на натискання"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Залипання клавіш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Натискайте клавіші по одній, замість того щоб утримувати їх одночасно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Клавіші для керування мишею"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Використовувати фізичну клавіатуру для керування мишею"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Використовувати клавіші для миші"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Щоб керувати курсором, використовуйте клавіатуру"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Зворотне прокручування мишею"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Прокручувати вгору, щоб переміщатися сторінкою вниз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Поміняти місцями ліву й праву кнопки"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Використовувати ліву кнопку миші як праву"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Клавіші для керування мишею (\"<xliff:g id="KEYBOARD_NAME">%s</xliff:g>\")"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Щоб переміщати курсор миші, використовуйте клавіші <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Щоб натиснути основну кнопку миші, використовуйте клавішу <xliff:g id="CLICK_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Щоб утримувати основну кнопку миші, натисніть клавішу <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Щоб відпустити основну кнопку миші, натисніть клавішу <xliff:g id="RELEASE_LABEL">%s</xliff:g>"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Щоб увімкнути режим прокручування, натисніть клавішу <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g>. За допомогою клавіш <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> можна буде прокручувати сторінку вгору, униз, уліво або вправо."</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Щоб натиснути другу кнопку миші, натисніть клавішу <xliff:g id="RELEASE_2_LABEL">%s</xliff:g>"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Комбінації клавіш"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показати список комбінацій клавіш"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавіатури та інструменти робочого профілю"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"За умовчанням"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Сенсорна панель"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Сенсорна панель і миша"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Миша"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Швидкість курсора, жести"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Натискання дотиком"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Перетягування дотиком"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Дотик у правому нижньому куті"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Натисніть сенсорну панель справа внизу, щоб побачити інші опції"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Швидкість курсора"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Використовувати дотик трьома пальцями"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Колір курсора"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Змінити стиль курсора на чорний"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Змінити стиль курсора на зелений"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Дізнатися про жести на сенсорній панелі"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"сенсорна панель, трекпад, миша, курсор, прокрутити, гортати, права кнопка, натиснути, вказівник"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"натиснути правою кнопкою миші, натиснути"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Середня кнопка"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Запустити Асистента"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Перейти на головний екран"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Назад"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Переглянути нещодавні додатки"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Перейти на головний екран"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Проведіть трьома пальцями вгору будь-де на сенсорній панелі"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Назад"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Виберіть нову клавішу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Функції доступності фізичної клавіатури"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Залипання клавіш, ігнорування повторного натискання клавіш, клавіші для керування мишею"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Повторювати введення символів клавіш"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Затримка перед повторенням"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Швидкість повторення"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Якщо ви втримуватимете клавішу, введення відповідного символу повторюватиметься, доки ви її не відпустите"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Розкладка <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"За умовчанням"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Автоматична розкладка: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Переглянути"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартні параметри"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Мова"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Розмір тексту"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Розмір субтитрів"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стиль субтитрів"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Спеціальні параметри"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Колір фону"</string>
@@ -2488,7 +2547,7 @@
     <string name="print_menu_item_settings" msgid="8202755044784599740">"Налаштування"</string>
     <string name="print_menu_item_add_printers" msgid="7958192149202584039">"Додати принтери"</string>
     <string name="print_feature_state_on" msgid="7132063461008624685">"Увімк."</string>
-    <string name="print_feature_state_off" msgid="1466195699995209446">"Вимк."</string>
+    <string name="print_feature_state_off" msgid="1466195699995209446">"Вимкнено"</string>
     <string name="print_menu_item_add_service" msgid="1549091062463044676">"Додати сервіс"</string>
     <string name="print_menu_item_add_printer" msgid="8711630848324870892">"Додати принтер"</string>
     <string name="print_menu_item_search" msgid="5989979785203603169">"Пошук"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Режим енергоспоживання"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Уключені пакети"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Додатки працюють звичайно"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Радимо замінити акумулятор"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Ємність акумулятора й ефективність заряджання зменшилися. Радимо замінити акумулятор."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Низький заряд акумулятора"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Щоб подовжити час роботи акумулятора, увімкніть режим енергозбереження"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Подовжте час роботи акумулятора"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Відключити цю мережу VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Відключити"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Забути мережу VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Замінити наявну мережу VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Увімкнути постійну мережу VPN?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"09:00–17:00 у будні\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Події в календарі"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Активовано режим \"{mode_1}\"}=2{Активовано режими \"{mode_1}\" і \"{mode_2}\"}=3{Активовано режими \"{mode_1}\", \"{mode_2}\" і \"{mode_3}\"}one{Активовано режими \"{mode_1}\", \"{mode_2}\" і ще #}few{Активовано режими \"{mode_1}\", \"{mode_2}\" і ще #}many{Активовано режими \"{mode_1}\", \"{mode_2}\" і ще #}other{Активовано режими \"{mode_1}\", \"{mode_2}\" і ще #}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 режим може вмикатись автоматично}one{# режим може вмикатись автоматично}few{# режими можуть вмикатись автоматично}many{# режимів можуть вмикатись автоматично}other{# режиму можуть вмикатись автоматично}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Не турбувати}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}few{{mode_1}, {mode_2}, {mode_3}}many{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"УВІМКНЕНО"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Не налаштовано"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Вимкнено"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Сповіщення"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Тривалість"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Повідомлення, події й нагадування"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"У режимі \"Не турбувати\" сигнали повідомлень, нагадувань і подій буде вимкнено (окрім дозволених вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї й інші контакти могли зв’язатися з вами."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Готово"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Налаштування"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Вимкнути зображення й звук сповіщень"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Вимкнути звук сповіщень"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Ви не зможете бачити або чути сповіщення. Дозволено виклики від контактів із зірочкою та постійних абонентів."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Поточне налаштування)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Змінити налаштування сповіщень у режимі \"Не турбувати\"?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Звуки робочого профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Звуки особистого профілю"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Виберіть цей параметр, щоб використовувати ті самі звуки, що й в особистому профілі"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Після розблокування відкриється останній екран. На заблокованому екрані не буде сповіщень. Щоб переглянути їх, проведіть пальцем униз від верху."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокований екран, екран блокування, пропустити, обходити"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Коли робочий профіль заблоковано"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Мінімізація сповіщень на заблокованому екрані"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Показувати менше сповіщень на заблокованому екрані"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Показувати лише нові сповіщення на заблокованому екрані"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Автоматично видаляти переглянуті сповіщення із заблокованого екрана"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Сповіщення на заблокованому екрані"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Показувати розмови й сповіщення (за умовчанням і беззвучні)"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Показувати розмови й сповіщення (за умовчанням і беззвучні)"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Показувати весь вміст робочих сповіщень"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ховати конфіденційний робочий вміст"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Як показувати сповіщення профілю, коли пристрій заблоковано?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Якщо ви отримаєте багато повідомлень за короткий проміжок часу, пристрій знизить гучність і зменшить кількість сповіщень на період до 2 хвилин. Звук дзвінків, будильників і сповіщень щодо важливих розмов не зміниться. \n\nСповіщення, отримані протягом цього періоду, можна буде переглянути, пpовівши пальцем униз від верхнього краю екрана."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Застосувати до робочих профілів"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Застосувати до додатків робочого профілю"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Згруповані сповіщення"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Увімкнено"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Вимкнено"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Використовувати групування сповіщень"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Сповіщення з подібними темами групуватимуться, і їх звук буде вимкнено, щоб ви менше відволікалися. У такому разі налаштування сповіщень, установлені в додатку, не діятимуть."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Допоміжні VR-сервіси"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установлені додатки не запитували доступу для роботи в режимі допоміжних VR-сервісів."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Надати VR-сервісу доступ до сервісу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"важливі розмови"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Не дозволено"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Немає}=1{1 чат}one{# чат}few{# чати}many{# чатів}other{# чату}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"Налаштування розмов"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хто може турбувати"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Навіть якщо сповіщення з додатків для обміну повідомленнями або дзвінків не надходитимуть, вибрані тут користувачі все одно зможуть зв’язуватися з вами через ці додатки"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дзвінки"</string>
@@ -3826,6 +3903,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Усі"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти із зірочками"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Налаштування контактів"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Налаштування контактів із зірочкою"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Не дозволено"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Не дозволено"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Будильник"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (робочий)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Обчислення…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Налаштування для додатків"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволити додаткам замінювати режим \"Не турбувати\""</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Додатки, які можуть переривати"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Створення режиму"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Спеціальний режим"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назва режиму"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Укажіть назву режиму"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Виберіть значок"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Події в календарі"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Програма \"Час спати\""</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"За кермом"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Сповіщення на весь екран"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Дозволити сповіщення на весь екран із цього додатка"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Цьому додатку буде дозволено показувати сповіщення на весь екран, коли пристрій заблоковано. Додатки можуть використовувати це налаштування, щоб показувати будильники, сповіщення про вхідні дзвінки або інші термінові сповіщення."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Записувати системні параметри"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Дозволити цьому додатку змінювати системні параметри від вашого імені"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Це налаштування дозволяє додатку змінювати основні системні параметри."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Додатки для керування медіафайлами"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Дозволити додатку керувати медіафайлами"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Якщо вибрати цей параметр, додаток зможе без вашого підтвердження змінювати чи видаляти медіафайли, створені в інших додатках. У додатка має бути дозвіл на доступ до файлів і медіафайлів."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Жести"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Швидко відкривати камеру"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Щоб швидко відкрити камеру, двічі натисніть кнопку живлення. Працює на будь-якому екрані."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Перемикання камери для селфі"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Режим навігації"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Обмін повідомленнями через супутник"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Обмінюйтеся текстовими повідомленнями через супутник. Цю функцію включено у ваш обліковий запис."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Обмінюйтеся текстовими повідомленнями через супутник. Цю функцію не включено у ваш обліковий запис."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Обмін повідомленнями через супутник"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Про обмін повідомленнями через супутник"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"За допомогою відповідного облікового запису <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ви можете обмінюватися текстовими повідомленнями через супутник"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Ваш план оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Послугу обміну повідомленнями через супутник включено у ваш обліковий запис"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Послугу обміну повідомленнями через супутник не включено у ваш обліковий запис"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Докладніше"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Як це працює"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ваш телефон автоматично підключатиметься до супутника. Для кращого зв’язку вийдіть на відкрите місце (без накриття)."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Коли телефон підключиться до супутника"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Ви можете надсилати текстові повідомлення будь-кому, зокрема службам екстреної допомоги. Телефон знову підключиться до мобільної мережі, коли вона стане доступною."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Обмін повідомленнями через супутник може тривати довше, і ця функція доступна лише в деяких регіонах. На з’єднання із супутником можуть впливати погодні умови й деякі будівлі. Дзвінки через супутник недоступні. Можуть підтримуватися екстрені виклики.\n\nПотрібен деякий час, щоб зміни у вашому обліковому записі відобразилися в налаштуваннях. Щоб дізнатися більше, зверніться до свого оператора мобільного зв’язку."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Докладніше про обмін повідомленнями через супутник"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Не вдається ввімкнути <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Щоб увімкнути <xliff:g id="FUNCTION">%1$s</xliff:g>, спершу відключіть супутниковий зв’язок"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Супутниковий зв’язок"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Точки доступу"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно, коли підключено до оператора <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ви працюєте в режимі, що не залежить від розміру сторінки, з ядром для сторінок 16 КБ. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернутися у виробничий режим, вам потрібно знову перейти в режим 4 КБ й заблокувати завантажувач операційної системи пристрою. Тоді налаштування пристрою знову буде скинуто й відновляться виробничі налаштування. Коли ОС Android завантажиться на пристрій, вимкніть розблокування завантажувача в параметрах розробника. Якщо ОС Android не завантажується на пристрій або працює нестабільно, відновіть на пристрої останні заводські образи (завантаживши їх звідси: &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;) або перейдіть на сторінку &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; і виберіть \"Очистити пристрій\", \"Заблокувати завантажувач операційної системи\" й \"Примусово оновити всі розділи\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим, незалежний від розміру сторінок, з ядром для сторінок 16 КБ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Докладніше"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Запускати додаток у режимі сумісності з розміром сторінки"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Обробник звітів про помилки"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Визначає, який додаток викликається ярликом звіту про помилку на пристрої."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Особисті додатки"</string>
@@ -5435,7 +5587,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Слухати потокове аудіо"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Відскануйте QR-код потокового аудіо, щоб слухати на пристрої <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Неможливо змінити пароль під час надсилання. Щоб змінити пароль, спершу вимкніть надсилання аудіо."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Пароль має містити від 4 до 16 символів і включати лише літери, цифри й символи"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Сканер QR-коду"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Потрібна допомога?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Шукати в налаштуваннях"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, пам’ять, обліковий запис"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Пам’ять контактів"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Лише на пристрої"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Нові контакти не синхронізуватимуться з обліковим записом"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакти будуть зберігатися на пристрої і за умовчанням синхронізуватися з обліковим записом"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Не вдалося налаштувати обліковий запис за умовчанням"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Немає облікового запису за умовчанням"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Лише на пристрої"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Пристрій і %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Щоб почати, додайте обліковий запис"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Де зберігати контакти"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Обвести й знайти"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Натисніть і втримуйте кнопку головного екрана або маркер навігації, щоб здійснити пошук за вмістом на екрані."</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 45632753ab8..4fe0dfe80c1 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"برف کا گولا"</item>
     <item msgid="7952183800501346803">"ساحل کی چھتری"</item>
     <item msgid="799139025758265891">"ورکشاپ ٹولز"</item>
-    <item msgid="1330084588359129896">"خیمہ"</item>
+    <item msgid="8112685757657659269">"پیانو"</item>
     <item msgid="3861584909935022342">"فلم ریل"</item>
     <item msgid="5827426100157335512">"کتاب"</item>
     <item msgid="8585828346253128384">"کنول کا پھول"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 212812adeea..e1bc587bbe2 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوٹوتھ"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"خودکار طور پر کل آن کریں"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"اگر آپ بلوٹوتھ آف کرتے ہیں تو یہ اگلے دن دوبارہ آن ہو جاتا ہے"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"دائیں کان کا جوڑا بنائیں"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"بائیں کان کا جوڑا بنائیں"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"اپنے دوسرے کان کا جوڑا بنائیں"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"‏بلوٹوتھ LE آڈیو غیر فعال کریں"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"‏اگر آلہ LE آڈیو ہارڈویئر کی صلاحیتوں کو سپورٹ کرتا ہے تو یہ بلوٹوتھ LE آڈیو خصوصیت کو غیر فعال کر دے گا۔"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"‏بلوٹوتھ LE آڈیو وضع"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"‏بلوٹوتھ LE آڈیو براڈ کاسٹ UI پیش منظر کو فعال کریں"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"‏ذاتی آڈیو کا اشتراک اور نجی براڈ کاسٹ سمیت LE آڈیو کا اشتراک UI پیش منظر کو فعال کرتا ہے"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"‏آلے کی تفصیلات میں LE آڈیو ٹوگل کریں دکھائیں"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"‏بلوٹوتھ LE آڈیو کی اجازت یافتہ فہرست کو بائی پاس کریں"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"‏اجازت یافتہ کی فہرست کے معیار کو پورا کرنے کے لیے LE آڈیو پیریفرل کی تصدیق کے نہ ہونے کے باوجود LE آڈیو کو بطور ڈیفالٹ استعمال کریں۔"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"ایپ کی زبان"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"تجویز کردہ زبانیں"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"سبھی زبانیں"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"تجویز کردہ"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"تمام زبانیں"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"تمام علاقے"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"نمبرنگ کے تمام سسٹمز"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"سسٹم کی زبان"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"سسٹم ڈیفالٹ"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"اس ایپ کے لیے زبان کا انتخاب ترتیبات سے دستیاب نہیں ہے۔"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"تبدیل کریں"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"‏%s دستیاب نہیں ہے"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"اس زبان کو سسٹم کی زبان کے طور پر استعمال نہیں کیا جا سکتا ہے، لیکن آپ نے ایپس اور ویب سائٹ کو بتایا ہوا ہے کہ آپ اس زبان کو ترجیح دیتے ہیں۔"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"تلاش"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"ایک زبان شامل کریں"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"علاقہ کی ترجیح"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"زبان کا نام ٹائپ کریں"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"زبان کی مزید ترتیبات"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"علاقائی ترجیحات"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"یونٹس اور نمبر کی ترجیحات سیٹ کریں"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"ایپس کو اپنی علاقائی ترجیحات کو جاننے کی اجازت دیں تاکہ وہ آپ کے تجربے کو ذاتی نوعیت کا بنا سکیں۔"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"جہاں ممکن ہو وہاں ایپس آپ کی علاقائی ترجیحات کا استعمال کریں گی۔"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"علاقائی ترجیحات"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"درجہ حرارت"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"ہفتے کا پہلا دن"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"نمبرز کی ترجیحات"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"رومنگ کے وقت ڈیٹا سروسز سے مربوط ہوں"</string>
     <string name="roaming_disable" msgid="729512894708689604">"رومنگ کے وقت ڈیٹا سروسز سے مربوط ہوں"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"رومنگ چارجز لاگو ہو سکتے ہیں۔"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"خودکار طور پر وقت سیٹ کریں"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"خودکار طور پر سیٹ کریں"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"اس ٹوگل کے آن ہونے پر مقام کا استعمال ٹائم زون کو سیٹ کرنے کے لیے کیا جائے گا"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"خودکار تاریخ اور وقت"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"اپنے نیٹ ورک اور وائرلیس سگنلز کا استعمال کرتے ہوئے خود بخود سیٹ کریں"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"خودکار ٹائم زون"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"اپنے قریب کے موبائل نیٹ ورکس کی بنیاد پر خود بخود سیٹ کریں"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"دستیاب ہونے پر اپنے آلہ کا مقام استعمال کر کے خودکار طور پر سیٹ کریں"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"مقامی ڈیفالٹ کا استعمال کریں"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 گھنٹے کا فارمیٹ استعمال کریں"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"وقت"</string>
@@ -361,7 +376,7 @@
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"اپنے فون کو غیر مقفل کرنے کے لیے فیس اَنلاک کا استعمال کریں"</string>
     <string name="security_settings_fingerprint" msgid="6387775386189204201">"فنگر پرنٹ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"فنگر پرنٹ"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"فنگر پرنٹ انلاک استعمال کرنے پر"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"فنگر پرنٹ اَن لاک استعمال کرنے پر"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"کام کیلئے فنگر پرنٹ"</string>
     <string name="fingerprint_add_title" msgid="1837610443487902050">"فنگر پرنٹ شامل کریں"</string>
     <string name="security_settings_fingerprint_preference_summary" msgid="8486134175759676037">"{count,plural, =1{فنگر پرنٹ کو شامل کیا گیا}other{# فنگر پرنٹس کو شامل کیا گیا}}"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"انگلی اٹھائیں اور سنسر کو دوبارہ ٹچ کریں"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"فنگر پرنٹ سینسر کا استعمال نہیں کر سکتے"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"ایک مرمت فراہم کنندہ کو ملاحظہ کریں۔"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"اسکرین آف ہونے پر فنگر پرنٹ اَن لاک کا استعمال کریں"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"اسکرین آف ہونے پر بھی فنگر پرنٹ اَن لاک کا استعمال کریں"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"اسکرین آف ہونے پر غیر مقفل کریں"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"مزید سیکیورٹی کی ترتیبات"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"دفتری پروفائل لاک، مرموز کاری اور مزید"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"مرموز کاری، اسنادات اور مزید"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"اپنی پرائیویٹ اسپیس کے لیے پیٹرن سیٹ کریں"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"مقفل کرنا"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"پوشیدہ کرنا"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"اپنے پرائیویٹ اسپیس پیٹرن کی تصدیق کریں"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"‏اپنے پرائیویٹ اسپیس PIN کو دوبارہ درج کریں"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"اپنے پرائیویٹ اسپیس پاس ورڈ کو دوبارہ درج کریں"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"آپ <xliff:g id="COUNT">%d</xliff:g> فنگر پرنٹس شامل کر سکتے ہیں"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"آپ فنگر پرنٹس کی زیادہ سے زیادہ تعداد شامل کر چکے ہیں"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"مزید فنگر پرنٹس شامل نہیں کر سکتے"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"آن ہے"</string>
     <string name="external_display_off" msgid="5634413756025351374">"آف ہے"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"بیرونی ڈسپلے"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"پہلے سے شامل ڈسپلے"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"بیرونی ڈسپلے استعمال کریں"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"ڈسپلے ریزولیوشن"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"بیرونی ڈسپلے غیر منسلک ہے"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"روٹیشن یا ریزولیوشن تبدیل کرنے سے کوئی بھی ایسی ایپس بند ہو سکتی ہیں جو فی الحال چل رہی ہیں"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"آپ کی اسکرین کو کسی بیرونی ڈسپلے پر دکھانے کے لئے آپ کے آلے کا اس سے منسلک ہونا ضروری ہے"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"مزید اختیارات"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"ڈسپلیز کو دوبارہ ترتیب دینے کے لیے دبائیں اور گھسیٹیں۔"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"کاسٹ کریں"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"مرر"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"وائرلیس ڈسپلے فعال کریں"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"پاس ورڈ چیک کریں اور دبارہ کوشش کریں"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"آلہ کے مینوفیکچرر سے رابطہ کریں"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"کنکشن چیک کریں اور دوبارہ کوشش کریں"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"‏یہ Wi-Fi نیٹ ورک ابھی دستیاب نہیں ہے"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"‏اس QR کوڈ کے ساتھ کوئی مسئلہ ہے۔ دوسرے طریقے سے منسلک ہونے کی کوشش کریں۔"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"نیٹ ورک منتخب کریں"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"اپنے آلہ کو منسلک کرنے کے لیے نیٹ ورک منتخب کریں"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"کیا اس آلہ کو \"<xliff:g id="SSID">%1$s</xliff:g>\" سے منسلک کریں؟"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"\'خودکار طور پر گھمائیں\' کے بارے میں مزید جانیں"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"اسکرین ریزولیوشن"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"اعلی ریزولیوشن"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"مکمل ریزولیوشن"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"مکمل ریزولیوشن آپ کی زیادہ بیٹری کا استعمال کرتا ہے۔ آپ کی ریزولیوشن پر سوئچ کرنے سے کچھ ایپس ری سٹارٹ ہو سکتی ہیں۔"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"زیادہ سے زیادہ ریزولیوشن"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"زیادہ سے زیادہ ریزولیوشن آپ کی زیادہ بیٹری کا استعمال کرتا ہے۔ آپ کی ریزولیوشن پر سوئچ کرنے سے کچھ ایپس ری سٹارٹ ہو سکتی ہیں۔"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"منتخب کردہ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"قدرتی"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"تغیر پذیر"</string>
     <string name="brightness" msgid="6216871641021779698">"چمک کی سطح"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"تغیر پذیر چمک"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"تغیر پذیر چمک کے بارے میں"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"آپ کی اسکرین کی چمک خودکار طور پر آپ کے ماحول اور سرگرمیوں کے مطابق ہو جائے گی۔ آپ نئی ترجیحات جاننے میں تغیر پذیر چمک کی مدد کرنے کے لئے سلائیڈر کو دستی طور پر حرکت دے سکتے ہیں۔"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"آن"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"آف"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"بیڈ ٹائم وضع کی ترتیبات"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{موڈز گہری تھیم کو بھی فعال کر سکتے ہیں}=1{{mode_1} گہری تھیم کو بھی فعال کرتا ہے}=2{{mode_1} اور {mode_2} گہری تھیم کو بھی فعال کرتے ہیں}=3{{mode_1}، {mode_2} اور {mode_3} گہری تھیم کو بھی فعال کرتے ہیں}other{{mode_1}، {mode_2} اور # مزید گہری تھیم کو بھی فعال کرتے ہیں}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"موڈز کی ترتیبات"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"اور زیادہ مدھم"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"اضافی دھندلا"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"آلہ کو معمول سے مدھم ہونے دیں"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"اسکرین ٹائم آؤٹ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"مقام کی سروسز"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"مقام کی سروسز"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"مقام استعمال کریں"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"ٹائم زون کے لیے مقام کا استعمال کریں"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"خودکار طور پر ٹائم زون سیٹ نہیں کیا جا سکتا"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"مقام یا مقام کی سروسز آف ہیں"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"مقام کی ترتیبات"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"اسے درست کریں"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"منسوخ کریں"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"خودکار ٹائم زون آف ہے"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"خودکار ٹائم زون آف ہونے پر دستیاب نہیں ہے"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"مقام کو ٹائم زون سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"اگر آپ کے آلے کا مقام دستیاب ہے تو اسے آپ کا ٹائم زون سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"قانونی معلومات، اسٹیٹس، سافٹ ویئر ورژن دیکھیں"</string>
     <string name="legal_information" msgid="7509900979811934843">"قانونی معلومات"</string>
     <string name="manual" msgid="3651593989906084868">"مینوئل"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"اختیارات"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ایکسیسبیلٹی"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"فزیکل کی بورڈ"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"باؤنس کلیدیں"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"‏کی بورڈ ‎<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms‎ کے اندر ایک ہی کلید کو فوری طور پر بار بار دبائے جانے کو نظر انداز کرتا ہے"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"کی بورڈ ایک ہی کلید کے بار بار فوری طور پر دبانے کو نظر انداز کرتا ہے"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"باؤنس کلید کی حد"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"کی بورڈ کے بار بار کلید کو دبانے کو نظر انداز کرنے کے وقت کا انتخاب کریں"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 سیکنڈ"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 سیکنڈ"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 سیکنڈ"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"حسب ضرورت"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"مخصوص قدر"</string>
     <string name="slow_keys" msgid="2891452895499690837">"سلو کلیدیں"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"‏کسی کلید کے دبانے پر اس کے فعال ہونے میں لگنے والے وقت کو ‎<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms‎ میں ایڈجسٹ کرتا ہے"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"کلید دبانے کو فعال کرنے میں لگنے والے وقت کو ایڈجسٹ کرتا ہے"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"دبی رہنے والی کلیدیں"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"کلیدوں کو ایک ساتھ نیچے کی طرف پکڑے رکھنے کے بجائے، شارٹ کٹس کیلئے ایک وقت میں ایک کلید دبائیں"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ماؤس کیز"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"ماؤس کو کنٹرول کرنے کے لیے فزیکل کی بورڈ کا استعمال کریں۔"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"ماؤس کیز کا استعمال کریں"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"پوائنٹر کو کنٹرول کرنے کے لیے اپنا کی بورڈ استعمال کریں"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ماؤس کی معکوس اسکرولنگ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"صفحہ کو نیچے منتقل کرنے کے لیے اوپر اسکرول کریں"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"بائیں اور دائیں بٹنز کو سویپ کریں"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"بائیں ماؤس کے بٹن کو اپنے دائیں کے طور پر استعمال کریں"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"‫<xliff:g id="KEYBOARD_NAME">%s</xliff:g> کیلئے ماؤس کیز"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"ماؤس پوائنٹر منتقل کرنے کے لیے <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> کیز کا استعمال کریں"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"بنیادی ماؤس بٹن پر کلک کرنے کے لیے <xliff:g id="CLICK_LABEL">%s</xliff:g> کی کا استعمال کریں"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"بنیادی ماؤس بٹن چھونے اور دبائے رکھنے کے لیے <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> کی استعمال کریں"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"بنیادی ماؤس بٹن ریلیز کرنے کے لیے <xliff:g id="RELEASE_LABEL">%s</xliff:g> کی استعمال کریں"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"اسکرول موڈ کو ٹوگل کرنے کے لیے <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> کی استعمال کریں۔ اس سے <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> کیز منظر کو اوپر، نیچے، دائیں یا بائیں اسکرول کریں گی"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"ثانوی ماؤس بٹن پر کلک کرنے کے لیے <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> کی استعمال کریں"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"کی بورڈ شارٹ کٹس"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"شارٹ کٹس کی فہرست دکھائیں"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"دفتری پروفائل کے کی بورڈز اور ٹولز"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"ڈیفالٹ"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"ٹچ پیڈ"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"ٹچ پیڈ اور ماؤس"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"ماؤس"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"پوائنٹر، رفتار، اشارے"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"کلک کرنے کیلئے تھپتھپائیں"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"ٹیپ کر کے گھسیٹنا"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"نیچے دایاں کلک کرنا"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"مزید اختیارات کے لیے ٹچ پیڈ کے نیچے بائیں کونے پر کلک کریں"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"پوائنٹر کی رفتار"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"تین انگلیوں سے تھپتھپائیں"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"پوائنٹر کا رنگ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"پوائنٹر فِل اسٹائل کو سیاہ میں بدلیں"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"پوائنٹر فِل اسٹائل کو سبز میں بدلیں"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"ٹچ پیڈ کے اشاروں کو جانیں"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ٹریک پیڈ، ٹریک پیڈ، ماؤس، کرسر، اسکرول، سوائپ، دائیں کلک، کلک، پوائنٹر"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"دائیں کلک کریں، تھپتھپائیں"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"درمیان میں کلک کریں"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"اسسٹنٹ لانچ کریں"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"ہوم پر جائیں"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"واپس جائیں"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"حالیہ ایپس دیکھیں"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"گھر جائیں"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"اپنے ٹچ پیڈ پر کہیں بھی تین انگلیوں سے اوپر کی طرف سوائپ کریں"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"واپس جائیں"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"‫<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> کے لیے نئی کلید منتخب کریں:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"فزیکل کی بورڈ ایکسیسبیلٹی"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"دبی رہنے والی کلیدیں، باؤنس کلیدیں، ماؤس کلیدیں"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"تکرار کی کلیدیں"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"دہرانے سے پہلے تاخیر"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"تکرار کی شرح"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"اس کے کردار کو دہرانے کے لیے کلید کے ریلیز ہونے تک کلید کو دبائے رکھیں"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> لے آؤٹ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ڈیفالٹ"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"خودکار: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"پیش منظر دیکھیں"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"معیاری اختیارات"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"زبان"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"ٹیکسٹ کا سائز"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"کیپشن کا سائز"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"کیپشن کا طرز"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"حسب ضرورت اختیارات"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"پس منظر کا رنگ"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"پاور کا استعمال ایڈجسٹ کریں"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"شامل کردہ پیکیجز"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"ایپس حسب معمول چل رہی ہیں"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"بیٹری کی تبدیلی کی تجویز کی گئی ہے"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"بیٹری کی گنجائش اور چارجنگ کی کارکردگی کم ہو گئی ہے اور بیٹری کی تبدیلی کی تجویز کی جاتی ہے۔"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"بیٹری لیول کم ہے"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"بیٹری لائف کو بڑھانے کے لیے بیٹری سیور آن کریں"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"بیٹری لائف کو بہتر بنائیں"</string>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏اس VPN سے غیر منسلک کریں؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"غیر منسلک کریں"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ورژن"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"ورژن <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"‏VPN بھول جائیں"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏موجودہ VPN بدلیں؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏ہمیشہ آن VPN سیٹ کریں؟"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"ہفتے کے دن صبح 9 بجے سے شام 5 بجے تک\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"کیلنڈر ایونٹس"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} فعال ہے}=2{{mode_1} اور {mode_2} فعال ہیں}=3{{mode_1}، {mode_2} اور {mode_3} فعال ہیں}other{{mode_1}، {mode_2} اور # مزید فعال ہیں}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{‫1 موڈ خودکار طور پر آن ہو سکتا ہے}other{‫# موڈز خودکار طور پر آن ہو سکتے ہیں}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{ڈسٹرب نہ کریں}=1{{mode_1}}=2{{mode_1}، {mode_2}}other{{mode_1}، {mode_2}، {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"آن ہے"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"سیٹ نہیں ہے"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"غیر فعال ہے"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"سمجھ آ گئی"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"اطلاعات"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"مدت"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"پیغامات، ایونٹس اور یاد دہانیاں"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، سوائے ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"ہو گیا"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ترتیبات"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"اطلاعات کی کوئی ویزوئل یا آواز نہیں"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"اطلاعات کی کوئی آواز نہیں"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"آپ کو ستارے کے نشان والے رابطوں اور بار بار کال کرنے والے مجاز لوگوں کی طرف سے اطلاعات، کالز نظر نہیں آئیں گی یا سنائی نہيں دیں گی۔"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(موجودہ ترتیب)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\'ڈسٹرب نہ کریں\' کی اطلاع کی ترتیبات کو تبدیل کریں؟"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"دفتری پروفائل کی آوازیں"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ذاتی پروفائل کی آوازیں استعمال کریں"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"اپنی ذاتی پروفائل کی طرح ہی آوازوں کا استعمال کریں"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"غیر مقفل کرنے کے بعد، براہ راست آخری بار استعمال کردہ اسکرین پر جائیں۔ اطلاعات لاک اسکرین پر نہیں دکھائی دیں گی۔ انہیں دیکھنے کیلئے اوپر سے نیچے سوائپ کریں۔"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"مقفل اسکرین، لاک اسکرین، نظر انداز کریں، بائی پاس کریں"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"دفتری پروفائل مقفل ہونے پر"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"مقفل اسکرین پر کم اطلاع دکھانے کا اختیار"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"مقفل اسکرین پر کم اطلاعات دکھائیں"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"مقفل اسکرین پر صرف نئی اطلاعات دکھائیں"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"مقفل اسکرین سے گزشتہ طور پر دیکھی گئی اطلاعات کو خودکار طور پر ہٹا دیں"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"لاک اسکرین پر اطلاعات"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"گفتگوئیں، ڈیفالٹ اور خاموش دکھائیں"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"گفتگوئیں، ڈیفالٹ اور خاموش دکھائیں"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"تمام دفتری اطلاعی مواد دکھائیں"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"دفتر کا حساس مواد چھپائیں"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"اپنا آلہ مقفل ہونے پر آپ پروفائل کی اطلاعات کیسے دیکھنا چاہیں گے؟"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"جب آپ کو تھوڑے وقت میں بہت ساری اطلاعات موصول ہوتی ہیں تو آپ کا آلہ اس کا والیوم کم کر دے گا اور 2 منٹ تک الرٹس کو کم کر دے گا۔ کالز، الارم، اور ترجیحی گفتگوئیں متاثر نہیں ہوتی ہیں۔ \n\nکول ڈاؤن کے دوران موصول ہونے والی اطلاعات، اسکرین کے اوپر سے نیچے کی طرف سوائپ کر کے حاصل کی جا سکتی ہیں۔"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"دفتری پروفائلز پر لاگو کریں"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"دفتری پروفائل ایپس پر لاگو کریں"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"بنڈل کردہ اطلاعات"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"آن"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"آف"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"اطلاع کی بنڈلنگ استعمال کریں"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"ملتی جلتی تھیمز والی اطلاعات کو خاموش کر دیا جائے گا اور ایک خاموش تجربے کے لیے ایک ساتھ گروپ بندی کی جائے گی۔ بنڈلنگ ایپ کی اپنی اطلاع کی ترتیبات کو اوور رائیڈ کر دے گی۔"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏VR مددگار سروسز"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏کسی انسٹال کردہ ایپ نے VR مددگار سروسز کے طور پر چلائے جانے کی درخواست نہیں کی ہے۔"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏<xliff:g id="SERVICE">%1$s</xliff:g> کیلئے VR سروس کی رسائی کی اجازت دیں؟"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"ترجیحی گفتگوئیں"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"کوئی نہیں"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{کوئی نہیں}=1{1 گفتگو}other{# گفتگوئیں}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"گفتگوؤوں کی ترتیبات"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"کون رکاوٹ ڈال سکتا ہے"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"اگرچہ پیغام رسانی یا کالنگ ایپس آپ کو اطلاع نہیں دے سکتیں اس کے باوجود بھی آپ کے منتخب کردہ لوگ یہاں ان ایپس کے ذریعے آپ سے رابطہ کر سکتے ہیں"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"کالز"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"کوئی بھی"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"رابطے"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ستارہ کا نشان لگے ہوئے رابطے"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"رابطے کی ترتیبات"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"ستارہ لگے ہوئے رابطوں کی ترتیبات"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"کوئی نہیں"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"کوئی نہیں"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"الارمز"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (دفتری)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"حساب لگایا جا رہا ہے…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"اپپ کی ترتیبات"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"<xliff:g id="NUMBER">%d</xliff:g>+"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ایپس کو اوور رائیڈ کرنے کی اجازت دیں"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ایپس جو مداخلت کر سکتی ہیں"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"موڈ تخلیق کریں"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"حسب ضرورت موڈ"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"موڈ کا نام"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"موڈ نام خالی نہیں رہ سکتا"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"ایک آئیکن منتخب کریں"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"کیلنڈر ایونٹس"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"بیڈ ٹائم روٹین"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"ڈرائیونگ کے دوران"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"پوری اسکرین کی اطلاعات"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"اس ایپ سے پوری اسکرین کی اطلاعات کی اجازت دیں"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"اس ایپ کو وہ اطلاعات دکھانے کی اجازت دیں جو آلے کے مقفل ہونے پر پوری اسکرین پر ظاہر ہوتی ہیں۔ ایپس ان کا استعمال الارمز، اِن کمنگ کالز یا دیگر فوری اطلاعات کو نمایاں کرنے کے لیے کر سکتی ہیں۔"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"سسٹم کی ترجیحات لکھیں"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"اس ایپ کو اپنی طرف سے سسٹم کی ترجیحات میں ترمیم کرنے کی اجازت دیں"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"اس اجازت سے ایک ایپ کو بنیادی سسٹم کی ترجیحات میں ترمیم کرنے کی اجازت ملتی ہے۔"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"میڈیا کے نظم و نسق کی ایپس"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"ایپ کو میڈیا کا نظم کرنے کی اجازت دیں"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"اجازت دینے پر یہ ایپ آپ سے پوچھے بغیر دیگر ایپس کے ساتھ تخلیق کردہ میڈیا فائلز میں ترمیم یا انہیں حذف کر سکتی ہے۔ ایپ کو فائلز اور میڈیا تک رسائی حاصل کرنے کی اجازت ہونی ضروری ہے۔"</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"اشارے"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"فوری طور پر کیمرا کھولیں"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"کیمرہ کو تیزی سے کھولنے کیلئے، پاور بٹن کو دوبار دبائیں۔ کسی بھی اسکرین سے ہو جاتا ہے۔"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"سیلفی کے لیے کیمرا پلٹیں"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"نیویگیشن وضع"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"سٹلائٹ پیغام رسانی"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"سیٹلائٹ کے ذریعے ٹیکسٹ پیغامات بھیجیں اور موصول کریں۔ آپ کے اکاؤنٹ میں شامل ہے۔"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"سیٹلائٹ کے ذریعے ٹیکسٹ پیغامات بھیجیں اور موصول کریں۔ آپ کے اکاؤنٹ میں شامل نہیں ہے۔"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"سٹلائٹ پیغام رسانی"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"سیٹلائٹ پیغام رسانی کے بارے میں"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"سیٹلائٹ پیغام رسانی، سیٹلائٹ کنیکٹیوٹی"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"‫<xliff:g id="SUBJECT">%1$s</xliff:g> کے بارے میں"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"آپ ایک اہل <xliff:g id="CARRIER_NAME">%1$s</xliff:g> اکاؤنٹ کے حصے کے طور پر سیٹلائٹ کے ذریعے ٹیکسٹ پیغامات بھیج اور موصول کر سکتے ہیں۔"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"آپ کا <xliff:g id="CARRIER_NAME">%1$s</xliff:g> پلان"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"سیٹلائٹ پیغام رسانی آپ کے اکاؤنٹ کے ساتھ شامل ہے"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"پیغام رسانی آپ کے اکاؤنٹ میں شامل ہے"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"سیٹلائٹ پیغام رسانی آپ کے اکاؤنٹ میں شامل نہیں ہے"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"مزید جانیں"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"اس کے کام کرنے کا طریقہ"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"آپ کا فون سیٹلائٹ سے خودکار طور پر منسلک ہو جائے گا۔ بہترین کنکشن کے لیے، ایسی جگہ رہیں جہاں آسمان صاف نظر آ رہا ہو۔"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"آپ کا فون سیٹلائٹ سے منسلک ہونے کے بعد"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"آپ ایمرجنسی سروسز سمیت کسی کو بھی ٹیکسٹ پیغام بھیج سکتے ہیں۔ دستیاب ہونے پر آپ کا فون موبائل نیٹ ورک سے دوبارہ منسلک ہو جائے گا۔"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"سیٹلائٹ پیغام رسانی میں زیادہ وقت لگ سکتا ہے اور یہ صرف کچھ علاقوں میں دستیاب ہے۔ موسم اور کچھ ساختیں آپ کے سیٹلائٹ کنکشن کو متاثر کر سکتی ہیں۔ سیٹلائٹ کالنگ دستیاب نہیں ہے۔ ایمرجنسی کالز اب بھی منسلک ہو سکتی ہیں۔\n\nاکاؤنٹ کی تبدیلیوں کو ترتیبات میں ظاہر ہونے میں کچھ وقت لگ سکتا ہے۔ تفاصیل کے لیے اپنے کیریئر سے رابطہ کریں۔"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"سیٹلائٹ پیغام رسانی کے بارے میں مزید"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"‫<xliff:g id="SUBJECT">%1$s</xliff:g> میں زیادہ وقت لگ سکتا ہے اور یہ صرف کچھ علاقوں میں دستیاب ہے۔ موسم اور کچھ ساختیں آپ کے سیٹلائٹ کنکشن کو متاثر کر سکتی ہیں۔ سیٹلائٹ کالنگ دستیاب نہیں ہے۔ ایمرجنسی کالز اب بھی منسلک ہو سکتی ہیں۔\n\nاکاؤنٹ کی تبدیلیوں کو ترتیبات میں ظاہر ہونے میں کچھ وقت لگ سکتا ہے۔ تفصیلات کے لیے <xliff:g id="CARRIER_NAME">%1$s</xliff:g> سے رابطہ کریں۔"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"‫<xliff:g id="SUBJECT">%1$s</xliff:g> کے بارے میں مزید"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> آن نہیں ہو سکتا"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> آن کرنے کے لیے، پہلے سیٹلائٹ کنکشن ختم کریں"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"سیٹلائٹ کنیکٹوٹی"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"سیٹلائٹ کنیکٹوٹی"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"سیٹلائٹ کنیکٹوٹی"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"سیٹلائٹ پیغام رسانی"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"ڈیٹا کا استعمال آپ کے اکاؤنٹ میں شامل ہے"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"‏سیٹلائٹ SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"‏جب آپ موبائل یا Wi-Fi نیٹ ورک سے منسلک نہیں ہو پا رہے ہوں تو ایمرجنسی سروسز کے ساتھ پیغام بھیجیں"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"‏سیٹلائٹ sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"‏سیٹلائٹ SOS کے بارے میں"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"‏جب آپ موبائل یا Wi-Fi نیٹ ورک سے منسلک نہیں ہو پا رہے ہوں تو آپ ایمرجنسی سروسز کے ساتھ پیغام بھیج سکتے ہیں اور اپنے مقام کا اشتراک کر سکتے ہیں۔ ہو سکتا ہے یہ سروس ہر وقت ہر جگہ یا حالات میں دستیاب نہ ہو۔"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"ایمرجنسی سروسز کو کال کریں یا ٹیکسٹ پیغام بھیجیں"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"ایمرجنسی کے بارے میں سوالات کے جوابات دیں"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"سیٹلائٹ سے منسلک کرنے کے لیے اقدامات پر عمل کریں"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"‏اگر آپ کے پاس موبائل نیٹ ورک نہیں ہے تو، آپ کو سیٹلائٹ SOS استعمال کرنے کا اختیار نظر آئے گا"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"ایمرجنسی سروسز کو جوابات بھیجیں تاکہ آپ کو صحیح قسم کی مدد ملے"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"آپ کے منسلک ہونے کے بعد، آپ ایمرجنسی سروسز کے ساتھ پیغام بھیج سکتے ہیں"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"ایک ڈیمو آزمائیں"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"‏جب آپ سیٹلائٹ کے ذریعے ایمرجنسی سروسز سے منسلک ہوتے ہیں تو آپ کا نام، ای میل، فون نمبر، مقام، آلہ کی معلومات (IMEI، زبان، ماڈل، بیٹری کی سطح) اور ایمرجنسی رابطہ کی معلومات کا اشتراک ایمرجنسی سروسز اور سیٹلائٹ سروس فراہم کنندگان کے ساتھ کیا جاتا ہے۔ \n\nسیٹلائٹ SOS استعمال کرنے کے لیے، Google پیغامات آپ کی ڈیفالٹ SMS ایپ ہونی چاہیے۔ \n\nاگر خود کار نیٹ ورک کا انتخاب آف ہے تو یہ آن ہو جائے گا اور آپ کا آلہ خودکار طور پر کسی بھی نیٹ ورک سے منسلک ہو جائے گا۔"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"اشتراک کی ترجیحات"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"ایمرجنسی رابطے"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"‏آپ کا Google اکاؤنٹ"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"ایمرجنسی سروسز کے ساتھ اشتراک کی جانے والی معلومات کا جائزہ لیں اور انہیں اپ ڈیٹ کریں"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"رسائی کی جگہ کے نام"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"‏آپ صفحہ ایگنوسٹک موڈ کے 16KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کسی بھی ڈیٹا کو خطرہ لاحق ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اسلئے ہو سکتا ہے کہ کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو 4KB موڈ پر واپس جانا ہوگا اور پھر آلہ کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ یہ آلہ کو دوبارہ فیکٹری ری سیٹ کر دے گا اور اسے پروڈکشن ترتیبات پر بحال کر دے گا۔ آلے کے Android میں کامیابی کے ساتھ بوٹ ہونے کے بعد، ڈویلپر کے اختیارات میں OEM انلاکنگ کو غیر فعال کریں۔ اگر آلہ Android میں بوٹ ہونے میں ناکام ہو جاتا ہے یا غیر مستحکم ہو جاتا ہے، تو &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; سے تازہ ترین فیکٹری امیجز کے ساتھ آلہ کو دوبارہ فلیش کریں یا &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; استعمال کریں اور \'آلہ کو صاف کریں\'، \'بوٹ لوڈر کو مقفل کریں\' اور \'سبھی پارٹیشنز کو فورس فلیش کریں\' کو منتخب کریں۔"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"‏‫16KB صفحہ ایگنوسٹک موڈ"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"مزید پڑھیں"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"ایپ کو صفحہ کے سائز کے ساتھ موافقت رکھنے والے موڈ میں چلائیں"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"بگ رپورٹ کا ہینڈلر"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"آپ کے آلے پر کون سی ایپ بگ رپورٹ شارٹ کٹ ہینڈل کرتی اس کا تعین کرتی ہے۔"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"ذاتی"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"سلسلہ سنیں"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ سننے کے لئے آڈیو سلسلے کا QR کوڈ اسکین کریں"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"اشتراک کے دوران پاس ورڈ میں ترمیم نہیں کر سکتے۔ پاس ورڈ تبدیل کرنے کے لئے پہلے آڈیو کا اشتراک بند کریں۔"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"‏آپ کا پاس ورڈ ‎4-16 حروف پر مشتمل ہونا چاہیے اور صرف حروف، نمبرز اور علامتیں استعمال کرنا چاہیے"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"‏QR کوڈ اسکینر"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"مدد درکار ہے؟"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"ترتیبات تلاش کریں"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"رابطے، اسٹوریج، اکاؤنٹ"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"رابطوں کی اسٹوریج"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"صرف آلہ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"نئے رابطے کسی اکاؤنٹ کے ساتھ مطابقت پذیر نہیں ہوں گے"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"رابطے آپ کے آلے میں محفوظ کیے جائیں گے اور آپ کے اکاؤنٹ میں بطور ڈیفالٹ مطابقت پذیر ہوں گے"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ڈیفالٹ اکاؤنٹ کو ترتیب دینے میں خرابی"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"کوئی ڈیفالٹ سیٹ نہیں ہے"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"صرف آلہ"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏آلہ اور ‎%1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"شروع کرنے کیلئے ایک اکاؤنٹ شامل کریں"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"رابطوں کو کہاں محفوظ کرنا ہے"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"تلاش کرنے کیلئے دائرہ بنائیں"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"اپنی اسکرین پر موجود مواد کو استعمال کر کے تلاش کرنے کے لیے ہوم بٹن یا نیویگیشن ہینڈل کو ٹچ کریں اور دبائے رکھیں۔"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 728d75bb7e1..96f9ee15b19 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Qor parchasi"</item>
     <item msgid="7952183800501346803">"Sohil soyaboni"</item>
     <item msgid="799139025758265891">"Asbob-uskunalar"</item>
-    <item msgid="1330084588359129896">"Chodir"</item>
+    <item msgid="8112685757657659269">"Pianino"</item>
     <item msgid="3861584909935022342">"Plyonka ruloni"</item>
     <item msgid="5827426100157335512">"Kitob"</item>
     <item msgid="8585828346253128384">"Lotus guli"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index e445eecdc20..b4918207391 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Yangi qurilmani juftlash"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ertaga avtomatik yoqilsin"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Agar Bluetoothni oʻchirsangiz, u ertasi kuni yana yonadi"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Oʻng quloqni ulash"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Chap quloqni ulash"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Boshqa quloqni ulash"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Bluetooth LE Audioni faolsizlantirish"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Qurilmada LE audio apparatli taʼminoti boʻlsa, Bluetooth LE audio funksiyasi faolsizlantiriladi."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth LE Audio rejimi"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bluetooth LE Audio uzatish interfeysiga razm solishni yoqish"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Bluetooth LE Audio uzatish interfeysiga razm solish, jumladan, shaxsiy audio ulashuv va yopiq uzatish funksiyalarini yoqadi"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Qurilma axborotida LE audio tugmasi chiqsin"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bluetooth LE Audio ruxsat roʻyxatini chetlash"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"LE Audio aloqasidan birlamchi holatda foydalanish, hatto qurilmaning ruxsat olishga muvofiqligi tekshirilmagan boʻlsa ham."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Ilova tili"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Tavsiya etilgan tillar"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Barcha tillar"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Tavsiya etiladi"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Barcha tillar"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Barcha hududlar"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Barcha sanoqli tizimlar"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Tizim tili"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Tizim standarti"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Bu ilova uchun Sozlamalardan tilni tanlash imkonsiz"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Oʻzgartirish"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s mavjud emas"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bu tildan tizim tili sifatida foydalanib boʻlmaydi, lekin ilova va saytlar uchun bu tilni asosiy sifatida belgilash mumkin."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Qidiruv"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Til kiritish"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Hudud sozlamalari"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Til nomini kiriting"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Boshqa til sozlamalari"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Hududiy sozlamalar"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Birliklar va raqamlar sozlamalarini belgilash"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Ilovalar ushbu hududiy sozlamalardan moslashtirish uchun foydalanadi."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Ilovalar imkon qadar hududiy sozlamalaringizdan foydalanadi."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Hududiy sozlamalar"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Harorat"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Haftaning birinchi kuni"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Raqamlar sozlamalari"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Rouming vaqtida mobil internetga ulanish"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Rouming vaqtida mobil internetga ulanish"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Rouming uchun ortiqcha haq olinishi mumkin."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Vaqtni avtomatik sozlash"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Avtomatik aniqlansin"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Kalit yoqilganda, vaqt mintaqasi joylashuv maʼlumotlari asosida tanlanadi"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Avtomatik sana va vaqt"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Qurilmadagi tarmoq va simsiz signallar orqali avtomatik sozlash"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Avtomatik vaqt mintaqasi"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Atrofdagi mobil tarmoq asosida avtomatik sozlash"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Geo-joylashuv asosida avtomatik sozlash"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Birlamchi hududiy sozlamalar"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 soatlik format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vaqt"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Barmoqni olib, keyin yana skanerga tekkizing"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Barmoq izi skaneridan foydalanish imkonsiz"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Xizmat koʻrsatish markaziga murojaat qiling."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekran oʻchiqligida Barmoq izi bilan ochish"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Ekran oʻchiqligida ham Barmoq izi bilan ochish funksiyasidan foydalaning"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekranni oʻchirish, qulfdan chiqarish"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Boshqa xavfsizlik sozlamalari"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Ish profili qulfi, shifrlash va boshqalar"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Shifrlash, hisob maʼlumotlari va boshqalar"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Maxfiy joy uchun grafik kalit belgilash"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Qulflash"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Berkitish"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Maxfiy makon grafik kalitini tasdiqlang"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Maxfiy makon PIN kodini qayta kiriting"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Maxfiy makon parolini qayta kiriting"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Ko’pi bilan <xliff:g id="COUNT">%d</xliff:g> ta barmoq izi qo’shish mumkin"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Barmoq izlari maksimal miqdorda qo‘shildi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Boshqa barmoq izini qo‘shib bo‘lmaydi"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Yoniq"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Yoqilmagan"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Tashqi displey"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Ichki displey"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Tashqi displeydan foydalanish"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ekran aniqlik darajasi"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Tashqi displey uzildi"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Ekran holati yoki aniqlik darajasi oʻzgartirilsa, barcha faol ilovalar toʻxtatilishi mumkin"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Ekranni aks ettirish uchun qurilmangiz tashqi displeyga ulangan boʻlishi kerak"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Yana"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Displeylarni qayta tartiblash uchun ushlab torting."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Translatsiya"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"koʻzgu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Simsiz monitorni yoqish"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Parolni tekshiring va qaytadan urining"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Qurilma ishlab chiqaruvchisiga murojaat qiling"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Aloqani tekshiring va qaytadan urining"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Bu Wi‑Fi tarmoq hozir ishlamayapti"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Bu QR kod bilan muammo bor. Boshqa usulda ulaning."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Tarmoqni tanlash"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Qurilmangizni ulash uchun tarmoqni tanlang"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Bu qurilma ”<xliff:g id="SSID">%1$s</xliff:g>“ nomli tarmoqqa kiritilsinmi?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Avtomatik burilish haqida batafsil"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ekrandagi tasvir tiniqligi"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Yuqori tiniqlik"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Asl hajmida"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Asl hajmda koʻproq batareya quvvati sarflanadi. Tiniqlik almashtirilsa, ayrim ilovalar qayta ishga tushadi."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Maksimal aniqlik darajasi"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Maksimal aniqlik darajasi batareya quvvatini koʻproq sarflaydi. Tiniqlik almashtirilsa, ayrim ilovalar qayta ishga tushadi."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Tanlandi"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Ranglar"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tabiiy"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Moslashuvchan"</string>
     <string name="brightness" msgid="6216871641021779698">"Yorqinlik darajasi"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Moslashuvchan yorqinlik"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Adaptiv yorqinlik haqida"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekran yorqinligi muhit va harakatlaringizga qarab avtomatik moslanadi. Yorqinlikni o‘zingizga moslashtirish uchun slayderni qo‘lda surib sozlashingiz mumkin."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Yoniq"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Oʻchiq"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Uyqu vaqti rejimi sozlamalari"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Rejimlar ham tungi mavzuni faollashtiradi}=1{{mode_1} ham tungi mavzuni faollashtiradi}=2{{mode_1} va {mode_2} ham tungi mavzuni faollashtiradi}=3{{mode_1}, {mode_2} va {mode_3} ham tungi mavzuni faollashtiradi}other{{mode_1}, {mode_2} va yana # ta rejim ham tungi mavzuni faollashtiradi}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Rejimlar sozlamalari"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Yanada xira"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Juda xira"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Ekran yorqinligini odatdagidan xirlashtirishga ruxsat berish"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekranning kutish vaqti"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan keyin"</string>
@@ -1623,7 +1647,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Joylashuvni aniqlash xizmatlari"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Joylashuvni aniqlash xizmatlari"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Geolokatsiyani yoqish"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Joylashuv asosidagi vaqt mintaqasi"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Vaqt mintaqasi avtomatik sozlanmaydi"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"⁠Joylashuvni aniqlash xizmati oʻchiq"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Joylashuv sozlamalari"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Buni tuzatish"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Bekor qilish"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Avtomatik vaqt mintaqasi yoqilmagan"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Avtomatik vaqt mintaqasi yoqilmasa, ishlamaydi."</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Vaqt mintaqasini belgilash uchun joylashuvdan foydalanish mumkin"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Geo-joylashuv yoqilsa, qurilma axboroti asosida vaqt mintaqasi avtomatik sozlanishi mumkin"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Yuridik ma’lumotlar, holat, dasturiy ta’minot versiyasini ko‘rish"</string>
     <string name="legal_information" msgid="7509900979811934843">"Huquqiy axborot"</string>
     <string name="manual" msgid="3651593989906084868">"Qo‘llanma"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Variantlar"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Qulayliklar"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tashqi klaviatura"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"Jismoniy klaviatura terilmasini tanlagich"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Qayta bosishni nazorat qilish"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms ichida tugmalar takroriy bosilsa, eʼtiborsiz qoldiriladi"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviaturada bir tugmaning tez takroriy bosilishi inkor etiladi"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Takroriy bosishlar intervali"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klaviaturada tugmaning takroriy bosilishi qancha vaqt inkor etilishini tanlang"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Boshqa"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"boshqa qiymat"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Sekin tugmalar"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms dan keyin tugma bosilsa, qayd etiladi"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tugmani bosish intervali hamda uning amalini sozlash"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Yopishqoq tugmalar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Barcha tugmalar kombinatsiyasini bosib turish oʻrniga ularni birma-bir bosing"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Sinchqoncha tugmalari"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Sichqonchani tashqi klaviatura yordamida boshqarish."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Sichqoncha tugmalaridan foydalaning"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Kursorni klaviatura orqali boshqarish"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Sichqonchada teskari varaqlash"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sahifani pastga varaqlash uchun tepaga suring"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Chap va oʻng tugmalarni almashtirish"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sichqonchada chap tugmani oʻng tugma sifatida ishlatish"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"<xliff:g id="KEYBOARD_NAME">%s</xliff:g> uchun sichqoncha tugmalari"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Sichqoncha kursorini surish uchun <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> tugmalaridan foydalaning"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Asosiy sichqoncha tugmasini bosish uchun <xliff:g id="CLICK_LABEL">%s</xliff:g> tugmasidan foydalaning"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Asosiy sichqoncha tugmasini bosib turish uchun <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> tugmasidan foydalaning"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Asosiy sichqoncha tugmasini qoʻyib yuborish uchun <xliff:g id="RELEASE_LABEL">%s</xliff:g> tugmasidan foydalaning"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Varaqlash rejimini almashtirish uchun <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> tugmasidan foydalaning. Bunda <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> tugmalari tepaga, pastga, chapga yoki oʻngga varaqlanadi"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Qoʻshimcha sichqoncha tugmasini bosish uchun <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> tugmasidan foydalaning"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tezkor tugmalar"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tezkor tugmalar roʻyxatini ochish"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Ish profili klaviaturalari va vositalari"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Birlamchi"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Sensorli panel"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Sensorli panel va sichqoncha"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Sichqon"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Kursor tezligi, ishoralar"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Ohista teginib bosish"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Teginib tortish"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Pastki oʻng burchakka bosish"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Pastki oʻng burchakka bossangiz, boshqa variantlar ochiladi"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kursor tezligi"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Uch barmoq bilan bosishdan foydalanish"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Kursor rangi"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Kursor ichini qoraga boʻyash"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Kursor ichini yashilga boʻyash"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Sensorli panel ishoralari haqida"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"sensorli panel, sichqoncha, kursor, varaqlash, surish, oʻng klik, klik, koʻrsatkich"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"oʻng klik, bosish"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Oʻrta klik"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistentni ishga tushirish"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Boshiga"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Orqaga"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Oxirgi ilovalarni koʻrish"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Boshiga"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Sensorli panelning istalgan joyida uchta barmoq bilan tepaga suring"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Orqaga"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> uchun yangi tugma tanlang:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Jismoniy klaviatura uchun qulayliklar"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Yopishqoq tugmalar, qayta bosish boshqaruvi, sichqonchani boshqarish tugmalari"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Takrorlash tugmalari"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Takror kiritishdan oldin kechiktirish"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Takror kiritish tezligi"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Kalit chiqarilmaguncha uning belgisini takrorlash uchun tugmani bosib turing"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> sxemasi"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standart"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Avtomatik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Dastlabki ko‘rib chiqish"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart sozlamalar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Til"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Matn o‘lchami"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tagyozuv hajmi"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Taglavhalar uslubi"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Buyurtmali tanlamalar"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fon rangi"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Quvvatdan foydalanishni moslash"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Quyidagi paketlarni o‘z ichiga oladi"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Ilovalar odatdagidek ishlamoqda"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Batareyani almashtirish tavsiya etiladi"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Batareya sigʻimi va quvvatlash unumdorligi kamayadi hamda batareyani almashtirish tavsiya etiladi."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Batareya quvvati kam"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Batareya quvvatini tejash uchun Quvvat tejash funksiyasini yoqing"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Batareya quvvatini uzoqroq vaqtga yetkazing"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN bilan aloqa uzilsinmi?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Aloqani uzish"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Versiya <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNni o‘chirish"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mavjud VPN tarmog‘i almashtirilsinmi?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Doimiy VPN o‘rnatilsinmi?"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9:00 — 17:00 begim kunlari\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Taqvimdagi tadbirlar"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{{mode_1} faol}=2{{mode_1} va {mode_2} faol}=3{{mode_1}, {mode_2} va {mode_3} faol}other{{mode_1}, {mode_2} va # tasi faol}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 ta rejim avtomatik yoqilishi mumkin}other{# ta rejim avtomatik yoqilishi mumkin}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Bezovta qilinmasin}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"YONIQ"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Sozlanmagan"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Yoqilmagan"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Bildirishnomalar"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Davomiyligi"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Xabarlar, tadbirlar va eslatmalar"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Bezovta qilinmasin rejimida, yuqorida ruxsat berilganlardan tashqari, xabarlar, eslatmalar va tadbirlar tovushsiz qilinadi. Tanishlar, qarindoshlaringizdan SMS xabarlarni tovushli signal bilan qabul qila olishingiz uchun sozlamalarni tahrirlang."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Tayyor"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Sozlamalar"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Bildirishnomalarni butunlay taqiqlash"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Bildirishnomalar tovushsiz keladi"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Bildirishnomalar chiqmaydi yoki eshittirilmaydi. Yulduzchali kontaktlardan chaqiruvlar va qayta chaqiruvlarga ruxsat berilgan."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Joriy parametr)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Bezovta qilinmasin rejimining bildirishnomalar sozlamalari o‘zgartirilsinmi?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Ish profilidagi tovushlar"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Shaxsiy profil tovushlaridan foydalanish"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Shaxsiy profildagi bilan bir xil tovushlardan foydalanish"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Ochilganidan keyin eng oxirgi ishlatilgan ekranga kiring. Bildirishnomalar ekran qulfida chiqmaydi. Ularni koʻrish uchun yuqoridan pastga suring."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran qulfi, qulflash, tashlab ketish, aylanib oʻtish"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Ish profili qulfligida"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Ekran qulfidagi bildirishnoma minimalizmi"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Ekran qulfida kamroq bildirishnoma chiqsin"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Ekran qulfida faqat yangi bildirishnomalarni chiqarish"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Bloklangan ekrandan oldin ochilgan bildirishnomalarni avtomatik olib tashlash"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Ekran qulfida bildirishnomalar"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Suhbatlarni chiqarish, standart holatda, sokin"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Suhbatlarni chiqarish, standart holatda, sokin"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Ish bildirishnomalarini toʻliq chiqarish"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ish profili ma’lumotlari berkitilsin"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Qurilmangiz qulflanganda, profil bildirishnomalari qanday chiqsin?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profil bildirishnomalari"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Bildirishnomalar"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Ilovalar bildirishnomalari"</string>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Qisqa vaqt oraligʻida koʻp bildirishnoma kelsa, qurilmangizdagi tovush balandligi hamda signallar davomiyligi 2 daqiqagacha kamaytiriladi. Chaqiruvlar, signallar va muhim suhbatlarga taʼsir qilmaydi. \n\nSekinlatish paytida olingan bildirishnomalarni ekranning yuqori qismidan pastga tortish orqali topish mumkin."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Ish profillariga tatbiq qilish"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Ish profilidagi ilovalar uchun qoʻllash"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Guruhlangan bildirishnomalar"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Yoniq"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Yoqilmagan"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Bildirishnomalarni guruhlash"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Oʻxshash bildirishnomalar guruhlanadi va tovushsiz chiqadi. Bu bildirishnoma sozlamalari ilova sozlamalariga nisbatan ustun hisoblanadi."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Yordamchi VR xizmatlar"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hech qanday ilova yordamchi VR xizmatlar sifatida ishga tushirilishiga ruxsat so‘ramagan."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xizmatiga “<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatidan foydalanishga ruxsat berilsinmi?"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"muhim suhbatlar"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Suhbatlar sozlamalari"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Bezovta qilinmasin rejimi kimlarda ishlamaydi"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Xabar almashish yoki telefon qilish ilovalari sizni xabardor qilmasa ham, bu yerda tanlagan odamlar siz bilan oʻsha ilovalar orqali bogʻlana oladi."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chaqiruvlar"</string>
@@ -3826,6 +3899,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Kontaktlar sozlamalari"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Yulduzchali kontaktlar sozlamalari"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Hech qanday"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Hech qanday"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Signallar"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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 tovushlar uchun ishlamaydi}}"</string>
     <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ish)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Hisoblanmoqda…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Ilovalar sozlamalari"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Ilovalarga Bezovta qilinmasin rejimiga amal qilmasligiga ruxsat berish"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Bezovta qilinmasin rejimi ishlamaydigan ilovalar"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Rejim yaratish"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Maxsus rejim"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Rejim nomi"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Rejim nomini kiritish shart"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Belgi tanlang"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Taqvimdagi tadbirlar"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Uyqu vaqti dasturi"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Avtomobilda"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Butun ekran bildirishnomalari"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Bu ilova bildirishnomalarini butun ekranda chiqishiga ruxsat berish"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Bu ilovaga qurilma qulflanganida butun ekranni egallaydigan bildirishnoma chiqarishga ruxsat berish. Ilovalar uning yordamida signallar, kiruvchi chaqiruv yoki boshqa shoshilinch bildirishnomalarni ajratib koʻrsatishi mumkin."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Tizim sozlamalariga yozish"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Bu ilovaga sizning nomingizdan tizim sozlamalarini oʻzgartirishga ruxsat berish"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Bu ruxsat ilovaga asosiy tizim sozlamalarini oʻzgartirish imkonini beradi."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Media boshqaruv ilovalari"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Ilova mediani boshqarishiga ruxsat berish"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Ruxsat berilsa, bu ilova sizdan ruxsat soʻramasdan boshqa ilovada yaratilgan media fayllarni oʻzgartirishi yoki oʻchirishi mumkin. Ilovaga media va fayllarga kirish uchun ruxsat berilishi kerak."</string>
@@ -4396,6 +4477,13 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Ishoralar"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Kamerani tezkor ochish"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
+    <string name="double_tap_power_title" msgid="8705875166298116659">"Quvvat tugmasini ikki marta bosing"</string>
+    <string name="double_tap_power_enabled" msgid="305978257631612678">"Ikki marta bosing"</string>
+    <string name="double_tap_power_target_action_category" msgid="6186809788568348488">"Quvvat tugmasini ikki marta bosing"</string>
+    <string name="double_tap_power_camera_action_title" msgid="8398392033718681209">"Kamerani ochish"</string>
+    <string name="double_tap_power_camera_action_summary" msgid="1231656402570674349">"Kameradan foydalanish"</string>
+    <string name="double_tap_power_wallet_action_title" msgid="2238628756927241786">"Wallet xizmatini ochish"</string>
+    <string name="double_tap_power_wallet_action_summary" msgid="6567586974229774570">"Wallet xizmatidan foydalanish"</string>
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Selfi uchun old kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Navigatsiya rejimi"</string>
@@ -4793,11 +4881,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Sputnik orqali xabarlashuv"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Sputnik orqali matnli xabar yuborish va qabul qilish. Hisobingizga kiritilgan."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Sputnik orqali matnli xabar yuborish va qabul qilish. Hisobingizda mavjud emas."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Sputnik orqali xabarlashuv"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Sputnik orqali xabarlashuv haqida"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"sunʼiy yoʻldosh orqali xabarlashuv, sunʼiy yoʻldosh aloqasi"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> haqida"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Mos <xliff:g id="CARRIER_NAME">%1$s</xliff:g> hisobining bir qismi sifatida sputnik orqali matnli xabarlarni yuborishingiz va qabul qilishingiz mumkin"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> tarif rejangiz"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Sputnik orqali xabarlashuv hisobingizga kiritilgan"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Xabarlashish hisobingizga kiritilgan"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Sputnik orqali xabarlashuv hisobingizga kiritilmagan"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Batafsil"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Ishlash tartibi"</string>
@@ -4805,10 +4893,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Telefoningiz sputnikka avtomatik ulanadi. Yaxshiroq aloqa uchun ochiq osmon ostida turing."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Telefoningiz spurtnikka ulangandan keyin"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Istalgan kishiga, shuningdek, favqulodda xizmatlarga ham xabar yubora olasiz. Telefoningiz mobil tarmoq ishlashi bilan unga ulanadi."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Sputnik orqali xabarlashuv uzoqroq vaqt olishi mumkin va faqat ayrim hududlarda ishlaydi. Ob-havo va ayrim tuzilmalar sputnik ulanishiga taʼsir qilishi mumkin. Sputnik orqali chaqiruv mavjud emas. Favqulodda chaqiruvlar hali ham ulanishi mumkin.\n\nHisob oʻzgarishlari Sozlamalarda chiqishi uchun biroz vaqt ketishi mumkin. Tafsilotlar uchun aloqa operatoringizga murojaat qiling."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Sputnik orqali xabarlashuv haqida batafsil"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g> uzoqroq vaqt olishi mumkin va faqat ayrim hududlarda ishlaydi. Ob-havo va ayrim tuzilmalar sputnik ulanishiga taʼsir qilishi mumkin. Sputnik orqali chaqiruv mavjud emas. Favqulodda chaqiruvlar hali ham ulanishi mumkin.\n\nHisob oʻzgarishlari Sozlamalarda chiqishi uchun biroz vaqt ketishi mumkin. Tafsilotlar uchun <xliff:g id="CARRIER_NAME">%1$s</xliff:g> bilan bogʻlaning."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"<xliff:g id="SUBJECT">%1$s</xliff:g> haqida batafsil"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"<xliff:g id="FUNCTION">%1$s</xliff:g> yoqilmadi"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"<xliff:g id="FUNCTION">%1$s</xliff:g> yoqish uchun avval sputnik aloqasini uzing"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Sputnik aloqasi"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Sunʼiy yoʻldosh aloqasi"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"sunʼiy yoʻldosh aloqasi"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"sunʼiy yoʻldosh orqali xabarlashuv"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Internetdan foydalanish hisobingizga kiritilgan"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Sputnik SOS"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Mobil yoki Wi‐Fi tarmoqqa ulana olmaganingizda favqulodda xizmatlarga xabar yuborish"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"sputnik sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Sputnik SOS haqida"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Mobil yoki Wi-Fi tarmoq aloqasi boʻlmaganda favqulodda xizmatlarga xabar yuborish va joylashuv axborotini ulashish mumkin. Bu xizmat har qanday vaqt, joylashuv yoki vaziyatlarda ishlamasligi mumkin."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Favqulodda xizmatlarni chaqirish yoki xabar yuborish"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Favqulodda vaziyat haqida savollarga javob bering"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Sputnikka ulanish uchun quyidagi amallarni bajaring"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Mobil tarmoq mavjud boʻlmasa, Sputnik SOS bandi chiqadi"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Kerakli yordam olishingiz uchun javoblarni favqulodda xizmatlarga yuboring"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Ulanganda favqulodda xizmatlarga xabar yuborish mumkin"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Demo rejim"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Favqulodda xizmatlarga sputnik orqali ulanishda ism, email, telefon raqam(lar)i, joylashuv, qurilma haqidagi (IMEI, til, modeli, batareya quvvati darajasi) hamda favqulodda vaziyatlar uchun kontaktlaringiz maʼlumotlari favqulodda xizmat va sputnik operatorlariga ulashiladi. \n\nSputnik SOS xizmatidan foydalanish uchun Google Xabarlar asosiy SMS ilovasi etib tayinlanishi kerak. \n\nAgar tarmoqni avtomatik tanlash oʻchiq boʻlsa, u yoqiladi va qurilmangiz istalgan tarmoqqa avtomatik ulanadi."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Ulashuv parametrlari"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Favqulodda kontaktlar"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"Google hisobingiz"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Favqulodda xizmatlarga ulashiladigan axborotlarni tekshiring va yangilang"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Internetga ulanish nuqtalari (APN)"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> bilan ishlamaydi"</string>
@@ -4995,6 +5106,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Siz sahifadan mustaqil 16 KB rejimdasiz. Ushbu rejimda dasturning yaxlitligini kafolatlab boʻlmaydi va bootloader qulfdan chiqarilganda telefonda saqlangan har qanday maʼlumotlar xavf ostida qolishi mumkin. Ayrim funksiyalar bu rejimlarda faolsizlantiriladi, shu sababdan ayrim ilovalar ishlamasligi mumkin. Ishchi rejimiga qayta kirish uchun siz 4 KB rejimiga qaytishingiz va keyin qurilmaning bootloaderini qulflashingiz kerak. Bu qurilmani zavod sozlamalariga qaytaradi va uni ishchi sozlamalariga qaytaradi. Qurilma Android tizimiga muvaffaqiyatli yuklangandan keyin Dasturchi sozlamalarida OEM qulfini ochish funksiyasini faolsizlantiring. Agar qurilma Android tizimiga yuklanmasa yoki barqaror ishlamasa, qurilmani eng oxirgi dasturning asl tasvirini &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; orqali olib qayta yuklang yoki &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; ishlating va “Qurilmani tozalash”, “Bootloaderni qulflash” va “Barcha boʻlimlarni majburiy fleshlash” bandlarini tanlang."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB sahifadan mustaqil rejim"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Batafsil"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Ilovani sahifa hajmiga muvofiq rejimda ishga tushirish"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Xatoliklarni xabar qilish vositasi"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Qurilmadagi qaysi ilova xatoliklarni xabar qilish vositasi bilan ishlashini aniqlaydi."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Shaxsiy"</string>
@@ -5433,7 +5547,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Oqimga ulanish"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasi bilan birga tinglash uchun audio oqim QR kodini skanerlang"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Parol ulashuv vaqtida tahrirlanmaydi. Parolni oʻzgartirish uchun audio ulashuvni faolsizlantiring."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Parol 4-16 belgidan iborat boʻlishi lozim. Faqat harf, raqam va belgilar ishlatish mumkin."</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR-kod skaneri"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Yordam kerakmi?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Qidiruv sozlamalari"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktlar, xotira, hisob"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktlar ombori"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Faqat qurilmada"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yangi kontaktlar hisobga sinxronlanmaydi"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Birlamchi holatda kontaktlar qurilmada saqlanadi va hisobga sinxronlanadi"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Birlamchi hisob tanlanmadi"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Birlamchi hisob tanlanmagan"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Faqat qurilmada"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Qurilma va %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Avval hisob qoʻshing"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kontaktlar qayerda saqlansin"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Chizib qidirish"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Ekrandagi kontent orqali qidirish uchun Asosiy tugmani yoki navigatsiya panelini bosib turing"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 7763c19798c..550c7e0843f 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Bông tuyết"</item>
     <item msgid="7952183800501346803">"Dù che trên bãi biển"</item>
     <item msgid="799139025758265891">"Công cụ trong xưởng"</item>
-    <item msgid="1330084588359129896">"Lều"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Cuộn phim"</item>
     <item msgid="5827426100157335512">"Sách"</item>
     <item msgid="8585828346253128384">"Hoa sen"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 151ead1f0c8..ea66acef5df 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Ghép nối thiết bị mới"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Tự động bật vào ngày mai"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Bluetooth sẽ bật lại vào ngày hôm sau nếu bạn tắt đi"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Ghép nối tai phải"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Ghép nối tai trái"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Ghép nối tai khác"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Tắt âm thanh năng lượng thấp qua Bluetooth"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Tắt tính năng âm thanh năng lượng thấp qua Bluetooth nếu thiết bị hỗ trợ chức năng phần cứng âm thanh năng lượng thấp."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Bluetooth Âm thanh năng lượng thấp"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Bật chế độ xem trước giao diện người dùng của tính năng truyền phát qua Bluetooth Âm thanh năng lượng thấp"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Bật chế độ xem trước giao diện người dùng của tính năng Chia sẻ âm thanh năng lượng thấp, bao gồm cả tính năng chia sẻ âm thanh cá nhân và truyền phát ở chế độ riêng tư"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Hiện nút bật/tắt Âm thanh năng lượng thấp"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Bỏ qua danh sách cho phép đối với tính năng Bluetooth Âm thanh năng lượng thấp"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Sử dụng Âm thanh năng lượng thấp theo mặc định, ngay cả khi chưa xác minh được rằng thiết bị ngoại vi Âm thanh năng lượng thấp đáp ứng tiêu chí của danh sách cho phép."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Ngôn ngữ ứng dụng"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Ngôn ngữ đề xuất"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Tất cả ngôn ngữ"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Đề xuất"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Tất cả ngôn ngữ"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Tất cả khu vực"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Tất cả hệ thống đánh số"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Ngôn ngữ hệ thống"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Theo chế độ mặc định của hệ thống"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Bạn chưa thể chọn ngôn ngữ cho ứng dụng này trong phần Cài đặt."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Thay đổi"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"%s không dùng được"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Bạn không thể dùng ngôn ngữ này làm ngôn ngữ hệ thống, nhưng đã cho các ứng dụng và trang web biết rằng bạn ưu tiên ngôn ngữ này."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Tìm kiếm"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Thêm ngôn ngữ"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Tùy chọn khu vực"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Nhập tên ngôn ngữ"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Cài đặt ngôn ngữ khác"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Lựa chọn ưu tiên theo khu vực"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Đặt các lựa chọn ưu tiên về số và đơn vị"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Cho ứng dụng biết lựa chọn ưu tiên theo khu vực của bạn để ứng dụng có thể mang đến trải nghiệm phù hợp."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Ứng dụng sẽ dùng lựa chọn ưu tiên theo khu vực của bạn khi có thể."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Lựa chọn ưu tiên theo khu vực"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Nhiệt độ"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Ngày đầu tiên trong tuần"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Lựa chọn ưu tiên về số"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Bạn có thể bị tính phí chuyển vùng."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Tự động đặt giờ"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Đặt tự động"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Nếu bạn bật nút này, thông tin vị trí sẽ được dùng để đặt múi giờ"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Ngày và giờ tự động"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Tự động đặt dựa trên tín hiệu không dây và mạng của bạn"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Múi giờ tự động"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Tự động đặt dựa trên các mạng di động gần bạn"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Tự động đặt dựa trên vị trí thiết bị của bạn, nếu có"</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" msgid="286679379105653406">"Sử dụng định dạng 24 giờ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Giờ"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Nhấc ngón tay, sau đó chạm lại vào cảm biến"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Không thể dùng cảm biến vân tay"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Hãy liên hệ với một nhà cung cấp dịch vụ sửa chữa."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Mở khoá bằng vân tay khi màn hình tắt"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Dùng tính năng Mở khoá bằng vân tay ngay cả khi màn hình đang tắt"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Màn hình tắt, Mở khoá"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Chế độ cài đặt bảo mật khác"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Khoá hồ sơ công việc, mã hoá và chế độ cài đặt khác"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Mã hoá, thông tin xác thực và chế độ cài đặt khác"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Đặt hình mở khoá cho không gian riêng tư"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Khoá"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ẩn"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Xác nhận hình mở khoá không gian riêng tư"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Nhập lại mã PIN không gian riêng tư"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Nhập lại mật khẩu không gian riêng tư"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Bạn có thể thêm tối đa <xliff:g id="COUNT">%d</xliff:g> vân tay"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Bạn đã thêm số vân tay tối đa"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Không thể thêm dấu vân tay khác"</string>
@@ -877,6 +898,8 @@
     <string name="external_display_on" msgid="2560104443500154333">"Đang bật"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Đang tắt"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Màn hình ngoài"</string>
+    <!-- no translation found for builtin_display_settings_category (3441388849060771885) -->
+    <skip />
     <string name="external_display_use_title" msgid="8198257340836261386">"Dùng màn hình ngoài"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Độ phân giải màn hình"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Màn hình ngoài bị ngắt kết nối"</string>
@@ -888,6 +911,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Việc thay đổi góc xoay hoặc độ phân giải có thể dừng các ứng dụng đang chạy"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Thiết bị phải được kết nối với một màn hình ngoài để phản chiếu màn hình của bạn"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Lựa chọn khác"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Giữ và kéo để sắp xếp lại màn hình."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Truyền"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"phản chiếu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bật hiển thị không dây"</string>
@@ -1024,6 +1048,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Kiểm tra mật khẩu rồi thử lại"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Liên hệ với nhà sản xuất thiết bị"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Hãy kiểm tra trạng thái kết nối rồi thử lại"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Hiện không dùng được mạng Wi-Fi này"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Đã xảy ra sự cố với mã QR này. Hãy thử kết nối theo cách khác."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Chọn mạng"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Để kết nối thiết bị của bạn, hãy chọn một mạng"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Thêm thiết bị này vào “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1245,10 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Tìm hiểu thêm về chế độ tự động xoay"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Độ phân giải màn hình"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Độ phân giải cao"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Độ phân giải đầy đủ"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Chế độ độ phân giải cao sử dụng nhiều pin hơn. Việc chuyển đổi độ phân giải có thể khiến một số ứng dụng khởi động lại."</string>
+    <!-- no translation found for screen_resolution_option_full (4456839315039000517) -->
+    <skip />
+    <!-- no translation found for screen_resolution_footer (1230761249204935717) -->
+    <skip />
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Đã chọn"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Màu"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tự nhiên"</string>
@@ -1229,7 +1257,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Thích ứng"</string>
     <string name="brightness" msgid="6216871641021779698">"Độ sáng"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Độ sáng thích ứng"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Giới thiệu về độ sáng thích ứng"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Độ sáng màn hình sẽ tự động điều chỉnh theo môi trường và hoạt động của bạn. Bạn có thể di chuyển thanh trượt theo cách thủ công để giúp tính năng độ sáng thích ứng học các lựa chọn ưu tiên của bạn."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Đang bật"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Tắt"</string>
@@ -1300,7 +1327,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Cài đặt Chế độ giờ đi ngủ"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Chế độ cũng có thể kích hoạt giao diện tối}=1{{mode_1} cũng kích hoạt giao diện tối}=2{{mode_1} và {mode_2} cũng kích hoạt giao diện tối}=3{{mode_1}, {mode_2} và {mode_3} cũng kích hoạt giao diện tối}other{{mode_1}, {mode_2} và # chế độ khác cũng kích hoạt giao diện tối}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Cài đặt Chế độ"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Tối hơn nữa"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Siêu tối"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Cho phép thiết bị trở nên tối hơn so với bình thường"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Thời gian chờ khóa màn hình"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
@@ -1623,7 +1650,7 @@
     <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 tắt. Chế độ này có thể cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Dịch vụ vị trí"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Dịch vụ vị trí"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Dùng thông tin vị trí"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Dùng thông tin vị trí để xác định múi giờ"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Không thể tự động thiết lập múi giờ"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Dịch vụ vị trí hoặc Thông tin vị trí đang tắt"</string>
@@ -1634,11 +1661,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Cài đặt vị trí"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Khắc phục vấn đề này"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Hủy"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Tính năng Tự động phát hiện múi giờ đang tắt"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Không dùng được khi chế độ múi giờ tự động ở trạng thái 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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Vị trí có thể được dùng để đặt múi giờ"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Thông tin vị trí thiết bị của bạn (nếu có) có thể được dùng để đặt múi giờ"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Xem thông tin pháp lý, trạng thái, phiên bản phần mềm"</string>
     <string name="legal_information" msgid="7509900979811934843">"Thông tin pháp lý"</string>
     <string name="manual" msgid="3651593989906084868">"Hướng dẫn sử dụng"</string>
@@ -1938,14 +1965,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Tuỳ chọn"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Hỗ trợ tiếp cận"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Bàn phím vật lý"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Phím nảy"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Bàn phím sẽ bỏ qua các lần nhấn nhanh liên tục cùng một phím trong <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> mili giây"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Bàn phím sẽ bỏ qua các lần nhấn nhanh liên tục cùng một phím"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ngưỡng phím nảy"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Chọn khoảng thời gian bàn phím bỏ qua các lần nhấn phím liên tục"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0,2 giây"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0,4 giây"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0,6 giây"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Tuỳ chỉnh"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"giá trị tuỳ chỉnh"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Phím chậm"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Điều chỉnh thời gian cần để kích hoạt lượt nhấn phím thành <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> mili giây"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Điều chỉnh thời gian cần để kích hoạt một lượt nhấn phím"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Phím cố định"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Nhấn từng phím một để dùng phím tắt thay vì giữ các phím cùng lúc"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Các phím điều khiển chuột"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Dùng bàn phím thực để điều khiển chuột."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Dùng các phím điều khiển chuột"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Sử dụng bàn phím để điều khiển con trỏ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Đảo ngược hướng cuộn chuột"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Cuộn lên để di chuyển xuống phía dưới của trang"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Hoán đổi nút chuột trái và phải"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sử dụng nút chuột trái như nút chuột phải"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Các phím điều khiển chuột của <xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Dùng các phím <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> để di chuyển con trỏ chuột"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Dùng phím <xliff:g id="CLICK_LABEL">%s</xliff:g> để nhấp vào nút chuột chính"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Dùng phím <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> để nhấn và giữ nút chuột chính"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Dùng phím <xliff:g id="RELEASE_LABEL">%s</xliff:g> để nhả nút chuột chính"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Dùng phím <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> để bật/tắt chế độ cuộn. Khi đó, các phím <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> sẽ cuộn chế độ xem lên trên, xuống dưới, sang trái hoặc sang phải"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Dùng phím <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> để nhấp vào nút chuột phụ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Phím tắt"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Hiện danh sách phím tắt"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Công cụ và bàn phím hồ sơ công việc"</string>
@@ -1953,6 +2001,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Mặc định"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Bàn di chuột"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Chuột và bàn di chuột"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Chuột"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Tốc độ con trỏ, cử chỉ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Gõ để nhấp"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Kéo khi nhấn"</string>
@@ -1964,6 +2013,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Nhấp vào góc cuối bên phải"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Nhấp vào góc cuối bên phải bàn di chuột để xem lựa chọn khác"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Tốc độ con trỏ"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Dùng cử chỉ nhấn bằng 3 ngón tay"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Màu con trỏ"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Đổi màu nền con trỏ thành màu đen"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Đổi màu nền con trỏ thành xanh lục"</string>
@@ -1978,6 +2028,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Tìm hiểu về cử chỉ ở bàn di chuột"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"bàn di chuột, bàn rê chuột, chuột, con trỏ chuột, cuộn, vuốt, nhấp chuột phải, nhấp, con trỏ"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"nhấp chuột phải, nhấn"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Nhấp chuột giữa"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Khởi chạy Trợ lý"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Chuyển đến màn hình chính"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Quay lại"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Xem các ứng dụng gần đây"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Chuyển đến màn hình chính"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Dùng 3 ngón tay vuốt lên vị trí bất kỳ trên bàn di chuột"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Quay lại"</string>
@@ -2014,6 +2069,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chọn một phím mới cho <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Hỗ trợ tiếp cận cho bàn phím vật lý"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Phím cố định, Phím nảy, Phím chuột"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Lặp lại phím"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Độ trễ trước khi lặp lại"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Tốc độ lặp lại"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Nhấn và giữ một phím để lặp lại ký tự của phím đó cho đến khi bạn nhả phím"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Bố cục <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Mặc định"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Tự động: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2477,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Xem trước"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Tùy chọn chuẩn"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Ngôn ngữ"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Cỡ chữ"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Kích thước phụ đề"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Kiểu phụ đề"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tùy chọn tùy chỉnh"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Màu nền"</string>
@@ -2545,6 +2604,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Điều chỉnh việc sử dụng nguồn"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Gói bao gồm"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Các ứng dụng đang chạy bình thường"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Nên thay pin"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Do dung lượng pin và hiệu suất sạc bị giảm, bạn nên thay pin."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Mức pin yếu"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Bật Trình tiết kiệm pin để kéo dài thời lượng pin"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Kéo dài thời lượng pin"</string>
@@ -2962,6 +3023,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ngắt kết nối VPN này?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ngắt kết nối"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Phiên bản"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Phiên bản <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Xóa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Thay thế VPN hiện có?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Đặt VPN luôn bật?"</string>
@@ -3384,7 +3446,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 giờ sáng – 5 giờ chiều các ngày trong tuần\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Sự kiện trên lịch"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Chế độ {mode_1} đang hoạt động}=2{Chế độ {mode_1} và {mode_2} đang hoạt động}=3{Chế độ {mode_1}, {mode_2} và {mode_3} đang hoạt động}other{{mode_1}, {mode_2} và # chế độ khác đang hoạt động}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Có thể tự động bật 1 chế độ}other{Có thể tự động bật # chế độ}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Không làm phiền}=1{{mode_1}}=2{{mode_1}, {mode_2}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"ĐANG BẬT"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Chưa đặt"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Đã tắt"</string>
@@ -3509,15 +3571,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Đã hiểu"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Thông báo"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Thời lượng"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Tin nhắn, sự kiện và lời nhắc"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với mình."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Xong"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Cài đặt"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Không hiển thị hoặc phát âm thanh khi có thông báo"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Không phát âm thanh khi có thông báo"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Bạn sẽ không nhìn thấy hoặc nghe thấy thông báo. Các cuộc gọi từ các liên hệ có gắn dấu sao và người gọi nhiều lần đều được phép."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Mục cài đặt hiện tại)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Thay đổi mục cài đặt thông báo Không làm phiền?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Âm thanh hồ sơ công việc"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Sử dụng âm thanh hồ sơ cá nhân"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Dùng nhạc chuông và âm báo giống như hồ sơ cá nhân của bạn"</string>
@@ -3586,8 +3639,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Mở khoá xong sẽ chuyển thẳng đến màn hình bạn dùng gần đây nhất. Thông báo sẽ không hiện trên màn hình khoá. Vuốt từ trên xuống để xem thông báo."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khóa màn hình, Màn hình khóa, Bỏ qua"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Khi hồ sơ công việc bị khóa"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Giảm thiểu thông báo trên màn hình khoá"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Hiển thị ít hơn thông báo hơn trên màn hình khoá"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Chỉ hiển thị thông báo mới trên màn hình khoá"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Tự động xoá thông báo đã xem trước đó khỏi màn hình khoá"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Thông báo trên màn hình khóa"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Hiện thông báo cuộc trò chuyện, mặc định và im lặng"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Hiện các cuộc trò chuyện ở chế độ mặc định và im lặng"</string>
@@ -3605,6 +3668,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Hiện mọi nội dung thông báo công việc"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Ẩn nội dung công việc nhạy cảm"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Khi thiết bị của bạn bị khóa, bạn muốn thông báo hồ sơ hiển thị như thế nào?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Thông báo hồ sơ"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Thông báo"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Thông báo của ứng dụng"</string>
@@ -3695,6 +3766,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Khi bạn nhận được nhiều thông báo trong một thời gian ngắn, thiết bị của bạn sẽ hạ âm lượng và giảm thiểu cảnh báo trong tối đa 2 phút. Cuộc gọi, chuông báo và cuộc trò chuyện ưu tiên sẽ không bị ảnh hưởng. \n\nBạn có thể kéo xuống từ đầu màn hình để xem các thông báo nhận được trong lúc giảm dần âm lượng thông báo."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Áp dụng cho hồ sơ công việc"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Áp dụng cho các ứng dụng trong hồ sơ công việc"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Thông báo theo nhóm"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Đang bật"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Đang tắt"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Sử dụng tính năng nhóm thông báo"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Các thông báo có chủ đề tương tự sẽ được tắt tiếng và nhóm lại để mang đến trải nghiệm yên tĩnh hơn. Tính năng nhóm sẽ ghi đè chế độ cài đặt thông báo của một ứng dụng."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Dịch vụ trình trợ giúp thực tế ảo"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Không có ứng dụng đã cài đặt nào yêu cầu được chạy dưới dạng dịch vụ trình trợ giúp thực tế ảo."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Cho phép <xliff:g id="SERVICE">%1$s</xliff:g> truy cập dịch vụ thực tế ảo?"</string>
@@ -3803,6 +3879,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"cuộc trò chuyện ưu tiên"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Cài đặt cuộc trò chuyện"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Những người có thể làm gián đoạn chế độ Không làm phiền"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Ngay cả khi các ứng dụng nhắn tin hoặc gọi điện không thể thông báo cho bạn, những người mà bạn chọn ở đây đều vẫn liên hệ được với bạn qua những ứng dụng đó"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Cuộc gọi"</string>
@@ -3826,6 +3903,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Cài đặt địa chỉ liên hệ"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Cài đặt người liên hệ có gắn dấu sao"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Không có"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Không có"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Chuông báo"</string>
@@ -3855,6 +3934,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Công việc)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Đang tính toán…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Cài đặt ứng dụng"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Cho phép ứng dụng ghi đè"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Những ứng dụng có thể làm gián đoạn chế độ Không làm phiền"</string>
@@ -3897,6 +3977,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Tạo một chế độ"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Chế độ tuỳ chỉnh"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Tên chế độ"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Không được để trống tên chế độ"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Chọn một biểu tượng"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Sự kiện trên lịch"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Quy trình đi ngủ"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Trong khi lái xe"</string>
@@ -4151,6 +4233,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Thông báo toàn màn hình"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Cho phép ứng dụng này hiện thông báo toàn màn hình"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Cho phép ứng dụng hiện các thông báo chiếm toàn màn hình khi thiết bị ở trạng thái khoá. Các ứng dụng có thể dùng những thông báo này để làm nổi bật chuông báo, cuộc gọi đến hoặc thông báo khẩn cấp khác."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Ghi các lựa chọn ưu tiên về hệ thống"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Cho phép ứng dụng này thay mặt bạn sửa đổi các lựa chọn ưu tiên về hệ thống"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Quyền này cho phép ứng dụng sửa đổi các lựa chọn ưu tiên cốt lõi về hệ thống."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Ứng dụng quản lý nội dung nghe nhìn"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Cho phép ứng dụng quản lý nội dung nghe nhìn"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Nếu được cho phép, ứng dụng này có thể sửa đổi hoặc xóa tệp nội dung nghe nhìn đã tạo bằng các ứng dụng khác mà không cần hỏi bạn. Ứng dụng phải có quyền truy cập vào tệp và nội dung nghe nhìn."</string>
@@ -4396,6 +4481,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Cử chỉ"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Mở nhanh camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Để mở nhanh camera, hãy nhấn vào nút nguồn 2 lần. Thao tác này hoạt động trên mọi màn hình."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Lật máy ảnh để selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Chế độ thao tác"</string>
@@ -4793,11 +4892,14 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Nhắn tin qua vệ tinh"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Gửi và nhận tin nhắn văn bản qua vệ tinh. Tài khoản của bạn có sẵn tính năng này."</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Gửi và nhận tin nhắn văn bản qua vệ tinh. Dịch vụ này không đi kèm với tài khoản của bạn."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Nhắn tin qua vệ tinh"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Giới thiệu về tính năng nhắn tin qua vệ tinh"</string>
+    <!-- no translation found for keywords_satellite_setting (613553612424945946) -->
+    <skip />
+    <!-- no translation found for category_name_about_satellite_messaging (4978095955643523120) -->
+    <skip />
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Bạn có thể gửi và nhận tin nhắn văn bản qua vệ tinh. Đây là một trong những tính năng của tài khoản <xliff:g id="CARRIER_NAME">%1$s</xliff:g> đủ điều kiện"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Gói <xliff:g id="CARRIER_NAME">%1$s</xliff:g> của bạn"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Tính năng Nhắn tin qua vệ tinh có sẵn trong tài khoản của bạn"</string>
+    <!-- no translation found for title_have_satellite_plan (857337944804101443) -->
+    <skip />
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Tính năng Nhắn tin qua vệ tinh không có sẵn trong tài khoản của bạn"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Tìm hiểu thêm"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Cách hoạt động"</string>
@@ -4805,10 +4907,57 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Điện thoại của bạn sẽ tự động kết nối với vệ tinh. Để có kết nối chất lượng tốt nhất, hãy tìm đến nơi có thể nhìn rõ bầu trời."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Sau khi điện thoại của bạn kết nối với vệ tinh"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Bạn có thể gửi tin nhắn văn bản cho bất cứ ai, gồm cả các dịch vụ khẩn cấp. Điện thoại của bạn sẽ kết nối lại với mạng di động khi có mạng."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Tính năng Nhắn tin qua vệ tinh có thể mất nhiều thời gian hơn và chỉ dùng được ở một số khu vực. Thời tiết và một số công trình có thể ảnh hưởng đến kết nối vệ tinh của bạn. Không dùng được tính năng gọi điện qua vệ tinh. Cuộc gọi khẩn cấp có thể vẫn kết nối được.\n\nCó thể mất một chút thời gian để các thay đổi đối với tài khoản xuất hiện trong phần Cài đặt. Hãy liên hệ với nhà mạng của bạn để biết thông tin chi tiết."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Tìm hiểu thêm về tính năng nhắn tin qua vệ tinh"</string>
+    <!-- no translation found for satellite_setting_summary_more_information (1028146147094166868) -->
+    <skip />
+    <!-- no translation found for more_about_satellite_messaging (1039277943532711584) -->
+    <skip />
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Không bật được <xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Để bật <xliff:g id="FUNCTION">%1$s</xliff:g>, trước tiên hãy ngắt kết nối vệ tinh"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Kết nối vệ tinh"</string>
+    <!-- no translation found for title_satellite_setting_connectivity (488626710934668313) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_connectivity (7337311015334186655) -->
+    <skip />
+    <!-- no translation found for description_satellite_setting_messaging (4367494645429198805) -->
+    <skip />
+    <!-- no translation found for title_have_satellite_data_plan (5614932315409789011) -->
+    <skip />
+    <!-- no translation found for title_for_satellite_sos (4608739357329147285) -->
+    <skip />
+    <!-- no translation found for summary_for_satellite_sos_entry (4981480371923329605) -->
+    <skip />
+    <!-- no translation found for keywords_satellite_sos (6275777197418023949) -->
+    <skip />
+    <!-- no translation found for category_title_about_satellite_sos (7229724397303154919) -->
+    <skip />
+    <!-- no translation found for satellite_sos_introduction (4670230212117495751) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_1 (4669862942425306921) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_2 (3558248744927579016) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_step_3 (4496038314890474893) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_1 (4497178023367920284) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_2 (1302661361673503362) -->
+    <skip />
+    <!-- no translation found for satellite_sos_how_it_works_summary_3 (4612675365617172405) -->
+    <skip />
+    <!-- no translation found for satellite_sos_try_demo (1915233782211344468) -->
+    <skip />
+    <!-- no translation found for satellite_sos_footer_text (4454885538165117230) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_subheader_title (5701538329333628267) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_1 (3106774199702637359) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_step_2 (738246589687762115) -->
+    <skip />
+    <!-- no translation found for satellite_sos_sharing_preferences_description (782508188142964342) -->
+    <skip />
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Tên điểm truy cập"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <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>
@@ -4995,6 +5144,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Bạn đang ở chế độ 16KB của chế độ không phụ thuộc vào kích thước trang. Ở chế độ này, tính toàn vẹn của phần mềm không được đảm bảo, đồng thời mọi dữ liệu lưu trữ trên điện thoại này có thể gặp rủi ro trong khi trình tải khởi động được mở khoá. Một số tính năng bị tắt ở những chế độ này nên có thể một vài ứng dụng sẽ không hoạt động được. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn phải chuyển lại về chế độ 4K rồi khoá trình tải khởi động của thiết bị. Thao tác này sẽ đặt lại thiết bị về trạng thái ban đầu và khôi phục các chế độ cài đặt gốc. Sau khi thiết bị khởi động thành công vào Android, hãy tắt chế độ mở khoá OEM trong Tuỳ chọn cho nhà phát triển. Nếu thiết bị không khởi động vào Android hoặc không ổn định, hãy cài đặt ROM lại cho thiết bị với hình ảnh gốc mới nhất từ &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; hoặc sử dụng &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; rồi chọn \"Xoá dữ liệu thiết bị\", \"Khoá trình tải khởi động\" và \"Buộc cài đặt ROM cho mọi phân vùng\"."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Chế độ 16 KB của chế độ không xác định kích thước trang"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Đọc thêm"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Chạy ứng dụng ở chế độ tương thích với kích thước trang"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Trình xử lý báo cáo lỗi"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Xác định ứng dụng nào xử lý phím tắt Báo cáo lỗi trên thiết bị của bạn."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Cá nhân"</string>
@@ -5433,7 +5585,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Nghe luồng âm thanh"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Hãy quét mã QR của luồng âm thanh để nghe bằng <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Không thể chỉnh sửa mật khẩu trong khi chia sẻ. Để đổi mật khẩu, trước tiên hãy tắt tính năng chia sẻ âm thanh."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Mật khẩu của bạn phải có từ 4 đến 16 ký tự và chỉ được sử dụng chữ cái, số và ký hiệu"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Trình quét mã QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Bạn cần được trợ giúp?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Tìm chế độ cài đặt"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"danh bạ, bộ nhớ, tài khoản"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Bộ nhớ danh bạ"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Chỉ thiết bị"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Những người liên hệ mới sẽ không được đồng bộ hoá với một tài khoản"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Những người liên hệ sẽ được lưu vào thiết bị và đồng bộ hoá với tài khoản của bạn theo mặc định"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Đã xảy ra lỗi khi đặt tài khoản mặc định"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Chưa đặt tài khoản mặc định nào"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Chỉ thiết bị"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Thiết bị và %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Thêm một tài khoản để bắt đầu"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Vị trí lưu thông tin liên hệ"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Khoanh tròn để tìm kiếm"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Bạn có thể chạm và giữ nút Màn hình chính hoặc thanh điều hướng để tìm kiếm bằng nội dung có trên màn hình của mình."</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 43b3ced7746..4ecb4f66163 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"雪花"</item>
     <item msgid="7952183800501346803">"沙滩伞"</item>
     <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帐篷"</item>
+    <item msgid="8112685757657659269">"钢琴"</item>
     <item msgid="3861584909935022342">"电影胶片"</item>
     <item msgid="5827426100157335512">"图书"</item>
     <item msgid="8585828346253128384">"莲花"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7fe036146e9..409dfe4fe1e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"与新设备配对"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"蓝牙"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自动开启"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"如果您关闭蓝牙，它会在第二天重新开启"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"为右耳进行配对"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"为左耳进行配对"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"为另一个耳朵进行配对"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"停用蓝牙 LE 音频"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"如果设备支持 LE 音频硬件功能，则停用蓝牙 LE 音频功能。"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"蓝牙 LE 音频模式"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"启用蓝牙 LE 音频广播界面预览"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"启用 LE 音频分享界面预览，包括个人音频分享和私人广播"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"在“设备详细信息”中显示 LE 音频切换开关"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"绕过蓝牙 LE 音频许可名单"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"默认使用 LE 音频，即使 LE 音频外围设备尚未通过旨在确保满足许可名单条件的验证，也是如此。"</string>
@@ -139,7 +142,7 @@
     <string name="stylus_default_notes_app" msgid="4165657465911764628">"按下笔帽按钮即可打开"</string>
     <string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g>（工作资料）"</string>
     <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"在文本字段中书写"</string>
-    <string name="stylus_ignore_button" msgid="7734540973145241391">"忽略所有通过触控笔按下按钮的动作"</string>
+    <string name="stylus_ignore_button" msgid="7734540973145241391">"忽略所有触控笔按钮按下动作"</string>
     <string name="stylus_connected_devices_title" msgid="2823967577941359812">"触控笔"</string>
     <string name="date_and_time" msgid="1788358029823431692">"日期和时间"</string>
     <string name="proxy_settings_title" msgid="4201866858226087066">"代理"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"应用语言"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"建议的语言"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"所有语言"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"建议语言区域"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"所有语言"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"所有区域"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"所有记数系统"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"系统语言"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"系统默认设置"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"您无法从“设置”中选择此应用的语言。"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"更改"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"无法使用%s"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"此语言无法用作系统语言，但应用和网站已知晓您选择此语言为您的首选语言。"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"搜索"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"添加语言"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"地区偏好设置"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"输入语言名称"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"更多语言设置"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"地区偏好设置"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"设置单位和数字偏好设置"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"将您的地区偏好设置告知应用，使应用能够为您提供个性化体验。"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"应用将尽可能使用您的地区偏好设置。"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"地区偏好设置"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"温度"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"一周的第一天"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"数字偏好设置"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_disable" msgid="729512894708689604">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"可能需要支付漫游费用。"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"自动设置时间"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"自动设置"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"此切换开关开启时，系统会根据位置信息设置时区"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"自动确定日期和时间"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"使用您的网络和无线信号自动设定"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"自动确定时区"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"根据您附近的移动网络自动设定"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"根据设备位置信息（如果可用）自动设定"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用默认语言区域"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小时制"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"时间"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"移开手指，然后再次触摸传感器"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"无法使用指纹传感器"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"请联系维修服务提供商。"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"屏幕关闭时使用指纹解锁功能"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"即使屏幕处于关闭状态，也能使用指纹解锁功能"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"屏幕关闭, 解锁"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"更多安全设置"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"工作资料锁定、加密等"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"加密、凭据等"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"为您的私密空间设置解锁图案"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"锁定"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"隐藏"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"确认您的私密空间解锁图案"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"重新输入您的私密空间 PIN 码"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"重新输入您的私密空间密码"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个指纹"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"您添加的指纹数量已达到上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"无法添加更多的指纹"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"已打开"</string>
     <string name="external_display_off" msgid="5634413756025351374">"已关闭"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"外接显示器"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"内置显示屏"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"使用外接显示器"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"显示分辨率"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"外接显示器已断开连接"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"更改旋转角度或分辨率可能会导致当前正在运行的任何应用停止运行"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"设备必须连接到外接显示器，才能镜像您的屏幕"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"更多选项"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"按住并拖动即可重新排列显示屏。"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投屏"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"镜像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"开启无线显示"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"请检查密码，然后重试"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"请与设备制造商联系"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"请检查连接状况，然后重试"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"此 WLAN 网络暂时无法使用"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"此二维码存在问题。请试试其他连接方式。"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"选择网络"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"要连接设备，请选择一个网络"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"要将此设备添加到“<xliff:g id="SSID">%1$s</xliff:g>”吗？"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"详细了解自动屏幕旋转"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"屏幕分辨率"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"高分辨率"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"完整分辨率"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"完整分辨率会增加耗电量。切换分辨率可能会导致一些应用重启。"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"最大分辨率"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"最大分辨率会增加耗电量。切换分辨率可能会导致一些应用重启。"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"已选择"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"颜色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然色"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"自适应"</string>
     <string name="brightness" msgid="6216871641021779698">"亮度"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"自适应亮度"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"自适应亮度简介"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"系统会根据您的环境和活动自动调节屏幕亮度。您可以手动移动滑块，帮助“自适应亮度”功能了解您偏好的亮度。"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"已开启"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"已关闭"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"睡眠模式设置"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{模式也可以启用深色主题}=1{“{mode_1}”也会启用深色主题}=2{“{mode_1}”和“{mode_2}”也会启用深色主题}=3{“{mode_1}”“{mode_2}”和“{mode_3}”也会启用深色主题}other{“{mode_1}”“{mode_2}”和另外 # 种模式也会启用深色主题}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"模式设置"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"调得更暗"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"极暗"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"允许将设备屏幕调得比通常更暗"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"自动锁屏"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允许应用和服务随时扫描附近的设备（即使蓝牙已关闭）。例如，这可用于改进基于位置信息的功能和服务。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"位置信息服务"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"位置信息服务"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"使用位置信息"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"使用位置信息确定时区"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"无法自动设置时区"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"位置信息或位置信息服务已关闭"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"位置信息设置"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"解决此问题"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"取消"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自动检测时区功能已关闭"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"当“自动检测时区”功能处于关闭状态时，不可用"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"系统可能会根据位置信息设置时区"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"如果您的设备位置信息可用，系统可能会使用该信息来设定您的时区"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"查看法律信息、状态和软件版本"</string>
     <string name="legal_information" msgid="7509900979811934843">"法律信息"</string>
     <string name="manual" msgid="3651593989906084868">"手册"</string>
@@ -1938,14 +1962,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"选项"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"无障碍功能"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"实体键盘"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"防抖键"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"键盘会忽略 <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒内快速重复按下同一按键的操作"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"键盘会忽略快速重复按下同一按键的操作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"防抖键阈值"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"选择键盘忽略重复按键操作的时长"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 秒"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 秒"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 秒"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"自定义"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"自定义值"</string>
     <string name="slow_keys" msgid="2891452895499690837">"慢速键"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"将按键启用时长调整为 <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"调整启用按键操作所需的时长"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"粘滞键"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"只需一次按下一个键即可执行快捷操作，而不用同时按住多个键"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"鼠标键"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"使用实体键盘控制鼠标。"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"使用鼠标键"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用键盘来控制指针"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"鼠标反向滚动"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上滚动可使页面内容向下移动"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"切换左键和右键"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"将鼠标左键用作右键"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"“<xliff:g id="KEYBOARD_NAME">%s</xliff:g>”的鼠标键"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"按 <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> 键表示移动鼠标指针"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"按 <xliff:g id="CLICK_LABEL">%s</xliff:g> 键表示点击鼠标主键"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"按 <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> 键表示按住鼠标主键"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"按 <xliff:g id="RELEASE_LABEL">%s</xliff:g> 键表示释放鼠标主键"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"按 <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> 键可切换滚动模式，这样按 <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> 键就会将视图向上、向下、向左或向右滚动"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"按 <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> 键表示点击鼠标辅助键"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"键盘快捷键"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"显示快捷键列表"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作资料键盘和工具"</string>
@@ -1953,6 +1998,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"默认"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"触控板"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"触控板和鼠标"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"鼠标"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"指针速度，手势"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"点按即点击"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"点按拖动"</string>
@@ -1964,6 +2010,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"点按右下角"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"点按触控板的右下角即可查看更多选项"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"指针速度"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"使用三指点按"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"指针颜色"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"将指针填充样式更改为黑色"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"将指针填充样式更改为绿色"</string>
@@ -1978,6 +2025,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"了解触控板手势"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"触控板, 鼠标, 光标, 滚动, 滑动, 右键点击, 点击, 指针, trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"右键点击, 点按, right click, tap"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"点击鼠标中键"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"启动助理"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"前往主屏幕"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"返回"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"查看最近用过的应用"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"前往主屏幕"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"在触控板上的任意位置用三根手指向上滑动"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"返回"</string>
@@ -2014,6 +2066,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"为<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>选择新的辅助键："</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"实体键盘无障碍功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"粘滞键、防抖键、鼠标键"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"重复输入按键字符"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"开始重复输入前的延迟时间"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"重复速率"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"按住某个按键即重复输入其对应的字符，直到松开该按键为止"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"“<xliff:g id="IME_LABEL">%s</xliff:g>”布局"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"默认"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"自动选择的布局：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2241,7 +2297,7 @@
     <string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"详细了解“无障碍”按钮和无障碍功能启动手势"</string>
     <string name="accessibility_button_intro" msgid="2601976470525277903">"请使用“无障碍”按钮。该手势不能与“三按钮”导航搭配使用。"</string>
     <string name="accessibility_button_summary" msgid="8510939012631455831">"快速使用无障碍功能"</string>
-    <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"&lt;b&gt;如要开始使用此功能，请按以下步骤操作：&lt;/b&gt;&lt;br/&gt; {0,number,integer}. 前往无障碍设置&lt;br/&gt; {1,number,integer}. 选择一项功能并点按相应快捷方式&lt;br/&gt; {2,number,integer}. 选择要使用按钮还是手势来使用该功能&lt;br/&gt;"</string>
+    <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"&lt;b&gt;如要开始使用此功能，请按以下步骤操作：&lt;/b&gt;&lt;br/&gt; {0,number,integer}. 前往无障碍设置&lt;br/&gt; {1,number,integer}. 选择一项功能并点按相应快捷方式&lt;br/&gt; {2,number,integer}. 选择要通过按钮还是手势来使用该功能&lt;br/&gt;"</string>
     <string name="accessibility_button_description" msgid="7669538706120092399">"&lt;b&gt;如要开始使用此功能，请按以下步骤操作：&lt;/b&gt;&lt;br/&gt; {0,number,integer}. 前往无障碍设置&lt;br/&gt; {1,number,integer}. 选择一项功能并点按相应快捷方式&lt;br/&gt; {2,number,integer}. 选择相应按钮以使用此功能&lt;br/&gt;"</string>
     <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"使用按钮或手势"</string>
     <string name="accessibility_button_location_title" msgid="7182107846092304942">"位置"</string>
@@ -2418,7 +2474,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"预览"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"标准选项"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"语言"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"文字大小"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕样式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自定义选项"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景颜色"</string>
@@ -2545,6 +2601,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"省电提示"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"包含的软件包"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"应用正常运行中"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"建议更换电池"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"电池容量和充电性能下降，建议更换电池。"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"电池电量低"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"开启省电模式可延长电池续航时间"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"延长电池续航时间"</string>
@@ -2630,7 +2688,7 @@
     <string name="battery_saver_pref_auto_routine_summary" msgid="4739240095966241508">"将会按照您的日常安排启用"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"根据电量百分比"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"根据您平常的充电时间，如果电池电量可能会在下次充电之前耗尽，则开启省电模式"</string>
-    <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"将在电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时开启"</string>
+    <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"将在电量剩余 <xliff:g id="PERCENT">%1$s</xliff:g> 时开启"</string>
     <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>
@@ -2962,6 +3020,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要断开与此 VPN 的连接吗？"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"断开连接"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> 版"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"取消保存 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要替换现有 VPN 吗？"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要设置始终开启的 VPN 吗？"</string>
@@ -3384,7 +3443,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"“工作日上午 9 点到下午 5 点”"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"日历活动"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{已启用“{mode_1}”模式}=2{已启用“{mode_1}”和“{mode_2}”模式}=3{已启用“{mode_1}”“{mode_2}”和“{mode_3}”模式}other{已启用“{mode_1}”“{mode_2}”以及另外 # 个模式}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{1 个模式可以自动开启}other{# 个模式可以自动开启}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{勿扰}=1{{mode_1}}=2{{mode_1}、{mode_2}}other{{mode_1}、{mode_2}、{mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"已启用"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"未设置"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"已停用"</string>
@@ -3509,15 +3568,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"知道了"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"通知"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"时长"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"消息、活动和提醒"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"开启勿扰模式后，系统会忽略消息、提醒和活动（您在上方允许的几项内容除外）。您可以调整消息设置，方便亲朋好友或其他联系人与您联系。"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"完成"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"设置"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"不显示通知，也不发出通知提示音"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"不发出通知提示音"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"您将不会看到通知或听到通知提示音。允许已加星标的联系人和重复来电者的来电。"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"（当前设置）"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"要更改勿扰模式的通知设置吗？"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"工作资料提示音"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"使用个人资料提示音"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"使用与您的个人资料相同的提示音"</string>
@@ -3586,8 +3636,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"解锁后直接进入上次使用的界面。锁屏状态下不会显示通知。从屏幕顶部向下滑动可查看通知。"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"锁定屏幕, 锁屏, 跳过, 绕过"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"当工作资料锁定时"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"尽可能减少锁定屏幕上显示的通知"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"在锁定屏幕上少显示些通知"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"锁屏时仅显示新通知"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"自动从锁定的屏幕中移除之前看过的通知"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"锁屏通知"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"显示对话通知、默认通知和无声通知"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"显示默认对话和已设为静音的对话"</string>
@@ -3605,6 +3665,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"显示所有工作通知内容"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"隐藏敏感工作内容"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"在设备锁定时，您希望个人资料通知如何显示？"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3763,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"如果您在短时间内收到很多通知，设备音量和提醒次数会逐渐降低，最长持续 2 分钟。电话、闹钟和优先对话不受影响。\n\n您可以从屏幕顶部向下拉，查看音量渐降期间收到的通知。"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"应用于工作资料"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"应用于工作资料应用"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"捆绑式通知"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"开启"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"关闭"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"使用通知捆绑功能"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"系统会将主题相似的通知静音并归为一组，以提供更安静的体验。这种捆绑处理会覆盖应用自身的通知设置。"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服务"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"没有任何已安装的应用请求以 VR 助手服务的形式运行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允许<xliff:g id="SERVICE">%1$s</xliff:g>访问 VR 服务吗？"</string>
@@ -3803,6 +3876,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"优先对话"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"无"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{无}=1{1 个对话}other{# 个对话}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"对话设置"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的联系人"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"即使您已经屏蔽了消息和通话应用的通知，此处列出的联系人仍可以通过这些应用联系到您"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通话"</string>
@@ -3826,6 +3900,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"联系人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星标的联系人"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"通讯录设置"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"与已加星标的联系人相关的设置"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"无"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"无"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"闹钟"</string>
@@ -3855,6 +3931,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g>（工作）"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"正在计算…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"应用设置"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允许应用覆盖"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外的应用"</string>
@@ -3897,6 +3974,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"创建模式"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自定义模式"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名称"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"模式名称不能为空"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"选择一个图标"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"日历活动"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"“睡觉”日常安排"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"驾车时"</string>
@@ -4151,6 +4230,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"全屏通知"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"允许此应用显示全屏通知"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"允许此应用在设备锁定时全屏显示通知。应用可利用全屏通知突出显示闹钟、来电或其他紧急通知。"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"写入系统偏好设置"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"允许此应用代表您修改系统偏好设置"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"此权限允许应用修改核心系统偏好设置。"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"媒体管理应用"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"允许应用管理媒体"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"如果允许，此应用可以直接修改或删除通过其他应用创建的媒体文件，而无需事先征得您的同意。应用必须获得权限才能访问文件和媒体。"</string>
@@ -4295,7 +4377,7 @@
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"添加其他指纹"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"使用其他指纹解锁"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"已开启"</string>
-    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"在电量降到 <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g> 时开启"</string>
+    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"将在电量剩余 <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g> 时开启"</string>
     <string name="battery_saver_off_summary" msgid="4411561435493109261">"已关闭"</string>
     <string name="app_battery_usage_title" msgid="346558380609793334">"应用的电池使用情况"</string>
     <string name="app_battery_usage_summary" msgid="6349965904306339539">"设置应用如何使用电池"</string>
@@ -4396,6 +4478,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"手势"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"快速打开相机"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"在任意界面按两次电源按钮，即可快速打开相机。"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"翻转切换自拍模式"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"导航模式"</string>
@@ -4793,11 +4889,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"卫星消息"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"通过卫星收发短信。您的账号支持此功能。"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"通过卫星收发短信。您的账号不支持此功能。"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"卫星消息"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"关于卫星消息功能"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"卫星消息, 卫星连接, Satellite messaging, satellite connectivity"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"关于<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"您可以使用符合条件的<xliff:g id="CARRIER_NAME">%1$s</xliff:g>账号通过卫星收发短信。"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"您的<xliff:g id="CARRIER_NAME">%1$s</xliff:g>套餐"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"您的账号支持卫星消息功能"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"您的账号支持消息功能"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"您的账号不支持卫星消息功能"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"了解详情"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"运作方式"</string>
@@ -4805,10 +4901,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"您的手机会自动连接到卫星。为获得最佳连接质量，请确保您身在能清楚看到天空的场所。"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"当您的手机连接到卫星后"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"您可以给任何对象发短信，包括应急服务机构。当有可用的移动网络时，您的手机将重新连接到移动网络。"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"卫星消息可能需要较长时间才会送达，而且此功能目前仅覆盖部分地区。天气和某些建筑物可能会影响卫星连接质量。不支持卫星通话。紧急呼叫或许仍可连通。\n\n账号更改可能要过一段时间才能显示在“设置”中。请联系您的运营商了解详情。"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"详细了解卫星消息功能"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>可能需要较长时间才会送达，而且此功能目前仅覆盖部分地区。天气和某些建筑物可能会影响卫星连接质量。不支持卫星通话。但紧急呼叫有可能连通。\n\n账号更改可能要过一段时间才能显示在“设置”中。详情请联系<xliff:g id="CARRIER_NAME">%1$s</xliff:g>查询。"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"关于<xliff:g id="SUBJECT">%1$s</xliff:g>的更多信息"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"无法开启<xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"若要开启<xliff:g id="FUNCTION">%1$s</xliff:g>，请先断开卫星连接"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"卫星连接"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"卫星连接"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"卫星连接"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"卫星消息"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"您的账号支持卫星数据传输功能"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"卫星紧急呼救"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"当您无法连接到移动网络或 WLAN 网络时，可与应急服务互发消息"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"卫星紧急呼救, 紧急呼救, satellite sos, sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"关于卫星紧急呼救"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"当您无法连接到移动网络或 WLAN 网络时，您可以与应急服务互发消息并分享您的位置信息。此服务在某些时间、地点或情形下可能无法使用。"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"向应急服务致电或发短信"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"回答有关紧急情况的问题"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"按照步骤连接到卫星"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"如果没有移动网络，您将看到使用“卫星紧急呼救”的选项"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"向应急服务发送回答，以获得合适的帮助"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"连接后，您可以与应急服务互发消息"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"试用演示"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"当您通过卫星联系应急服务时，您的姓名、电子邮件地址、电话号码、位置信息、设备信息（IMEI、语言、型号、电池电量）和紧急情况联系人信息将与应急服务及卫星服务提供商分享。\n\n若要使用“卫星紧急呼救”功能，您必须将“Google 信息”设为默认短信应用。\n\n如果自动选择网络功能处于关闭状态，系统会将其开启，您的设备将自动连接到任何网络。"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"分享偏好设置"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"紧急情况联系人"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"您的 Google 账号"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"查看或更新将与应急服务分享的信息"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"接入点名称"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"连接到<xliff:g id="CARRIER">%1$s</xliff:g>时无法使用"</string>
@@ -4995,6 +5115,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"您正处于 16KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须切换回 4KB 模式并锁定设备的引导加载程序。这样会再次将设备恢复出厂设置，使其还原为生产设置。待设备成功启动到 Android 系统后，在开发者选项中停用 OEM 解锁。如果设备未能启动到 Android 系统或不稳定，请使用最新出厂映像 (&lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;) 重新刷写设备，或者前往 &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; 选择“擦除设备数据”>“锁定引导加载程序”>“强制刷写所有分区”。"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB 页面通用模式"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"了解详情"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"以页面大小兼容模式运行应用"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug 报告处理程序"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"确定要使用哪款应用来处理设备上的错误报告快捷方式。"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"个人"</string>
@@ -5433,7 +5556,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"收听音频流"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"扫描音频流二维码即可通过“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”收听"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"分享期间无法修改密码。若要更改密码，请先关闭“音频分享”功能。"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"您的密码必须包含 4-16 个字符，并且只能使用字母、数字和符号"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"二维码扫描器"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"需要帮助？"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"在设置中搜索"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"联系人, 存储, 账号, contacts, storage, account"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"联系人存储"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"仅限设备"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新联系人不会与账号同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"默认情况下，系统会将联系人保存到您的设备并同步到您的账号"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"设置默认账号时出错"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"未设置默认账号"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"仅限设备"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"设备和%1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"添加账号即可开始"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"联系人信息保存位置"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"圈定即搜"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"轻触并按住主屏幕按钮或导航手柄，即可使用屏幕上的内容进行搜索。"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index fa3cd2949b0..190589a276c 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"雪花"</item>
     <item msgid="7952183800501346803">"沙灘傘"</item>
     <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帳篷"</item>
+    <item msgid="8112685757657659269">"鋼琴"</item>
     <item msgid="3861584909935022342">"菲林卷軸"</item>
     <item msgid="5827426100157335512">"書籍"</item>
     <item msgid="8585828346253128384">"蓮花"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9b8d515aace..21f47cec469 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"配對新裝置"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"藍牙"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自動開啟"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"藍牙關閉後會於翌日重新開啟"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"配對右耳"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"配對左耳"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"配對另一耳的裝置"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"停用藍牙 LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"如果裝置支援 LE Audio 硬件功能，則停用藍牙 LE Audio 功能。"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"藍牙 LE Audio 模式"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"啟用藍牙 LE Audio 廣播使用者介面預覽"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"啟用藍牙 LE Audio 廣播使用者介面預覽，包括個人音訊分享功能和私人廣播"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"在「裝置詳情」中顯示 LE Audio 切換按鈕"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"繞過藍牙 LE Audio 許可名單"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"即使 LE Audio 周邊裝置未通過符合許可清單條件的驗證，系統仍會預設使用 LE Audio。"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"應用程式語言"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"建議的語言"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"所有語言"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"建議"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"所有語言"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"所有地區"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"所有數字系統"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"系統語言"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"系統預設"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"「設定」中不提供此應用程式的語言選擇。"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"變更"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"「%s」無法使用"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"此語言無法作為系統語言，但你已在應用程式和網站上將此設定為偏好語言。"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"搜尋"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"新增語言"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"地區偏好設定"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"輸入語言名稱"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"更多語言設定"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"地區偏好設定"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"設定單位及數字偏好設定"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"讓應用程式存取地區偏好設定，為你提供個人化體驗。"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"應用程式會在可行情況使用你的地區偏好設定。"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"地區偏好設定"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"溫度"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"每週的第一天"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"數字偏好設定"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"漫遊時連線到數據服務"</string>
     <string name="roaming_disable" msgid="729512894708689604">"漫遊時連線到數據服務"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"可能需要支付漫遊費用。"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"自動設定時間"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"自動設定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"此切換鈕開啟時，系統會利用位置資訊設定時區"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"自動設定日期和時間"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"使用網絡和無線訊號自動設定"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"自動設定時區"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"根據你附近的流動網絡自動設定"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"使用裝置位置 (如已開啟) 自動設定"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時間"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"提起手指，然後再次輕觸感應器"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"無法使用指紋感應器"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"請諮詢維修服務供應商。"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"螢幕關閉指紋解鎖"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"即使螢幕關閉，仍使用「指紋解鎖」"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"螢幕關閉、解鎖"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"更多安全性設定"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"工作設定檔鎖定、加密等"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"加密、憑證等"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"設定私人空間上鎖圖案"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"鎖定"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"隱藏"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"確認輸入私人空間圖案"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"重新輸入私人空間 PIN"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"重新輸入私人空間密碼"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"你最多可以加入 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"你加入指紋的數目已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"無法加入更多指紋"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"開啟"</string>
     <string name="external_display_off" msgid="5634413756025351374">"關閉"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"外部顯示屏"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"內建螢幕"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"使用外部顯示屏"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"顯示屏解像度"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"外部顯示屏已解除連接"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"變更旋轉角度或解像度，可能會導致任何執行中的應用程式停止運作"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"裝置必須連接至外部顯示屏，才能鏡像投射畫面內容"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"更多選項"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"按住並拖曳即可重新整理顯示屏位置。"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"請檢查密碼，然後再試一次"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"請聯絡裝置製造商"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"請檢查網絡連線，然後再試一次"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"目前無法使用此 Wi-Fi 網絡"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"此 QR 碼出現問題，請改用其他方式連線。"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"選擇網絡"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"如要連接裝置，請選擇網絡"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"要將此裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」嗎？"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"進一步了解自動旋轉"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"螢幕解像度"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"高解像度"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"全解像度"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"全解像度耗電量較高。切換解像度後，部分應用程式可能會重新啟動。"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"最大解析度"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"使用最大解析度會比較耗電。如果切換解析度，部分應用程式可能會重新啟動。"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"揀咗"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"顏色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"自動調整"</string>
     <string name="brightness" msgid="6216871641021779698">"亮度"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"自動調校光暗"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"關於自動調校光暗"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"系統會根據你所在的環境和活動自動調校螢幕光暗。你可以移動滑桿，幫助自動調校光暗功能瞭解你偏好的亮度。"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"開"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"關閉"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"睡眠模式設定"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{「模式」也可啟用深色主題背景}=1{「{mode_1}」也可啟用深色主題背景}=2{「{mode_1}」和「{mode_2}」也可啟用深色主題背景}=3{{mode_1}、{mode_2}和{mode_3}也可啟用深色主題背景}other{「{mode_1}」、「{mode_2}」和其他 # 個「模式」也可啟用深色主題背景}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"「模式」設定"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"再暗一點"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"超暗"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"允許裝置比平時暗"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"螢幕逾時"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"定位服務"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"定位服務"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"使用位置資訊"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"使用位置設定時區"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"無法自動設定時區"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"位置或定位服務已關閉"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"位置設定"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"修正此問題"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"取消"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自動設定時區功能已關閉"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"自動設定時區功能關閉時無法使用"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"設定時區時可能需要位置資訊"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"如你已開啟裝置位置，系統可能會使用裝置位置設定時區"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"查看法律資訊、狀態、軟件版本"</string>
     <string name="legal_information" msgid="7509900979811934843">"法律資訊"</string>
     <string name="manual" msgid="3651593989906084868">"手動"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"選項"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"無障礙功能"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"實體鍵盤"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"實體鍵盤配置挑選器"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"彈跳鍵"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"鍵盤會忽略在 <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒內快速重覆按下同一按鍵的動作"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"鍵盤會忽略快速重覆按下同一按鍵的動作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"彈跳鍵門檻"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"選擇鍵盤忽略重覆按鍵的時間長度"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 秒"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 秒"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 秒"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"自訂"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"自訂值"</string>
     <string name="slow_keys" msgid="2891452895499690837">"緩慢鍵"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"將按鍵啟動時間調整為 <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"調整按鍵啟動時間"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"相黏鍵"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"一次按下快速鍵中的一個鍵，而非同時按住多個鍵"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"滑鼠按鍵"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"使用實體鍵盤控制滑鼠"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"使用滑鼠按鍵"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用鍵盤控制游標"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"滑鼠反向捲動"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上捲動即可將頁面向下移動"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"調換左右鍵"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"將滑鼠左鍵當右鍵使用"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"「<xliff:g id="KEYBOARD_NAME">%s</xliff:g>」的滑鼠按鍵"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"使用 <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> 鍵即可移動滑鼠游標"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"使用 <xliff:g id="CLICK_LABEL">%s</xliff:g> 鍵即可按一下滑鼠主要按鍵"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"使用 <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> 鍵即可按住滑鼠主要按鍵"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"使用 <xliff:g id="RELEASE_LABEL">%s</xliff:g> 鍵即可放開滑鼠主要按鍵"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"使用 <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> 鍵即可切換捲動模式。這樣，按下 <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> 鍵便可將檢視畫面向上、向下、向左或向右捲動"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"使用 <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> 鍵即可按一下滑鼠次要按鍵"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"鍵盤快速鍵"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"顯示快速鍵清單"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作設定檔鍵盤與工具"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"預設"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"觸控板"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"觸控板及滑鼠"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"滑鼠"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"游標速度、手勢"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"點按"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"輕按並拖曳"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"點擊右下角"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"點擊觸控板右下角，即可查看更多選項"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"游標速度"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"三指輕按"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"游標顏色"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"變更游標填滿樣式至黑色"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"變更游標填滿樣式至綠色"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"學習觸控板手勢"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"觸控板, 滑鼠, 鼠標, 捲動, 輕掃, 按一下右鍵, 點擊, 游標"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"按一下右鍵, 輕按"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"按一下中間鍵"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"啟動「Google 助理」"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"返回主畫面"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"返回"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"查看最近使用的應用程式"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"返回主畫面"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"用三隻手指在觸控板的任何位置向上滑動"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"返回"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵："</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"實體鍵盤無障礙功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"相黏鍵、篩選鍵、滑鼠鍵"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"重複輸入按鍵"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"重複前的延遲時間"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"重複率"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"按住按鍵即可重複輸入按鍵上的字元，直到放開為止"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> 版面配置"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"自動：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"預覽"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"標準選項"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"語言"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"文字大小"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕樣式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自訂選項"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景顏色"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"已包含套件"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"應用程式運作正常"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"建議更換電池"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"電池容量和充電效能已降低，建議更換電池。"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"電量不足"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"開啟慳電模式可延長電池壽命"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"延長電池壽命"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要解除連結此 VPN 嗎？"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"中斷連線"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"版本 <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"刪除 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要取代目前的 VPN 嗎？"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要設定保持開啟的 VPN 嗎？"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"「平日上午 9 時至下午 5 時」"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"日曆活動"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{已啟用{mode_1}}=2{已啟用{mode_1}和{mode_2}}=3{已啟用{mode_1}、{mode_2}和{mode_3}}other{已啟用{mode_1}、{mode_2}和其他 # 個模式}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{可自動啟動 1 個模式}other{可自動啟動 # 個模式}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{請勿騷擾}=1{{mode_1}}=2{{mode_1}、{mode_2}}other{{mode_1}、{mode_2}、{mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"開啟"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"未設定"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"已停用"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"知道了"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"通知"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"持續時間"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"訊息、活動和提醒"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"開啟「請勿騷擾」模式時，除了你在上方允許的項目外，所有訊息、提醒和活動均會設為靜音。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"完成"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"設定"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"不顯示或發出音效通知"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"不發出音效通知"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"你不會看到或聽到通知，但允許顯示已加星號的聯絡人和重複來電者的來電。"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(目前設定)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"要變更「請勿騷擾」通知設定嗎？"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"工作設定檔音效"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"使用個人設定檔音效"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"使用與個人設定檔相同的音效"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"解鎖後直接前往上次使用的畫面。通知不會在上鎖畫面上顯示。從頂部向下滑動，即可查看通知。"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"上鎖畫面, 鎖定螢幕, 略過, 繞過"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"當工作設定檔鎖定時"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"減少上鎖畫面通知"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"減少在上鎖畫面上顯示通知"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"在上鎖畫面上只顯示新通知"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"自動移除上鎖畫面上先前查看過的通知"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"上鎖畫面上的通知"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"顯示對話通知、預設通知和已靜音通知"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"顯示預設對話和靜音對話"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"顯示所有工作通知內容"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"隱藏敏感的工作內容"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"裝置鎖定時，應如何顯示個人檔案通知？"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"當你在短時間內收到太多通知時，裝置就會調低音量並減少通知數量最多兩分鐘。通話、鬧鐘和優先對話則不受影響。\n\n要查看緩和期間收到的通知，可從螢幕頂部向下掃。"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"套用至工作設定檔"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"套用至工作設定檔應用程式"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"分類通知"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"開啟"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"關閉"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"使用通知分類功能"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"主題相近的通知會設定為靜音並分類，提供不受干擾的使用體驗。通知分類功能會覆寫應用程式本身的通知設定。"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有已安裝的應用程式要求提供 VR 助手服務。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允許 VR 服務存取 <xliff:g id="SERVICE">%1$s</xliff:g> 嗎？"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"優先對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"對話設定"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"誰可以打擾"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"即使訊息和通話應用程式不可通知你，以上指定使用者仍可透過這些應用程式聯絡你"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"通訊錄設定"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"有星號標記嘅聯絡人設定"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"無"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"無"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"鬧鐘"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (工作)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"正在計算…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"應用程式設定"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式取代「請勿騷擾」"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外可打擾的應用程式"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"建立模式"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自訂模式"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名稱"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"模式名稱不可留空"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"選擇圖示"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"日曆活動"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"瞓覺日常安排"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"駕駛時"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"全螢幕通知"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"允許此應用程式的全螢幕通知"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"允許此應用程式在裝置上鎖時顯示全螢幕通知。應用程式可能會利用這些通知突顯鬧鐘、來電或其他緊急通知。"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"寫入系統偏好設定"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"允許此應用程式代表你修改系統偏好設定"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"此權限允許應用程式修改核心系統偏好設定。"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"媒體管理應用程式"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"允許應用程式管理媒體"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"如允許此設定，此應用程式可在未通知你的情況下，直接修改或刪除以其他應用程式建立的媒體檔案。使用者必須擁有檔案和媒體的存取權。"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"手勢"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"快速開啟相機"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"在任何畫面上按開關按鈕兩下，即可快速開啟相機。"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"反轉相機自拍"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"導覽模式"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"衛星訊息"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"透過衛星收發短訊。你的帳戶支援此功能。"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"透過衛星收發短訊。你的帳戶不支援此功能。"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"衛星訊息"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"關於衛星訊息"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"衛星訊息, 衛星連線"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"關於<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"合資格的 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 帳戶支援透過衛星收發訊息"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"你的 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 計劃"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"你的帳戶支援衛星訊息"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"你的帳戶支援訊息功能"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"你的帳戶不支援衛星訊息"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"瞭解詳情"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"運作方式"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"手機將自動連接衛星。在清楚看到天空的的地方可獲得最佳連線。"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"手機連接衛星後"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"你可發短訊給任何人，包括緊急服務。如果有可用的流動網絡，手機就會重新連線。"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"衛星訊息可能需要比較長的時間才會送達，而且此功能只支援部分地區。天氣和特定結構可能會影響衛星連線。系統不支援衛星電話，但緊急電話可能仍能接通。\n\n「設定」頁面可能要一段時間後才會顯示帳戶變動，詳情請聯絡流動網絡供應商。"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"進一步瞭解衛星訊息"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>可能需要比較長的時間才會送達，而且這項功能僅支援部分地區。天氣和特定結構可能會影響衛星連線的品質。系統不支援衛星電話，但你仍可撥打緊急電話。\n\n「設定」頁面可能要一段時間後才會顯示帳戶變動，詳情請洽「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」。"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"進一步瞭解<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"無法開啟<xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"如要開啟<xliff:g id="FUNCTION">%1$s</xliff:g>，請先中斷衛星連線"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"衛星連接"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"衛星連線"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"衛星連線"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"衛星訊息"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"你的帳戶可透過衛星傳送資料"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"緊急衛星連線"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"無法連上 Wi-Fi 或行動網路時，仍可與緊急救援服務互傳訊息"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"緊急衛星連線, 緊急"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"關於緊急衛星連線"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"沒有 Wi-Fi 或行動網路時，可以與緊急救援服務互傳訊息，並分享位置資訊。這項服務在某些地點或情況下可能無法使用。"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"撥打電話或傳送訊息給緊急救援服務"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"回答有關緊急情況的問題"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"按照步驟連上衛星"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"如果沒有行動網路，就會看到使用緊急衛星連線的選項"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"傳送回答給緊急救援服務，以便為你提供適當協助"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"連線後，就能與緊急救援服務互傳訊息"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"立即試用"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"透過衛星聯絡緊急救援服務時，系統會將你的姓名、電子郵件地址、電話號碼、所在位置、裝置資訊 (IMEI、語言、型號、電池電量) 和緊急聯絡人資訊分享給緊急救援服務和衛星服務供應商。\n\n如要使用緊急衛星連線，必須將 Google 訊息設為預設訊息應用程式。\n\n如果自動選擇網路功能處於關閉狀態，系統會將其開啟，讓裝置自動連線到任何網路。"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"分享偏好設定"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"緊急聯絡人"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"你的 Google 帳戶"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"查看或更新分享給緊急救援服務的資訊"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"存取點名稱"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連接至<xliff:g id="CARRIER">%1$s</xliff:g>時使用"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"你目前處於頁面通用模式的 16 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須切換回 4 KB 模式，然後鎖定裝置的啟動程式。此操作會再次將裝置回復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 後，請在開發人員選項中停用 OEM 解鎖設定。如裝置無法啟動 Android 或不穩定，請透過以下其中一種方式更新裝置：使用 &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt; 中的最新原廠映像，或使用 &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; 工具，只要選取 [抹除裝置資料]、[鎖定啟動程式] 及 [強制更新所有分區] 即可。"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB 頁面通用模式"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"閱讀更多"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"以頁面大小兼容模式執行應用程式"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"錯誤報告處理常式"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"選擇裝置上負責處理錯誤報告快速鍵的應用程式。"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"個人"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"收聽串流"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"使用「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」掃瞄音訊串流 QR 碼即可收聽"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"分享音訊期間無法編輯密碼。如要變更密碼，請先關閉音訊分享功能。"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"密碼必須包含 4 至 16 個字元，而且只可使用字母、數字和符號"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR 碼掃瞄器"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"需要協助嗎？"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"通訊錄, 儲存空間, 帳戶"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"「通訊錄」儲存空間"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"只限裝置"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新聯絡人不會與帳戶同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"根據預設，系統會將聯絡人儲存至裝置並同步至你的帳戶"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"設定預設帳戶時發生錯誤"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"沒有預設帳戶"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"只限裝置"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"裝置和 %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"新增帳戶以開始使用"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"聯絡人的儲存位置"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"一圈即搜"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"按住主按鈕或導覽列，就能透過畫面上的內容搜尋。"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index b34f3543faa..876c5d92300 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"雪花"</item>
     <item msgid="7952183800501346803">"沙灘遮陽傘"</item>
     <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帳篷"</item>
+    <item msgid="8112685757657659269">"鋼琴"</item>
     <item msgid="3861584909935022342">"電影膠卷"</item>
     <item msgid="5827426100157335512">"書籍"</item>
     <item msgid="8585828346253128384">"蓮花"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3410fdd14c3..1a006e3bb85 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"配對新裝置"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"藍牙"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自動開啟"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"如果關閉藍牙，隔天會再次開啟"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"配對右耳的裝置"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"配對左耳的裝置"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"配對另一耳的裝置"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"停用藍牙 LE Audio"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"如果裝置支援 LE Audio 硬體功能，就停用藍牙 LE Audio 功能。"</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"藍牙 LE Audio 模式"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"啟用藍牙 LE Audio 廣播使用者介面預覽"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"啟用 LE Audio 分享使用者介面預覽，包括個人音訊分享和私人廣播"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"在「裝置詳細資料」中顯示 LE Audio 切換鈕"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"略過藍牙 LE Audio 許可清單"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"即使 LE Audio 周邊裝置未經過驗證，尚未確認符合許可清單的條件，系統仍會預設使用 LE Audio。"</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"應用程式語言"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"建議語言"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"所有語言"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"建議"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"所有語言"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"所有地區"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"所有編號系統"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"系統語言"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"系統預設"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"無法從「設定」選取這個應用程式的語言。"</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"變更"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"「%s」無法使用"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"這個語言無法做為系統語言，但你已在應用程式和網站上將此設為偏好語言。"</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"搜尋"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"新增語言"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"地區偏好設定"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"請輸入語言"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"更多語言設定"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"地區偏好設定"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"設定單位和數字偏好設定"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"讓應用程式取得地區偏好設定，為你提供個人化體驗。"</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"應用程式會盡可能採用你的地區偏好設定。"</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"地區偏好設定"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"溫度"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"一週的第一天"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"數字顯示方式偏好"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"漫遊時連線到數據傳輸服務"</string>
     <string name="roaming_disable" msgid="729512894708689604">"漫遊時連線到數據傳輸服務"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"可能要支付漫遊費用。"</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"自動設定時間"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"自動設定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"這個切換鈕開啟時，系統會根據位置資訊設定時區"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"自動判斷日期和時間"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"使用網路和無線訊號自動設定"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"自動判定時區"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"根據附近的行動網路自動設定"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"使用裝置位置資訊自動設定 (如有)"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時間"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"移開手指，然後再次輕觸感應器"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"指紋感應器無法使用"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"請洽詢維修供應商。"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"在螢幕關閉時用指紋解鎖"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"即使螢幕關閉，也能使用指紋解鎖"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"螢幕關閉, 解鎖"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"其他安全性設定"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"工作資料夾鎖定、加密等等"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"加密、憑證等等"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"設定私人空間的解鎖圖案"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"鎖定"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"隱藏"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"確認私人空間的解鎖圖案"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"重新輸入私人空間 PIN 碼"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"重新輸入私人空間密碼"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"你新增的指紋數量已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"無法新增其他指紋"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"開啟"</string>
     <string name="external_display_off" msgid="5634413756025351374">"關閉"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"外接螢幕"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"內建螢幕"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"使用外接螢幕"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"螢幕解析度"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"未連接外接螢幕"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"變更旋轉角度或解析度，可能會導致執行中的應用程式停止運作"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"裝置必須連接外接螢幕，才能鏡像投放畫面"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"更多選項"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"按住並拖曳即可重新排列螢幕。"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"請檢查輸入的密碼是否正確，然後再試一次"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"請與裝置製造商聯絡"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"請檢查連線狀況，然後再試一次"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"這個 Wi‑Fi 網路目前無法使用"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"這個 QR code 有問題，請試試其他連線方式。"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"選擇網路"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"選擇裝置要連線的網路"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"要將這個裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」嗎？"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"進一步瞭解「自動旋轉」功能"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"螢幕解析度"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"高解析度"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"全解析度"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"使用全解析度會比較耗電。切換解析度可能會導致部分應用程式重新啟動。"</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"最大解析度"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"使用最大解析度會比較耗電。如果切換解析度，部分應用程式可能會重新啟動。"</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"已選取"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"色彩"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"自動調整"</string>
     <string name="brightness" msgid="6216871641021779698">"亮度"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"自動調整亮度"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"關於自動調整亮度"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"系統會根據你所在的環境和從事的活動，自動調整螢幕亮度。你也可以移動滑桿，協助自動調整亮度功能記憶你偏好的亮度。"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"開啟"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"關閉"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"就寢模式設定"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{「模式」也可以啟用深色主題}=1{「{mode_1}」也會啟用深色主題}=2{「{mode_1}」和「{mode_2}」也會啟用深色主題}=3{「{mode_1}」、「{mode_2}」和「{mode_3}」也會啟用深色主題}other{「{mode_1}」、「{mode_2}」和另外 # 個模式也會啟用深色主題}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"「模式」設定"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"將亮度調得更暗"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"超暗"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"允許將裝置螢幕調得比平時暗"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"螢幕自動關閉"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1623,7 +1647,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這項設定有助於改善適地性相關功能和服務等等。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"定位服務"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"定位服務"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"使用位置資訊"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"使用位置資訊設定時區"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"無法自動設定時區"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"位置或定位服務已關閉"</string>
@@ -1634,11 +1658,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"位置資訊設定"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"修正這個問題"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"取消"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自動偵測時區功能已關閉"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"自動判定時區功能關閉時無法使用"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"設定時區時可使用位置資訊"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"如有可用的裝置位置資訊，系統可能會用來設定時區"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"查看法律資訊、狀態、軟體版本"</string>
     <string name="legal_information" msgid="7509900979811934843">"法律資訊"</string>
     <string name="manual" msgid="3651593989906084868">"說明書"</string>
@@ -1938,14 +1962,34 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"選項"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"無障礙"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"實體鍵盤"</string>
+    <string name="physical_keyboard_layout_picker_title" msgid="4526600767648916256">"實體鍵盤配置挑選器"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"彈回鍵"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"鍵盤會忽略在 <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒內快速重覆按下同一按鍵的動作"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"鍵盤會忽略快速重複按下同一按鍵的動作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"彈回鍵門檻"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"選擇鍵盤忽略重複按下按鍵的時間長度"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2 秒"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4 秒"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6 秒"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"自訂"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"自訂值"</string>
     <string name="slow_keys" msgid="2891452895499690837">"延遲感應鍵"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"將按鍵啟動時間調整為 <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"調整按鍵啟動時間"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"相黏鍵"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"一次按下快速鍵中的一個按鍵，而非同時按住多個按鍵"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"滑鼠按鍵"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"使用實體鍵盤控制滑鼠。"</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"啟用滑鼠按鍵"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用鍵盤控制游標"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"滑鼠反向捲動"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上捲動即可將頁面向下移動"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"交換左右按鍵"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"將滑鼠左鍵做為右鍵使用"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"「<xliff:g id="KEYBOARD_NAME">%s</xliff:g>」的滑鼠按鍵"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"按下 <xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> 鍵可移動滑鼠游標"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"按下 <xliff:g id="CLICK_LABEL">%s</xliff:g> 鍵代表點選滑鼠主要按鍵"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"按下 <xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> 鍵表示按住滑鼠主要按鍵"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"按下 <xliff:g id="RELEASE_LABEL">%s</xliff:g> 鍵表示放開滑鼠主要按鍵"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"按下 <xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> 鍵可切換捲動模式。這樣一來，按下 <xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> 鍵就會讓檢視畫面向上、向下、向左或向右捲動"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"按下 <xliff:g id="RELEASE_2_LABEL">%s</xliff:g> 鍵表示點選滑鼠次要按鍵"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"鍵盤快速鍵"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"顯示快速鍵清單"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作資料夾鍵盤和工具"</string>
@@ -1953,6 +1997,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"預設"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"觸控板"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"觸控板與滑鼠"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"滑鼠"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"游標速度、手勢"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"點按"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"輕觸拖曳"</string>
@@ -1964,6 +2009,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"按一下右下角"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"按一下觸控板的右下角即可查看更多選項"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"游標速度"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"使用三指輕觸"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"游標顏色"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"將指標填滿樣式變更為黑色"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"將指標填滿樣式變更為綠色"</string>
@@ -1978,6 +2024,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"學習觸控板手勢"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"觸控板, 滑鼠, 游標, 捲動, 滑動, 按滑鼠右鍵, 點按, 指標"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"按滑鼠右鍵, 輕觸"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"按中間鍵"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"啟動 Google 助理"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"返回主畫面"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"返回"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"查看最近使用的應用程式"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"返回主畫面"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"在觸控板任一處使用三指向上滑動"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"返回"</string>
@@ -2014,6 +2065,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵："</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"實體鍵盤無障礙功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"相黏鍵、彈回鍵、滑鼠按鍵"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"重複輸入按鍵"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"重複前延遲時間"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"重複速度"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"按住按鍵即可重複輸入按鍵上的字元，直到放開為止"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"「<xliff:g id="IME_LABEL">%s</xliff:g>」版面配置"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"自動選取：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2418,7 +2473,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"預覽"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"標準選項"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"語言"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"文字大小"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕樣式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自訂選項"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景顏色"</string>
@@ -2545,6 +2600,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"已包含封裝檔案"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"應用程式正常執行中"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"建議更換電池"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"電池容量和充電效能降低，建議更換電池。"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"電池電力不足"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"開啟省電模式可延長電池續航力"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"延長電池續航力"</string>
@@ -2962,6 +3019,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要中斷這個 VPN 連線嗎？"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"中斷連線"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"<xliff:g id="VERSION">%s</xliff:g> 版"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"清除 VPN 設定檔"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要取代現有的 VPN 嗎？"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要設定永久連線 VPN 嗎？"</string>
@@ -3384,7 +3442,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"「平日上午 9 點 - 下午 5 點」"</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"日曆活動"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{已啟用「{mode_1}」模式}=2{已啟用「{mode_1}」和「{mode_2}」模式}=3{已啟用「{mode_1}」、「{mode_2}」和「{mode_3}」模式}other{已啟用「{mode_1}」、「{mode_2}」和另外 # 個模式}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{可自動開啟 1 個模式}other{可自動開啟 # 個模式}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{零打擾}=1{{mode_1}}=2{{mode_1}、{mode_2}}other{{mode_1}、{mode_2}、{mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"開啟"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"未設定"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"已停用"</string>
@@ -3443,7 +3501,7 @@
     <string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{沒有顯示變更}=1{{effect_1}}=2{{effect_1}和{effect_2}}=3{{effect_1}、{effect_2}和{effect_3}}other{{effect_1}、{effect_2}和另外 # 個設定}}"</string>
     <string name="zen_mode_allow_all_notifications" msgid="7300894425550960390">"允許所有通知"</string>
     <string name="zen_mode_all_notifications_allowed" msgid="7612213309293552413">"可接受來自使用者、應用程式和音效的干擾"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"如何顯示已過濾的通知"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"已過濾通知的顯示選項"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"開啟「零打擾」模式時"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"不發出通知音效"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"通知會顯示在畫面上"</string>
@@ -3509,15 +3567,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"我知道了"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"通知"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"時間長度"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"訊息、活動和提醒"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"完成"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"設定"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"不顯示通知也不發出音效"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"不發出通知音效"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"你將不會看到或聽到通知。允許已加星號的聯絡人和重複來電者的來電。"</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(目前設定)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"要變更「零打擾」模式的通知設定嗎？"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"工作資料夾音效"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"使用個人資料夾音效"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"使用與個人資料夾相同的音效"</string>
@@ -3586,8 +3635,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"解鎖成功後顯示上次離開的畫面。螢幕鎖定畫面不會顯示通知，如要查看，請從螢幕頂端向下滑動。"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"螢幕鎖定, 鎖定螢幕, 略過, 規避"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"工作資料夾鎖定時"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"減少螢幕鎖定通知"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"減少在螢幕鎖定畫面顯示的通知"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"螢幕鎖定畫面上只顯示新通知"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"自動從螢幕鎖定畫面移除先前看過的通知"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"螢幕鎖定畫面通知"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"顯示對話通知、預設通知和已設為靜音的通知"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"顯示對話通知、預設通知和已設為靜音的通知"</string>
@@ -3605,6 +3664,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"顯示所有工作通知內容"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"隱藏敏感的工作內容"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"當裝置鎖定時，你要如何顯示個人資料通知？"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <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>
@@ -3695,6 +3762,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"如果短時間內收到多則通知，裝置就會降低音量並減少通知數量，持續時間最多 2 分鐘。來電、鬧鐘和重要對話則不受影響。\n\n如要在冷卻期間查看通知，請從螢幕頂端往下拉。"</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"套用至工作資料夾"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"套用到工作資料夾應用程式"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"組合式通知"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"開啟"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"關閉"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"使用通知組合"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"主題相近的通知會設為靜音並分在同一組，為使用者提供不受干擾的使用體驗。通知組合會覆寫應用程式本身的通知設定。"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 小幫手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有任何已安裝的應用程式要求以 VR 小幫手服務的形式執行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 存取 VR 服務嗎？"</string>
@@ -3803,6 +3875,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"重要對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
+    <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"對話設定"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的對象"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"即使訊息和通話應用程式都不會發出通知，你指定的對象仍可透過這些應用程式聯繫到你"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
@@ -3826,6 +3899,8 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"聯絡人設定"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"已加星號的聯絡人設定"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"無"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"無"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"鬧鐘"</string>
@@ -3855,6 +3930,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (工作)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"計算中…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"應用程式設定"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式覆寫"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外的應用程式"</string>
@@ -3897,6 +3973,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"建立模式"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自訂模式"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名稱"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"模式名稱不得空白"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"選擇圖示"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"日曆活動"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"就寢時間日常安排"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"行車期間"</string>
@@ -4151,6 +4229,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"全螢幕通知"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"允許這個應用程式顯示全螢幕通知"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"允許這個應用程式在裝置鎖定時顯示全螢幕通知。應用程式可能會利用這類通知顯示鬧鐘、來電或其他緊急通知。"</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"寫入系統偏好設定"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"允許這個應用程式代表你修改系統偏好設定"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"這項權限允許應用程式修改核心系統偏好設定。"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"媒體管理應用程式"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"允許應用程式管理媒體"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"如果允許，這個應用程式就能直接修改或刪除使用其他應用程式建立的媒體檔案，不用事先取得你的同意。應用程式必須先獲得權限才能存取檔案和媒體。"</string>
@@ -4396,6 +4477,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"手勢"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"快速開啟相機"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"按兩下電源鍵，即可快速開啟相機，在任何畫面上都可使用。"</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"翻轉相機切換自拍模式"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"操作模式"</string>
@@ -4793,11 +4888,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"衛星訊息"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"透過衛星收發訊息。你的帳戶支援這項功能。"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"透過衛星收發訊息 (你的帳戶不支援這項功能)。"</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"衛星訊息"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"關於衛星訊息"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"衛星訊息, 衛星連線"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"關於<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"適用的「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」帳戶支援透過衛星收發訊息"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"你的「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」方案"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"你的帳戶支援衛星訊息"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"你的帳戶支援訊息功能"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"你的帳戶不支援衛星訊息"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"瞭解詳情"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"運作方式"</string>
@@ -4805,10 +4900,33 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"手機會自動連上衛星。為獲得最佳連線品質，請在沒有物體遮住天空的地方使用。"</string>
     <string name="title_supported_service" msgid="4275535165812691571">"手機連上衛星後"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"你可以傳送訊息給任何人，包括緊急救援服務。如果有可用的行動網路，手機就會重新連線。"</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"衛星訊息可能需要比較長的時間才會送達，而且這項功能僅支援部分地區。天氣和特定結構可能會影響衛星連線的品質。系統不支援衛星電話，但你仍可撥打緊急電話。\n\n「設定」頁面可能要一段時間後才會顯示帳戶變動，詳情請與你的電信業者聯絡。"</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"進一步瞭解衛星訊息"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"<xliff:g id="SUBJECT">%1$s</xliff:g>可能需要比較長的時間才會送達，而且這項功能僅支援部分地區。天氣和特定結構可能會影響衛星連線的品質。系統不支援衛星電話，但你仍可撥打緊急電話。\n\n「設定」頁面可能要一段時間後才會顯示帳戶變動，詳情請洽「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」。"</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"進一步瞭解<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"無法開啟<xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"如要開啟<xliff:g id="FUNCTION">%1$s</xliff:g>，請先中斷衛星連線"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"衛星連線"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"衛星連線"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"衛星連線"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"衛星訊息"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"你的帳戶可透過衛星傳送資料"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"緊急衛星連線"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"無法連上 Wi-Fi 或行動網路時，仍可與緊急救援服務互傳訊息"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"緊急衛星連線, 緊急"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"關於緊急衛星連線"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"沒有 Wi-Fi 或行動網路時，可以與緊急救援服務互傳訊息，並分享位置資訊。這項服務在某些地點或情況下可能無法使用。"</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"撥打電話或傳送訊息給緊急救援服務"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"回答有關緊急情況的問題"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"按照步驟連上衛星"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"如果沒有行動網路，就會看到使用緊急衛星連線的選項"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"傳送回答給緊急救援服務，以便為你提供適當協助"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"連線後，就能與緊急救援服務互傳訊息"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"立即試用"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"透過衛星聯絡緊急救援服務時，系統會將你的姓名、電子郵件地址、電話號碼、所在位置、裝置資訊 (IMEI、語言、型號、電池電量) 和緊急聯絡人資訊分享給緊急救援服務和衛星服務供應商。\n\n如要使用緊急衛星連線，必須將 Google 訊息設為預設訊息應用程式。\n\n如果自動選擇網路功能處於關閉狀態，系統會將其開啟，讓裝置自動連線到任何網路。"</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"分享偏好設定"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"緊急聯絡人"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"你的 Google 帳戶"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"查看或更新分享給緊急救援服務的資訊"</string>
+    <string name="satellite_sos_learn_more_link" msgid="2442930426165677255">"https://support.google.com/pixelphone/answer/15254448"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"存取點名稱"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連線到「<xliff:g id="CARRIER">%1$s</xliff:g>」時使用"</string>
@@ -4995,6 +5113,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"你目前處於可變頁面模式的 16KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能會有風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，必須切換回 4KB 模式，然後鎖定裝置的系統啟動載入程式。這樣做會使裝置再次恢復原廠設定，並還原為實際工作環境設定。裝置成功啟動 Android 系統後，請停用「開發人員選項」中的「OEM 解鎖」設定。如果裝置無法啟動 Android 或狀態不穩，可透過以下任一方式重新刷新裝置：使用最新原廠映像檔 (&lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;)，或前往 &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; 使用工具，依序選取「Wipe Device」、「Lock Bootloader」和「Force Flash all partitions」。"</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB 可變頁面模式"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"閱讀完整內容"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"以頁面大小相容模式執行應用程式"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"錯誤報告處理常式"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"選擇要使用哪個應用程式控管「錯誤報告」捷徑。"</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"個人"</string>
@@ -5011,7 +5132,7 @@
     <string name="lockscreen_privacy_not_secure" msgid="3251276389681975912">"必須先設定螢幕鎖定才能使用"</string>
     <string name="power_menu_power_volume_up_hint" msgid="5619917593676125759">"電源鍵選單：\n同時按下電源鍵和調高音量鍵"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="1169955014711158873">"暫停響鈴：\n按下音量鍵即可顯示捷徑"</string>
-    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"需要按住多久"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"長按時間"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"設定需按住電源鍵的時間長度，調整功能靈敏度"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"長"</string>
@@ -5433,7 +5554,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"聆聽串流"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"使用「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」掃描音訊串流 QR code 即可聆聽"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"分享期間無法編輯密碼。如要變更密碼，請先關閉音訊分享功能。"</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"密碼長度必須介於 4 到 16 個半形字元之間，而且只能使用英文字母、數字和符號"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR code 掃描器"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"需要協助嗎？"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"聯絡人, 儲存空間, 帳戶"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"聯絡人儲存空間"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"僅限裝置"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新的聯絡人資料不會與帳戶同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"系統預設會將聯絡人資料儲存到裝置，並同步到你的帳戶"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"設定預設帳戶時發生錯誤"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"沒有預設帳戶"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"僅限裝置"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"裝置和 %1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"如要開始使用，請新增帳戶"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"聯絡人的儲存位置"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"畫圈搜尋"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"按住主畫面按鈕或導覽列，就能搜尋畫面內容。"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 9b0b52dc326..c7e1289e1d0 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"ISnowflake"</item>
     <item msgid="7952183800501346803">"Isambulela sasebhishi"</item>
     <item msgid="799139025758265891">"Amathuluzi asendaweni yomsebenzi"</item>
-    <item msgid="1330084588359129896">"Itende"</item>
+    <item msgid="8112685757657659269">"Iphiyano"</item>
     <item msgid="3861584909935022342">"Ireel yefilimu"</item>
     <item msgid="5827426100157335512">"Incwadi"</item>
     <item msgid="8585828346253128384">"Imbali yelotus"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2f0b95b4374..e5fc6853ab1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -67,6 +67,7 @@
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhangqa idivayisi entsha"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"i-bluetooth"</string>
     <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Vula ngokuzenzekelayo kusasa"</string>
+    <string name="bluetooth_screen_auto_on_summary" msgid="1490150818921417875">"Uma uvala iBluetooth, iphinda ivuleke ngosuku olulandelayo"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Bhangqa indlebe engakwesokudla"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Bhangqa indlebe engakwesokunxele"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Bhangqa enye indlebe yakho"</string>
@@ -120,6 +121,8 @@
     <string name="bluetooth_disable_leaudio" msgid="8619410595945155354">"Khubaza umsindo we-Bluetooth LE"</string>
     <string name="bluetooth_disable_leaudio_summary" msgid="4756307633476985470">"Kukhubaza isakhi somsindo we-Bluetooth LE uma idivayisi isekela amakhono wehadiwe yomsindo we-LE."</string>
     <string name="bluetooth_leaudio_mode" msgid="5206961943393400814">"Imodi Yomsindo we-Bluetooth LE"</string>
+    <string name="bluetooth_leaudio_broadcast_ui" msgid="3205637582933819543">"Nika amandla ukubuka kuqala Emsindweni weBluetooth LE Broadcast UI"</string>
+    <string name="bluetooth_leaudio_broadcast_ui_summary" msgid="3616202872693209662">"Inika amandla ukubuka kuqala Umsindo we-LE Sharing UI okuhlanganisa ukwabelana ngokuqoshiwe komuntu siqu nokusakaza okuyimfihlo"</string>
     <string name="bluetooth_show_leaudio_device_details" msgid="3306637862550475370">"Bonisa ukuguqulwa komsindo we-LE Emininingwaneni Yedivayisi"</string>
     <string name="bluetooth_bypass_leaudio_allowlist" msgid="7392319491894565552">"Dlula Uhlu Lwabagunyaziwe Lomsindo we-Bluetooth LE"</string>
     <string name="bluetooth_bypass_leaudio_allowlist_summary" msgid="8999245286359656738">"Sebenzisa umsindo we-LE ngokuzenzakalela ngisho noma umsindo we-LE exhumekayo uqinisekisiwe ukuthi uyahlangabezane nomkhakha Wohlu Lwabagunyaziwe."</string>
@@ -175,6 +178,10 @@
     <string name="app_locale_picker_title" msgid="2431448962911301366">"Ulimi lwe-app"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Izilimi eziphakanyisiwe"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"Zonke izilimi"</string>
+    <string name="suggested_locales_title" msgid="119908696638862861">"Okuphakanyisiwe"</string>
+    <string name="all_supported_locales_title" msgid="2535112632133166546">"Zonke izilimi"</string>
+    <string name="all_supported_locales_regions_title" msgid="8756303246586846613">"Zonke izifunda"</string>
+    <string name="all_supported_numbering_system_title" msgid="7926472764452490800">"Wonke amasistimu wokunikeza izinombolo"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"Ulimi lwesistimu"</string>
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Okuzenzakalelayo kwesistimu"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Ukukhetha ulimi kwale app akutholakali Kumasethingi."</string>
@@ -190,10 +197,16 @@
     <string name="button_label_confirmation_of_system_locale_change" msgid="5593798559604894733">"Shintsha"</string>
     <string name="title_unavailable_locale" msgid="2628898110416542386">"i-%s ayitholakali"</string>
     <string name="desc_unavailable_locale" msgid="2201756477400935896">"Lolu limi alukwazi ukusetshenziswa njengolimi lwesistimu, kodwa uye wazisa ama-app namawebhusayithi ukuthi ukhetha lolu limi."</string>
+    <string name="locale_search_menu" msgid="297782694044826686">"Sesha"</string>
+    <string name="language_selection_title" msgid="968179636453982415">"Engeza ulimi"</string>
+    <string name="country_selection_title" msgid="5376929821458644732">"Okuncamelayo kwesifunda"</string>
+    <string name="search_language_hint" msgid="1739082427104506694">"Thayipha igama lolimi"</string>
+    <string name="more_language_settings_category" msgid="3669703092480725416">"Amasethingi olimi engeziwe"</string>
     <string name="regional_preferences_title" msgid="4304567374498629528">"Okuncanyelwayo okungokwesifunda"</string>
     <string name="regional_preferences_summary" msgid="1189876997389469650">"Setha amayunithi kanye nezinombolo ezincanyelwayo"</string>
     <string name="regional_preferences_main_page_sub_title" msgid="4237109940015254725">"Vumela ama-app azi okuncamelayo kwesifunda ukuze aqondanise umuzwa wakho nawe."</string>
     <string name="regional_preferences_option_page_sub_title" msgid="8303661099255197036">"Ama-app azosebenzisa okuncanyelwayo kwesifunda lapho kungenzeka khona."</string>
+    <string name="regional_preferences_category_title" msgid="6754667410178749022">"Okukhethwayo esifundeni"</string>
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Izinga lokushisa"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Usuku lokuqala lweviki"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Izintandokazi zezinombolo"</string>
@@ -246,9 +259,11 @@
     <string name="roaming_enable" msgid="7845716016861535340">"Xhuma emasevisini edatha lapho uzulazula"</string>
     <string name="roaming_disable" msgid="729512894708689604">"Xhuma kumasevisi edatha lapho uzulazula"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"Izindleko zokuzula zingahle zisebenze."</string>
-    <string name="date_time_auto" msgid="4239202185055225869">"Setha isikhathi ngokuzenzekelayo"</string>
-    <string name="zone_auto_title" msgid="5141692422373097957">"Setha ngokuzenzekelayo"</string>
-    <string name="auto_zone_requires_location_summary" msgid="4831038184260596735">"Indawo izosetshenziselwa ukusetha izoni yesikhathi lapho lokhu kuguqulwa kuvuliwe"</string>
+    <string name="date_time_auto" msgid="1759599045100040686">"Usuku nesikhathi esizenzekelayo"</string>
+    <string name="date_time_auto_summary" msgid="8294938565417729698">"Setha ngokuzenzakalela usebenzisa inethiwekhi yakho namasignali angenantambo"</string>
+    <string name="zone_auto_title" msgid="3520584257065861479">"Izoni yesikhathi ezenzekelayo"</string>
+    <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setha ngokuzenzekelayo ngokusekelwe kumanethiwekhi eselula aseduze nawe"</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Setha ngokuzenzekela usebenzisa indawo yedivayisi yakho, uma ikhona"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Sebenzisa okuzenzakalelayo kwasendaweni"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Sebenzisa ifomethi ye-24 amahora"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Isikhathi"</string>
@@ -549,6 +564,9 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Phakamisa umunwe, bese uphinda uthinta inzwa"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Ayikwazi ukusebenzisa inzwa yesigxivizo somunwe"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Vakashela umhlinzeki wokulungisa."</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ukuvula Ngesigxivizo Somunwe Isikrini Sivaliwe"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Sebenzisa Ukuvula Ngesigxivizo Somunwe ngisho noma isikrini sivaliwe"</string>
+    <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Isikrini sivaliwe, Vula"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Amasethingi wokuvikeleka amaningi"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Ukukhiya iphrofayela yomsebenzi, ukubethela, nokuningi"</string>
     <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Ukubethela, izimfanelo, nokuningi"</string>
@@ -657,6 +675,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Setha iphethini yendawo yangasese"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Khiya"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Fihla"</string>
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Qinisekisa iphethini yakho yendawo engasese"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Faka kabusha iphinikhodi yakho yendawo engasese"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Faka kabusha iphasiwedi yakho yendawo engasese"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Ungangeza izigxivizo zeminwe ezingafika kwezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ungeze inombolo ephezulu yezigxivizo zeminwe"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ayikwazi ukwengeza izingxovizo zeminwe eziningi"</string>
@@ -877,6 +898,7 @@
     <string name="external_display_on" msgid="2560104443500154333">"Kuvuliwe"</string>
     <string name="external_display_off" msgid="5634413756025351374">"Kuvaliwe"</string>
     <string name="external_display_settings_title" msgid="6256884595821605779">"Ukubonisa Kwangaphandle"</string>
+    <string name="builtin_display_settings_category" msgid="3441388849060771885">"Isibonisi esakhelwe phakathi"</string>
     <string name="external_display_use_title" msgid="8198257340836261386">"Sebenzisa ukubonisa kwangaphandle"</string>
     <string name="external_display_resolution_settings_title" msgid="2446784716488289268">"Ukucaca kokubonisa"</string>
     <string name="external_display_not_found" msgid="1912355133386555798">"Ukubonisa kwangaphandle kunqanyuliwe"</string>
@@ -888,6 +910,7 @@
     <string name="external_display_change_resolution_footer_title" msgid="9024291681663573443">"Ukushintsha ukuzungezisa noma ukucaca kungamisa noma imaphi ama-app asebenzayo okwamanje"</string>
     <string name="external_display_not_found_footer_title" msgid="8882902921634316363">"Idivayisi yakho kufanele ixhunywe ekuboniseni kwangaphandle ukuze ifanise isikrini sakho"</string>
     <string name="external_display_more_options_title" msgid="1222751990705118774">"Okungakhethwa kukho okuningi"</string>
+    <string name="external_display_topology_hint" msgid="854973327795578470">"Cindezela bese uyadonsa ukuze uhlele ukubukeka."</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Abalingisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"isibuko"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Nika amandla ukubukeka okungenantambo "</string>
@@ -1024,6 +1047,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Hlola iphasiwedi uphinde uzame futhi"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Xhumana nomkhiqizi wedivayisi"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Hlola ukuxhumeka uphinde uzame futhi"</string>
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Le nethiwekhi ye-Wi-Fi ayitholakali okwamanje"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Kunenkinga ngale khodi ye-QR. Zama ukuxhuma ngenye indlela."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Khetha inethiwekhi"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Ukuze uxhume idivayisi yakho, khetha inethiwekhi"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Engeza le divayisi ku-“<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1219,8 +1244,8 @@
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Funda kabanzi mayelana nokuphenduka okuzenzakalelayo"</string>
     <string name="screen_resolution_title" msgid="2690518693139811486">"Ukulungiswa kwesikrini"</string>
     <string name="screen_resolution_option_high" msgid="2617496842852992853">"Ukucaca okuphezulu"</string>
-    <string name="screen_resolution_option_full" msgid="2694003735219114186">"Ukucaca okugcwele"</string>
-    <string name="screen_resolution_footer" msgid="6772341522952795647">"Ukucaca okugcwele kusebenzisa ibhethri yakho eyengeziwe. Ukushintsha ukucaca kwakho kungase kubangele amanye ama-app ukuthi aqale kabusha."</string>
+    <string name="screen_resolution_option_full" msgid="4456839315039000517">"Umkhawulo wokukucaca"</string>
+    <string name="screen_resolution_footer" msgid="1230761249204935717">"Umkhawulo wokucaca usebenzisa ibhethri yakho eyengeziwe. Ukushintsha ukucaca kwakho kungase kubangele amanye ama-app ukuthi aqale kabusha."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Okukhethiwe"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Imibala"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Kwemvelo"</string>
@@ -1229,7 +1254,6 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Okungaguqula"</string>
     <string name="brightness" msgid="6216871641021779698">"Izinga lokukhanya"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"Ukukhanya okuguqukayo"</string>
-    <string name="auto_brightness_content_description_title" msgid="237734599617077375">"Mayelana nokukhanya okuguqukayo"</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ukukhanya kwesikrini sakho kuzolungiswa ngokuzenzakalela kumvelo yakho nakumisebenzi. Ungahambisa isilayida ngesandla ukuze usize ukukhanya okushintshayo kufunde okuncamelayo."</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Vuliwe"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Kuvaliwe"</string>
@@ -1300,7 +1324,7 @@
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Amasethingi emodi yesikhathi sokulala"</string>
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{Amamodi angaphinda enze itimu emnyama isebenze}=1{I-{mode_1} nayo ivula itimu emnyama}=2{I-{mode_1} ne-{mode_2} nawo avula itimu emnyama}=3{I-{mode_1}, i-{mode_2}, ne-{mode_3} nawo avula itimu emnyama}one{I-{mode_1}, i-{mode_2}, namanye angu-# engeziwe nawo avula itimu emnyama}other{I-{mode_1}, i-{mode_2}, namanye angu-# engeziwe nawo avula itimu emnyama}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"Amasethingi amamodi"</string>
-    <string name="even_dimmer_display_title" msgid="6731255736830410149">"Ukufiphala nakakhulu"</string>
+    <string name="even_dimmer_display_title" msgid="4509732439977906028">"Ukufiphaza okwengeziwe"</string>
     <string name="even_dimmer_display_summary" msgid="120301078873242172">"Vumela idivayisi ukuthi ifiphale kunokujwayelekile"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Isikrini siphelelwe yisikhathi"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1624,7 +1648,7 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Amasevisi endawo"</string>
     <string name="location_services_screen_title" msgid="5640002489976602476">"Amasevisi Endawo"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6478751613645015287">"Sebenzisa indawo"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="720338048522014712">"Sebenzisa indawo yezoni yesikhathi"</string>
     <string name="location_time_zone_detection_status_title" msgid="8903495354385600423">"Ayikwazi ukusetha izoni yesikhathi ngokuzenzakalela"</string>
     <string name="location_time_zone_detection_status_summary_degraded_by_settings" msgid="6198939835335841106"></string>
     <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Indawo noma Amasevisi Endawo avaliwe"</string>
@@ -1635,11 +1659,11 @@
     <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Amasethingi endawo"</string>
     <string name="location_time_zone_provider_fix_dialog_ok_button" msgid="9026666001835079126">"Lungisa lokhu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Khansela"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Izoni yesikhathi ezenzekelayo ivaliwe"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="4785540862935730060">"Ayitholakali uma izoni yesikhathi ezenzekelayo icishiwe"</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_time_zone_detection_auto_is_on" msgid="8797434659844659323">"Indawo ingasetshenziselwa ukusetha izoni yesikhathi"</string>
+    <string name="location_time_zone_detection_auto_is_on" msgid="1837317773761632655">"Uma indawo yedivayisi yakho itholakala, ingase isetshenziselwe ukusetha izoni yesikhathi sakho"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="7509900979811934843">"Uwazi olusemthethweni"</string>
     <string name="manual" msgid="3651593989906084868">"Ngokulawulwa"</string>
@@ -1939,14 +1963,35 @@
     <string name="keyboard_options_category" msgid="8040137073401152608">"Ongakukhetha"</string>
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ukufinyeleleka"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Ikhibhodi ephathekayo"</string>
+    <!-- no translation found for physical_keyboard_layout_picker_title (4526600767648916256) -->
+    <skip />
     <string name="bounce_keys" msgid="7419450970351743904">"Okhiye bokubuyisela emuva"</string>
-    <string name="bounce_keys_summary" msgid="7347050868868080302">"Ikhibhodi iziba ukuchofozwa okusheshayo ngokuphindaphindiwe kwenkinobho efanayo phakathi nenkathi engu-<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Ikhibhodi iziba ukucindezela okuphindaphindiwe okusheshayo kwenkinobho efanayo"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ukhawulo wokhiye abaphindwayo"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Khetha inkathi yesikhathi ikhibhodi yakho ezoziba ngaso ukucindezela kwezinkinobho okuphindaphindiwe"</string>
+    <string name="input_setting_keys_dialog_option_200" msgid="3121006986226247560">"0.2s"</string>
+    <string name="input_setting_keys_dialog_option_400" msgid="2634500629396699440">"0.4s"</string>
+    <string name="input_setting_keys_dialog_option_600" msgid="3828362866751805146">"0.6s"</string>
+    <string name="input_setting_keys_custom_title" msgid="670425691119253202">"Okomuntu ngamunye"</string>
+    <string name="input_setting_keys_custom_value" msgid="4455905650507193648">"inani lokomuntu ngamunye"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Okhiye abahamba kancane"</string>
-    <string name="slow_keys_summary" msgid="1784371292745423292">"Lungisa isikhathi esithathwa yinkinobho ngayinye ukuba isebenze lapho icindezelwa, sibe ngu-<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ilungisa isikhathi okusithathayo ukuze ukucindezela inkinobho kusebenze"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Okhiye abanamathelayo"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Cindezela inkinobho eyodwa ngesikhathi ukuze uthole izinqamuleli esikhundleni sokubamba izinkinobho ndawonye"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Okhiye bemouse"</string>
-    <string name="mouse_keys_summary" msgid="2396247040177734245">"Sebenzisa ikhibhodi ephathekayo ukulawula imouse."</string>
+    <string name="mouse_keys_main_title" msgid="3570638931365221460">"Sebenzisa okhiye bemouse"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Sebenzisa ikhibhodi yakho ukuze ulawule isikhombi"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Ukuskrola ngokuphendukezela igundane"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Skrola uye phezulu bese uyisa ikhasi ezansi"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Shintshanisa izinkinobho kwesokunxele nakwesokudla"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sebenzisa inkinobho yemawusi kwesokunxele njengesokudla sakho"</string>
+    <string name="mouse_key_main_page_title" msgid="8051692181770475257">"Okhiye bemouse we-<xliff:g id="KEYBOARD_NAME">%s</xliff:g>"</string>
+    <string name="mouse_keys_directional_summary" msgid="8108444346340180562">"Sebenzisa okhiye be-<xliff:g id="DIRECTIONAL_LABEL">%s</xliff:g> ukuhambisa isikhombi semouse"</string>
+    <string name="mouse_keys_click_summary" msgid="1642125742164614577">"Sebenzisa ukhiye we-<xliff:g id="CLICK_LABEL">%s</xliff:g> ukuze uchofoze inkinobho eyinhloko yemouse"</string>
+    <string name="mouse_keys_press_hold_summary" msgid="2313418505798763112">"Sebenzisa ukhiye we-<xliff:g id="PRESS_HOLD_LABEL">%s</xliff:g> ukuze ucindezele futhi ubambe inkinobho eyinhloko yemouse"</string>
+    <string name="mouse_keys_release_summary" msgid="2379239679203818720">"Sebenzisa ukhiye we-<xliff:g id="RELEASE_LABEL">%s</xliff:g> ukuze ukhulule inkinobho eyinhloko yemouse"</string>
+    <string name="mouse_keys_toggle_scroll_summary" msgid="8129249227018251990">"Sebenzisa ukhiye we-<xliff:g id="RELEASE_LABEL_1">%1$s</xliff:g> ukuze uguqule imodi yokuskrola. Lokhu kuzokwenza ukuthi okhiye be-<xliff:g id="RELEASE_LABEL_2">%2$s</xliff:g> baskrole phezulu, phansi, kwesokunxele noma kwesokudla"</string>
+    <string name="mouse_keys_release2_summary" msgid="2395196580659122185">"Sebenzisa ukhiye we-<xliff:g id="RELEASE_2_LABEL">%s</xliff:g> ukuze uchofoze inkinobho yesibili yemouse"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Izinqamuleli zekhibhodi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Bonisa uhlu lwezinqamuleli"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Amakhibhodi ephrofayela yomsebenzi namathuluzi"</string>
@@ -1954,6 +1999,7 @@
     <string name="keyboard_default_layout" msgid="5377811770620422301">"Okuzenzakalelayo"</string>
     <string name="trackpad_settings" msgid="2071131324087677005">"Iphedi yokuthinta"</string>
     <string name="trackpad_mouse_settings" msgid="136226693583218429">"Iphedi yokuthinta ne-mouse"</string>
+    <string name="mouse_settings" msgid="7301671756721327122">"Imawusi"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"Isivinini sesikhombi, ukunyakaza komzimba"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"Thepha ukuze uchofoze"</string>
     <string name="trackpad_tap_dragging_title" msgid="798644199582480712">"Thepha ukuhudula"</string>
@@ -1965,6 +2011,7 @@
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Chofoza ezansi kwesokudla"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Chofoza ekhoneni elingezansi kwesokudla lephedi yokuthinta ukuze uthole okwengeziwe ongakhetha kukho"</string>
     <string name="trackpad_pointer_speed" msgid="7786579408631352625">"Ijubane lesikhombi"</string>
+    <string name="three_finger_tap_preference_title" msgid="7130739855086106052">"Sebenzisa ukuthepha ngeminwe emithathu"</string>
     <string name="pointer_fill_style" msgid="8794616790175016092">"Umbala wesikhombi"</string>
     <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Shintsha isitayela sokugcwalisa isikhombi sibe mnyama"</string>
     <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Shintsha isitayela sokugcwalisa isikhombi sibe luhlaza"</string>
@@ -1979,6 +2026,11 @@
     <string name="trackpad_touch_gesture" msgid="8641725062131922497">"Funda ukunyakaza kwephedi lokuthinta"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"i-trackpad, i-track pad, imawuzi, i-cursor, skrola, swayipha, chofoza kwesokudla, chofoza, isikhombi"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"chofoza ngakwesokudla, thepha"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"Chofoza maphakathi"</string>
+    <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Qalisa i-Assistant"</string>
+    <string name="three_finger_tap_go_home" msgid="6526301745535089812">"Iya ekhasini lokuqala"</string>
+    <string name="three_finger_tap_go_back" msgid="2898205524575684271">"Iya emuva"</string>
+    <string name="three_finger_tap_recent_apps" msgid="5578228979519733605">"Buka ama-app akamuva"</string>
     <string name="gesture_title_go_home" msgid="3682238648647225933">"Iya ekhasini lokuqala"</string>
     <string name="gesture_summary_go_home" msgid="6409031586904205741">"Swayiphela phezulu ngeminwe emithathu noma kuphi kuphedi yakho yokuthinta"</string>
     <string name="gesture_title_go_back" msgid="6619462058488419802">"Iya emuva"</string>
@@ -2015,6 +2067,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Khetha ukhiye omusha we-<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ukufinyeleleka kwekhibhodi engokoqobo"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Okhiye abanamathelayo, okhiye Bokubuyisela emuva, okhiye Bemawusi"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Phinda Okhiye"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Bambezela ngaphambi kokuphinda"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Phinda Ukulinganisela"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Bambela phansi ukhiye ukuze uphinde uhlamvu lwawo kuze kukhululwe ukhiye walo"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Isakhiwo se-<xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Okuzenzakalelayo"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Okuzenzekelayo: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2419,7 +2475,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Buka kuqala"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Izinketho ezijwayelekile"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Ulimi"</string>
-    <string name="captioning_text_size" msgid="8039448543171463017">"Usayizi wombhalo"</string>
+    <string name="captioning_text_size" msgid="5764254558945371745">"Usayizi wegama-ncazo"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Isitayela segama-ncazo"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Izinketho ezingokwezifiso"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Umbala ongemuva"</string>
@@ -2546,6 +2602,8 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Lungisa amandla okusebenza"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Amaphakheji ahlanganisiwe"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Izinhlelo zokusebenza zisebenza ngokujwayelekile"</string>
+    <string name="battery_tip_replacement_title" msgid="3932335880485957919">"Ukushintshwa kwebhethri kuyanconywa"</string>
+    <string name="battery_tip_replacement_summary" msgid="7892640031317153349">"Umthamo webhethri kanye nokusebenza kokushaja kuncishisiwe, futhi ukubuyiselwa kwebhethri kuyanconywa."</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"Ileveli yebhethri iphansi"</string>
     <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"Vula Isilondolozi Sebhethri ukuze unwebe impilo yebhethri"</string>
     <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"Thuthukisa impilo yebhethri"</string>
@@ -2963,6 +3021,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Nqamula le-VPN"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Nqamula"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Uhlobo"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Uhlobo <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Khohlwa i-VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Shintshanisa i-VPN ekhona?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setha i-VPN ehlala ivuliwe?"</string>
@@ -3385,7 +3444,7 @@
     <string name="zen_mode_select_schedule_time_example" msgid="2690518300573994725">"\"9 AM - 5 PM phakathi neviki\""</string>
     <string name="zen_mode_select_schedule_calendar" msgid="8098396764270136497">"Imicimbi yekhalenda"</string>
     <string name="zen_modes_summary_some_active" msgid="4780578487747956559">"{count,plural,offset:2 =0{}=1{Okuthi {mode_1} kuyasebenza}=2{Okuthi {mode_1} nokuthi {mode_2} kuyasebenza}=3{Okuthi {mode_1}, {mode_2}, nokuthi {mode_3} kuyasebenza}one{Okuthi {mode_1}, {mode_2}, kanye nokwengeziwe okungu-# kuyasebenza}other{Okuthi {mode_1}, {mode_2}, kanye nokwengeziwe okungu-# kuyasebenza}}"</string>
-    <string name="zen_modes_summary_none_active" msgid="7076119084658457243">"{count,plural, =0{}=1{Imodi e-1 ingavuleka ngokuzenzakalela}one{Amamodi angu-# angavuleka ngokuzenzakalela}other{Amamodi angu-# angavuleka ngokuzenzakalela}}"</string>
+    <string name="zen_modes_summary" msgid="2576893588489258390">"{count,plural, =0{Ungaphazamisi}=1{{mode_1}}=2{{mode_1}, {mode_2}}one{{mode_1}, {mode_2}, {mode_3}}other{{mode_1}, {mode_2}, {mode_3}}}"</string>
     <string name="zen_mode_active_text" msgid="5002406772481439437">"KUVULIWE"</string>
     <string name="zen_mode_disabled_needs_setup" msgid="389269759040103728">"Akusethiwe"</string>
     <string name="zen_mode_disabled_by_user" msgid="138592173630683253">"Kukhutshaziwe"</string>
@@ -3510,15 +3569,6 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ngiyezwa"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Izaziso"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Ubude besikhathi"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Imilayezo, imicimbi nezikhumbuzi"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Kwenziwe"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"Izilungiselelo"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Akukho okubonakalayo noma umsindo kusukela kuzaziso"</string>
-    <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Awukho umsindo kusukela kuzaziso"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Ngeke ubone noma uzwe izaziso. Amakholi kusukela koxhumana nabo abafakwe inkanyezi nabafonayo abaphindiwe avunyelwe."</string>
-    <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Isethingi samanje)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Shintsha amasethingi okwazisa okungaphazamisi?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Imisindo yephrofayela yomsebenzi"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Sebenzisa imisindo yephrofayela yomuntu siqu"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"Sebenzisa imisindo efanayo nephrofayela yakho yomuntu siqu"</string>
@@ -3587,8 +3637,18 @@
     <string name="lockscreen_bypass_summary" msgid="4578154430436224161">"Ngemuva kokuvula, iya ngokuqondile eskrinini sokugcina esisetshenzisiwe. Izaziso ngeke zivele esikrinini esikhiywe. Swayiphela phansi kusukela phezulu ukuze uzibone."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khiya isikrini, ukukhiya isikrini, yeqa, dlula"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Uma kukhiywe iphrofayela yomsebenzi"</string>
+    <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"Ukunciphisa isaziso sokukhiya isikrini"</string>
+    <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"Bonisa izaziso ezimbalwa ekukhiyeni isikrini"</string>
     <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Bonisa izaziso ezintsha kuphela esikrinini sokukhiya"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Sula ngokuzenzakalelayo izaziso ezibukwe ngaphambilini esikrinini sokukhiya"</string>
+    <!-- no translation found for lock_screen_notifs_show_full_list (6767009263807771108) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_full_list_desc (4868489278443057427) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_show_compact (1133598661314460528) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifs_compact_desc (2442594880539709057) -->
+    <skip />
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Izaziso esikrinini sokukhiya"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Bonisa izingxoxo. ezizenzakalelayo, nezithulile"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Bonisa izingxoxo. ezizenzakalelayo, nezithulile"</string>
@@ -3606,6 +3666,14 @@
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Bonisa konke okuqukethwe kwesaziso somsebenzi"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Fihla okuqukethwe komsebenzi okuzwelayo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"Uma idivayisi yakho ikhiyiwe, ufuna ukuthi izaziso zephrofayela zivele kanjani?"</string>
+    <!-- no translation found for lock_screen_notification_hide_seen_title (6356324850662946426) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_seen_summary (8345971177658888274) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_title (3284314455767315329) -->
+    <skip />
+    <!-- no translation found for lock_screen_notification_hide_silent_summary (1934066619526795468) -->
+    <skip />
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Izaziso zephrofayela"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Izaziso"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"Izaziso zohlelo lokusebenza"</string>
@@ -3696,6 +3764,11 @@
     <string name="notification_polite_description" msgid="5497748284893832854">"Uma uthola izaziso eziningi ngesikhathi esifushane, idivayisi yakho izokwehlisa ivolumu yayo futhi inciphise izexwayiso imizuzu engafika kwemi-2. Izingcingo, ama-alamu, nezingxoxo ezibalulekile azithinteki. \n\nIzaziso ezitholwe ngesikhathi sokupholisa zingatholwa ngokudonsela phansi usuka phezulu esikrinini."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Sebenzisa kumaphrofayela omsebenzi"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Kusebenzise kuma-app ephrofayela yomsebenzi"</string>
+    <string name="notification_bundle_title" msgid="460988459835922719">"Izaziso ezinqwabelene"</string>
+    <string name="notification_bundle_on" msgid="1596327200778050642">"Vuliwe"</string>
+    <string name="notification_bundle_off" msgid="1550261372988157377">"Valiwe"</string>
+    <string name="notification_bundle_main_control_title" msgid="4746182488388939403">"Sebenzisa inqwaba yezaziso"</string>
+    <string name="notification_bundle_description" msgid="3896142878395333784">"Izaziso ezinamatimu afanayo zizothuliswa futhi ziqoqwe ndawonye ukuze kube nokuzizwisa okuthule. Ukunqwabelanisa kuzokhipha amasethingi ezaziso ze-app yayo."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Amasevisi omsizi we-VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukusetshenziswa njengamasevisi wesisizi se-VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vumela isevisi ye-VR ukufinyelela i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3804,6 +3877,7 @@
     <string name="zen_mode_from_important_conversations_second" msgid="7588299891972136599">"izingxoxo ezibalulekile"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"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_from_conversations_settings" msgid="2411930666794576607">"Amasethingi ezingxoxo"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Labo abangaphazamisa"</string>
     <string name="zen_mode_people_footer" msgid="7710707353004137431">"Ngisho noma ama-app okulayeza noma okufona engakwazi ukukwazisa, abantu obakhetha lapha basengakuthola ngalawo ma-app"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Amakholi"</string>
@@ -3827,6 +3901,8 @@
     <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>
+    <string name="zen_mode_from_contacts_settings" msgid="853428575138439415">"Amasethingi woxhumana nabo"</string>
+    <string name="zen_mode_from_starred_settings" msgid="3389516761063134119">"Amasethingi woxhumana nabo abanezinkanyezi"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"Lutho"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"Lutho"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Ama-alamu"</string>
@@ -3856,6 +3932,7 @@
     <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Awekho ama-app angaphazamisa}=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_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (Umsebenzi)"</string>
     <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"Iyabala…"</string>
+    <string name="zen_mode_apps_priority_apps_settings" msgid="5544513568250354374">"Amasethingi e-App"</string>
     <string name="zen_mode_plus_n_items" msgid="6136713354369243421">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Vumela izinhlelo zokusebenza ukubhala ngaphezulu"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Ama-app angaphazamisa"</string>
@@ -3898,6 +3975,8 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Sungula imodi"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Imodi yomuntu ngamunye"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Igama lemodi"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Igama lemodi alikwazi ukungabi nalutho"</string>
+    <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Khetha isithonjana"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Imicimbi yekhalenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Imijikelezo yesikhathi sokulala"</string>
     <string name="zen_mode_trigger_title_driving" msgid="7890990983453164403">"Ngenkathi ushayela"</string>
@@ -4152,6 +4231,9 @@
     <string name="full_screen_intent_title" msgid="5888548315628268674">"Izaziso zesikrini esigcwele"</string>
     <string name="permit_full_screen_intent" msgid="2414307667550523630">"Vumela izaziso zesikrini esigcwele ukusuka kule app"</string>
     <string name="footer_description_full_screen_intent" msgid="7716518411349225528">"Vumela i-app ukuthi ibonise izaziso ezithatha isikrini esigcwele lapho idivayisi ikhiyiwe. Ama-app angasebenzisa lokhu ukuze agqamise ama-alamu, amakholi angenayo, noma ezinye izaziso eziphuthumayo."</string>
+    <string name="write_system_preferences_page_title" msgid="4775435310385611055">"Bhala okuncamelayo kwesistimu"</string>
+    <string name="write_system_preferences_switch_title" msgid="213522354119233085">"Vumela le app iguqule izintandokazi zesistimu esikhundleni sakho"</string>
+    <string name="write_system_preferences_footer_description" msgid="8645052087619752514">"Le mvume ivumela i-app ukuthi iguqule okuncamelayo kwesistimu okuyinhloko."</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"Ama-app okuphatha imidiya"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Vumela i-app ukuthi iphathe imidiya"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"Uma ivunyelwe, le app ingaguqula noma isuse amafayela emidiya adalwe ngamanye ama-app ngaphandle kokukubuza. I-app kufanele ibe nemvume yokufinyelela amafayela nemidiya."</string>
@@ -4397,6 +4479,20 @@
     <string name="gesture_preference_title" msgid="8291899281322647187">"Ukuthinta"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Vula ngokushesha ikhamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Ukuze uvule ngokushesha ikhamera yakho, cindezela inkinobho yamandla kabili. Isebenza kusukela kunoma isiphi isikrini."</string>
+    <!-- no translation found for double_tap_power_title (8705875166298116659) -->
+    <skip />
+    <!-- no translation found for double_tap_power_enabled (305978257631612678) -->
+    <skip />
+    <!-- no translation found for double_tap_power_target_action_category (6186809788568348488) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_title (8398392033718681209) -->
+    <skip />
+    <!-- no translation found for double_tap_power_camera_action_summary (1231656402570674349) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_title (2238628756927241786) -->
+    <skip />
+    <!-- no translation found for double_tap_power_wallet_action_summary (6567586974229774570) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Phenya ikhamera yesithombe ozishuthe sona"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="system_navigation_title" msgid="4890381153527184636">"Inqubo yokuzulazula"</string>
@@ -4794,11 +4890,11 @@
     <string name="satellite_setting_title" msgid="2543034229989047673">"Ukuyaleza kwesethelayithi"</string>
     <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"Thumela futhi wamukele umyalezo obhaliwe ngesethelayithi. Kubandakanywe ne-akhawunti yakho"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"Thumela futhi wamukele umyalezo obhaliwe ngesethelayithi. Akufakwanga e-akhawuntini yakho."</string>
-    <string name="keywords_satellite_setting" msgid="3312183289776517695">"Ukuyaleza kwesethelayithi"</string>
-    <string name="category_name_about_satellite_messaging" msgid="3756205049485508340">"Mayelana nokulayeza kwesethelayithi"</string>
+    <string name="keywords_satellite_setting" msgid="613553612424945946">"Ukuthumela imiyalezo ngesethelayithi, ukuxhumana ngesethelayithi"</string>
+    <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"Mayelana ne-<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="title_about_satellite_setting" msgid="9212860038048311345">"Ungathumela futhi wamukele imiyalezo ebhaliwe ngesethelayithi njengengxenye ye-akhawunti efanelekayo ye-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="category_title_your_satellite_plan" msgid="3017895097366691841">"Uhlelo lwakho lwe-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
-    <string name="title_have_satellite_plan" msgid="2048372355699977947">"Ukuyaleza kwesethelayithi kubandakanywe ku-akhawunti yakho"</string>
+    <string name="title_have_satellite_plan" msgid="857337944804101443">"Ukulayeza kufakwe e-akhawuntini yakho"</string>
     <string name="title_no_satellite_plan" msgid="2876056203035197505">"Ukuyaleza kwesethelayithi akubandakanyiwe ne-akhawunti yakho"</string>
     <string name="summary_add_satellite_setting" msgid="190359698593056946">"Funda Kabanzi"</string>
     <string name="category_name_how_it_works" msgid="585303230539269496">"Indlela esebenza ngayo"</string>
@@ -4806,10 +4902,34 @@
     <string name="summary_satellite_connection_guide" msgid="3496123195218418456">"Ifoni yakho izoxhuma ngokuzenzakalela kusethelayithi. Ngokuxhuma okuncono, gcina isibhakabhaka sikhanya bha."</string>
     <string name="title_supported_service" msgid="4275535165812691571">"Ngemva kokuthi ifoni yakho ixhume kusethelayithi"</string>
     <string name="summary_supported_service" msgid="4320535903444834786">"Ungathumelela noma ubani umyalezo, okubandakanya amasevisi ezimo eziphuthumayo. Ifoni yakho izophinde ixhume kunethiwekhi yeselula uma itholakala."</string>
-    <string name="satellite_setting_summary_more_information" msgid="7729454610548016356">"Ukulayeza kwesathelayithi kungathatha isikhathi eside futhi kutholakala kuphela kwezinye izindawo. Isimo sezulu nezakhiwo ezithile zingathikameza ukuxhumeka kwakho kwesathelayithi. Ukufona ngesathelayithi akutholakali. Amakholi ezimo eziphuthumayo asengaxhumeka.\n\nKungathatha isikhathi esithile ukuthi ushintsho lwe-akhawunti luvele Kumasethingi. Xhumana nenkampani yakho yenethiwekhi ngemininingwane."</string>
-    <string name="more_about_satellite_messaging" msgid="3385673133561348509">"Okwengeziwe mayelana nokuyaleza kwesethelayithi"</string>
+    <string name="satellite_setting_summary_more_information" msgid="1028146147094166868">"I-<xliff:g id="SUBJECT">%1$s</xliff:g> ingase ithathe isikhathi eside futhi itholakala kuphela ezindaweni ezithile. Isimo sezulu nezakhiwo ezithile zingathikameza uxhumo lwakho lwesethelayithi. Ukufona ngesethelayithi akutholakali. Amakholi ephuthumayo isengaxhuma.\n\nKungathatha isikhathi esithile ukuthi ushintsho lwe-akhawunti luvele Kumasethingi. Xhumana ne-<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ukuthola imininingwane."</string>
+    <string name="more_about_satellite_messaging" msgid="1039277943532711584">"Okwengeziwe nge-<xliff:g id="SUBJECT">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_title" msgid="1610117852475376931">"Ayikwazi ukuvula i-<xliff:g id="FUNCTION">%1$s</xliff:g>"</string>
     <string name="satellite_warning_dialog_content" msgid="936419945275934955">"Ukuze uvule i-<xliff:g id="FUNCTION">%1$s</xliff:g>, qala ngokumisa uxhumo lwesathelayithi"</string>
+    <string name="category_title_satellite_connectivity" msgid="7540022356863917632">"Ukuxhumana kwesathelayithi"</string>
+    <string name="title_satellite_setting_connectivity" msgid="488626710934668313">"Ukuxhumana kwesethelayithi"</string>
+    <string name="description_satellite_setting_connectivity" msgid="7337311015334186655">"ukuxhumana kwesethelayithi"</string>
+    <string name="description_satellite_setting_messaging" msgid="4367494645429198805">"ukuthumela umyalezo ngesethelayithi"</string>
+    <string name="title_have_satellite_data_plan" msgid="5614932315409789011">"Ukusetshenziswa kwedatha kufakwe ne-akhawunti yakho"</string>
+    <string name="title_for_satellite_sos" msgid="4608739357329147285">"Isethelayithi yokuxhumana ngezimo eziphuthumayo"</string>
+    <string name="summary_for_satellite_sos_entry" msgid="4981480371923329605">"Thumela umlayezo ngamasevisi ezimo eziphuthumayo lapho ungakwazi ukuxhuma kuselula noma kunethiwekhi ye-Wi-Fi"</string>
+    <string name="keywords_satellite_sos" msgid="6275777197418023949">"isethelayithi yokuxhumana ngezimo eziphuthumayo, i-sos"</string>
+    <string name="category_title_about_satellite_sos" msgid="7229724397303154919">"Mayelana Nesethelayithi yokuxhumana ngezimo eziphuthumayo"</string>
+    <string name="satellite_sos_introduction" msgid="4670230212117495751">"Ungathumela umlayezo ngamasevisi ezimo eziphuthumayo futhi wabelane ngendawo yakho uma ungakwazi ukuxhuma kuselula noma kunethiwekhi ye-Wi-Fi. Le sevisi kungenzeka ingatholakali ngazo zonke izikhathi kuzo zonke izindawo noma izimo."</string>
+    <string name="satellite_sos_how_it_works_step_1" msgid="4669862942425306921">"Fonela noma ubhalele amasevisi ezimo eziphuthumayo"</string>
+    <string name="satellite_sos_how_it_works_step_2" msgid="3558248744927579016">"Phendula imibuzo mayelana nesimo esiphuthumayo"</string>
+    <string name="satellite_sos_how_it_works_step_3" msgid="4496038314890474893">"Landela izinyathelo ukuze uxhume kusethelayithi"</string>
+    <string name="satellite_sos_how_it_works_summary_1" msgid="4497178023367920284">"Uma ungenayo inethiwekhi yeselula, uzobona ongakhetha kukho kokusebenzisa Isethelayithi yokuxhumana ngezimo eziphuthumayo"</string>
+    <string name="satellite_sos_how_it_works_summary_2" msgid="1302661361673503362">"Thumela izimpendulo kumasevisi ezimo eziphuthumayo ukuze uthole uhlobo olulungile losizo"</string>
+    <string name="satellite_sos_how_it_works_summary_3" msgid="4612675365617172405">"Uma usuxhunyiwe, ungathumela umyalezo ngamasevisi ezimo eziphuthumayo"</string>
+    <string name="satellite_sos_try_demo" msgid="1915233782211344468">"Zama idemo"</string>
+    <string name="satellite_sos_footer_text" msgid="4454885538165117230">"Uma uxhuma kumasevisi ezimo eziphuthumayo ngesethelayithi, igama lakho, i-imeyili, inombolo yefoni, indawo, ulwazi lwedivayisi (i-IMEI, ulimi, imodeli, ileveli yebhethri), kanye noxhumana naye wesimo esiphuthumayo kwabelwa izinsizakalo eziphuthumayo nabahlinzeki besevisi yesethelayithi. \n\nUkuze usebenzise isethelayithi yokuxhumana ngezimo eziphuthumayo, iGoogle Messages kufanele ibe yi-app ye-SMS ezenzakalelayo. \n\nUma ukukhetha kwenethiwekhi okuzenzekelayo kuvaliwe, kuzovulwa, futhi idivayisi yakho izoxhuma ngokuzenzekela kunoma iyiphi inethiwekhi."</string>
+    <string name="satellite_sos_sharing_preferences_subheader_title" msgid="5701538329333628267">"Ukwabelana ngokuthandayo"</string>
+    <string name="satellite_sos_sharing_preferences_step_1" msgid="3106774199702637359">"Oxhumana nabo esimweni esiphuthumayo"</string>
+    <string name="satellite_sos_sharing_preferences_step_2" msgid="738246589687762115">"IGoogle Account yakho"</string>
+    <string name="satellite_sos_sharing_preferences_description" msgid="782508188142964342">"Hlola noma ubuyekeze imininingwane ezothunyelwa kumasevisi ezimo eziphuthumayo"</string>
+    <!-- no translation found for satellite_sos_learn_more_link (2442930426165677255) -->
+    <skip />
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Amagama wephoyinti lokufinyelela"</string>
     <string name="keywords_access_point_names" msgid="8174967126858505945">"i-apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ayitholakali uma ixhumeke ku-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -4996,6 +5116,9 @@
     <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Uphakathi kwemodi engu-16KB yemodi yokusebenza emakhasini onke. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwinini ngenkathi ibootloader ivuliwe ingaba sengozini. Ezinye izakhi zizokhutshazwa kula mamodi, ngakho amanye ama-app angase angasebenzi. Ukuze uphinde ufake imodi yokukhiqiza, kufanele, ushintshele emuva kumodi engu-4KB bese ukhiya ibootloader yedivayisi. Lokhu kuzosetha kabusha njengasekuqaleni idivayisi kuyibuyisele kumasethingi okukhiqiza. Ngemva kokuthi idivayisi iqale ngempumelelo ku-Android, khubaza ukuvula kwe-OEM Kokungakhethwa kukho konjiniyela. Uma idivayisi yehluleka ukuqalisa ku-Android noma ingazinzile, khanyisa kabusha idivayisi ngemifanekiso yefemu evela kokuthi &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers .google.com/android/images&lt;/a&gt; noma usebenzise okuthi &lt;a href=\"https://flash.android.com/back-to-public\"&gt;https://flash.android.com/back-to-public&lt;/a&gt; bese ukhetha okuthi \'Sula Idivayisi\', \'Khiya IBootloader\' kanye nokuthi \'Phoqelela IFlash ezingxenyeni zonke\'."</string>
     <string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Imodi ye-Page-agnostic ka-16KB"</string>
     <string name="page_agnostic_notification_action" msgid="2309805437430150456">"Funda kabanzi"</string>
+    <string name="enable_16k_app_compat_title" msgid="4173159228844992989">"Qalisa i-app ngemodi yokuhlanganisa usayizi wekhasi"</string>
+    <!-- no translation found for enable_16k_app_compat_details (3389401258168314266) -->
+    <skip />
     <string name="bug_report_handler_title" msgid="713439959113250125">"Isibambi sombiko wesiphazamiso"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Icacisa ukuthi uluphi uhlelo lokusebenza oluphatha isinqamuleli sombiko wesiphazamisi kudivayisi yakho."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Okomuntu siqu"</string>
@@ -5434,7 +5557,21 @@
     <string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Lalela ukusakaza"</string>
     <string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skena ikhodi ye-QR yokusakaza komsindo ukuze ulalele nge-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"Ayikwazi ukuhlela iphasiwedi ngenkathi yabelana. Ukuze ushintshe iphasiwedi, qala uvale ukwabelana ngokuqoshiwe."</string>
+    <string name="audio_streams_main_page_password_dialog_format_alert" msgid="4129498127640454717">"Iphasiwedi yakho kumelwe ibe nezinhlamvu ezi-4 kuya kweziyi-16 futhi kumelwe isebenzise kuphela izinhlamvu zamagama, izinombolo kanye nezimpawu"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"Iskena sekhodi ye-QR"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Udinga usizo?"</annotation></string>
     <string name="homepage_search" msgid="6759334912284663559">"Amasethingi Okusesha"</string>
+    <string name="keywords_contacts_storage" msgid="9061213057165337893">"oxhumana nabo, isitoreji, i-akhawunti"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Isitoreji soxhumana nabo"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Idivayisi kuphela"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Oxhumana nabo abasha ngeke bavumelaniswe ne-akhawunti"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Oxhumana nabo bazolondolozwa kudivayisi yakho futhi bavumelaniswe ne-akhawunti yakho ngokuzenzakalelayo"</string>
+    <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Iphutha ekusetheni i-akhawunti ezenzekelayo"</string>
+    <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ayikho isethi ezenzekelayo"</string>
+    <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Idivayisi kuphela"</string>
+    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Idivayisi ne-%1$s"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Faka i-akhawunti ukuze uqalise"</string>
+    <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Lapho ugcina khona oxhumana nabo"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Khethela Ukusesha"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Thinta uphinde ubambe inkinobho yokubuyela ekhasini lasekhaya noma isibambi sokufuna ukuze useshe usebenzisa okuqukethwe okusesikrinini sakho."</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 327ff44503e..febdb0412a4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1503,12 +1503,14 @@
 
     <!-- A locale list of not supporting Terms of Address. [DO NOT TRANSLATE] -->
     <string-array name="terms_of_address_unsupported_locales">
-        <item>fr-CA</item> <!-- French (Canada) -->
     </string-array>
 
     <!-- A language list of supporting Terms of Address. [DO NOT TRANSLATE] -->
     <string-array name="terms_of_address_supported_languages">
         <item>fr</item> <!-- French -->
+        <item>es</item> <!-- Spanish -->
+        <item>it</item> <!-- Italian -->
+        <item>de</item> <!-- German -->
     </string-array>
 
     <!-- Entries for private space auto lock option -->
@@ -1549,7 +1551,7 @@
         <item>@*android:drawable/ic_zen_mode_icon_snowflake</item>
         <item>@*android:drawable/ic_zen_mode_icon_beach</item>
         <item>@*android:drawable/ic_zen_mode_icon_workshop</item>
-        <item>@*android:drawable/ic_zen_mode_icon_camping</item>
+        <item>@*android:drawable/ic_zen_mode_icon_piano</item>
         <item>@*android:drawable/ic_zen_mode_type_theater</item> <!-- Film reel -->
         <item>@*android:drawable/ic_zen_mode_icon_book</item>
         <!-- Wellbeing -->
@@ -1565,7 +1567,7 @@
         <item>@*android:drawable/ic_zen_mode_icon_child</item>
         <item>@*android:drawable/ic_zen_mode_icon_animal_paw</item>
         <!-- Generic / abstract -->
-        <item>@*android:drawable/ic_zen_mode_type_unknown</item> <!-- Star badge -->
+        <item>@*android:drawable/ic_zen_mode_icon_star_badge</item>
         <item>@*android:drawable/ic_zen_mode_type_managed</item> <!-- Two people / Supervisor -->
         <item>@*android:drawable/ic_zen_mode_type_other</item> <!-- Star -->
         <item>@*android:drawable/ic_zen_mode_icon_heart</item>
@@ -1600,7 +1602,7 @@
         <item>Snowflake</item>
         <item>Beach umbrella</item>
         <item>Workshop tools</item>
-        <item>Tent</item>
+        <item>Piano</item>
         <item>Film reel</item>
         <item>Book</item>
         <!-- Wellbeing -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 95b38cb5250..0b7e0c1eb65 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -94,7 +94,7 @@
     <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
+    <color name="search_bar_background">@androidprv:color/materialColorSurfaceBright</color>
 
     <color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
 
@@ -166,7 +166,7 @@
     <color name="battery_info_error_color_black">@*android:color/primary_text_default_material_light</color>
 
     <!-- Background for multiple user settings page avatars -->
-    <color name="user_avatar_color_bg">?androidprv:attr/materialColorSurfaceContainer</color>
+    <color name="user_avatar_color_bg">@androidprv:color/materialColorSurfaceContainer</color>
 
     <!-- Icon tint color for battery usage system icon -->
     <color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>
@@ -221,4 +221,7 @@
 
     <!-- Pointer fill color setting outline color-->
     <color name="pointer_fill_outline_color">#000000</color>
+
+    <!-- Connected displays -->
+    <color name="display_topology_background_color">@color/settingslib_color_grey100</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index da71b51e80c..95f8eba8f84 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -772,6 +772,9 @@
         58.0001 29.2229,56.9551 26.8945,55.195
     </string>
 
+    <!-- Duration in milliseconds of the udfps title/sub-title scrolling once animation. -->
+    <integer name="config_biometrics_header_scroll_duration">1000</integer>
+
     <!-- Whether auto data switching on secondary SIM enables cross-SIM calling on both SIMs. -->
     <bool name="config_auto_data_switch_enables_cross_sim_calling">false</bool>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c9a67e462bb..d202f850a11 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -156,8 +156,13 @@
     <dimen name="sfps_progress_bar_translate_y">2dp</dimen>
     <dimen name="sfps_lottie_translate_x">12dp</dimen>
     <dimen name="sfps_lottie_translate_y">12dp</dimen>
+    <dimen name="sfps_enroll_finish_icon_margin_top">-24dp</dimen>
     <dimen name="udfps_lottie_translate_y">0dp</dimen>
     <dimen name="udfps_lottie_padding_top">20dp</dimen>
+    <dimen name="biometrics_glif_header_height">274dp</dimen>
+    <item name="biometrics_glif_header_height_ratio" format="float" type="dimen">0.27</item>
+    <!-- For showing when Display / Font size set to largest -->
+    <item name="biometrics_glif_header_height_ratio_large" format="float" type="dimen">0.37</item>
 
     <!-- Face -->
     <item name="face_preview_translate_y" format="float" type="dimen">0</item>
@@ -195,6 +200,8 @@
     <dimen name="pointer_scale_padding">8dp</dimen>
     <item name="pointer_scale_size_start" format="float" type="dimen">1.0</item>
     <item name="pointer_scale_size_end" format="float" type="dimen">2.5</item>
+    <dimen name="radio_group_style_padding">8dp</dimen>
+    <dimen name="radio_group_style_text_padding">21dp</dimen>
 
     <!-- RemoteAuth-->
     <dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>
@@ -532,4 +539,7 @@
     <dimen name="zen_mode_circular_icon_margin_between">4dp</dimen>
     <dimen name="zen_mode_circular_icon_margin_vertical">8dp</dimen>
     <dimen name="zen_mode_circular_icon_text_size">18dp</dimen>
+
+    <!-- Connected displays -->
+    <dimen name="display_topology_pane_margin">24dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aae8eda08e2..8882829b58c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,9 +33,9 @@
     <string name="device_info_protected_single_press">Tap to show info</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <string name="show_dev_countdown">{count, plural,
-      =1      {You are now # step away from being a developer.}
-      other   {You are now # steps away from being a developer.}
-    }</string>
+        =1      {You are now # step away from being a developer.}
+        other   {You are now # steps away from being a developer.}
+        }</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
     <string name="show_dev_on">You are now a developer!</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
@@ -136,6 +136,8 @@
     <string name="keywords_add_bt_device">bluetooth</string>
     <!-- Title for bluetooth auto on toggle [CHAR LIMIT=60] -->
     <string name="bluetooth_screen_auto_on_title">Automatically turn on tomorrow</string>
+    <!-- Summary for bluetooth auto on toggle [CHAR LIMIT=60] -->
+    <string name="bluetooth_screen_auto_on_summary">If you turn off Bluetooth, it turns on again the next day</string>
 
 
     <!-- Button to help user to pair right ear of the hearing aid device. It will show when only one of the hearing aid device set is connected. [CHAR LIMIT=20] -->
@@ -260,6 +262,13 @@
     <string name="bluetooth_disable_leaudio_summary">Disables Bluetooth LE audio feature if the device supports LE audio hardware capabilities.</string>
     <!-- Setting toggle title for switch Bluetooth LE Audio mode. [CHAR LIMIT=40] -->
     <string name="bluetooth_leaudio_mode">Bluetooth LE Audio mode</string>
+
+    <!-- Setting toggle title for enabling Bluetooth LE Audio UI preview. [CHAR LIMIT=none] -->
+    <string name="bluetooth_leaudio_broadcast_ui">Enable Bluetooth LE Audio Broadcast UI preview</string>
+    <!-- Summary of toggle for enabling Bluetooth LE Audio UI preview. [CHAR LIMIT=none]-->
+    <string name="bluetooth_leaudio_broadcast_ui_summary">Enables the LE Audio Sharing UI preview
+        including personal audio sharing and private broadcast</string>
+
     <!-- Setting toggle title for enabling Bluetooth LE Audio toggle in Device Details. [CHAR LIMIT=40] -->
     <string name="bluetooth_show_leaudio_device_details">Show LE audio toggle in Device Details</string>
 
@@ -393,6 +402,18 @@
     <!-- Category for the app's locale picker activity. [CHAR LIMIT=50]-->
     <string name="all_supported_app_locales_title">All languages</string>
 
+    <!-- Category for suggested locales. [CHAR LIMIT=50]-->
+    <string name="suggested_locales_title">Suggested</string>
+
+    <!-- Category for the locale picker. [CHAR LIMIT=50]-->
+    <string name="all_supported_locales_title">All languages</string>
+
+    <!-- Category for the locale region picker. [CHAR LIMIT=50]-->
+    <string name="all_supported_locales_regions_title">All regions</string>
+
+    <!-- Category for the numbering system of locale region picker. [CHAR LIMIT=50]-->
+    <string name="all_supported_numbering_system_title">All numbering systems</string>
+
     <!-- Title for preference of the system default locale. [CHAR LIMIT=50]-->
     <string name="preference_of_system_locale_title">System language</string>
 
@@ -441,6 +462,17 @@
     <!-- The text of the confirmation dialog for saying this selected locale is unavailable to use. [CHAR LIMIT=NONE]-->
     <string name="desc_unavailable_locale">This language can’t be used as a system language, but you’ve let apps and websites know you prefer this language.</string>
 
+    <!-- Menu item in the locale menu  [CHAR LIMIT=30] -->
+    <string name="locale_search_menu">Search</string>
+    <!-- Title for the language selection screen [CHAR LIMIT=25] -->
+    <string name="language_selection_title">Add a language</string>
+    <!-- Title for the region selection screen [CHAR LIMIT=25] -->
+    <string name="country_selection_title">Region preference</string>
+    <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] -->
+    <string name="search_language_hint">Type language name</string>
+    <!-- Category for more language settings. [CHAR LIMIT=NONE]-->
+    <string name="more_language_settings_category">More language settings</string>
+
     <!-- Regional Preferences begin -->
     <!-- The title of the menu entry of regional preferences. [CHAR LIMIT=50] -->
     <string name="regional_preferences_title">Regional preferences</string>
@@ -450,6 +482,8 @@
     <string name="regional_preferences_main_page_sub_title">Let apps know your regional preferences so they can personalize your experience.</string>
     <!-- The subtitle of option's page of regional preferences for Temperature units, Calendar and First day of week. [CHAR LIMIT=NONE] -->
     <string name="regional_preferences_option_page_sub_title">Apps will use your regional preferences where possible.</string>
+    <!-- Category for the regional preferences. [CHAR LIMIT=NONE]-->
+    <string name="regional_preferences_category_title">Regional preferences</string>
     <!-- The title of menu entry of Temperature unit preference. [CHAR LIMIT=50] -->
     <string name="temperature_preferences_title">Temperature</string>
     <!-- The title of the  menu entry of First day of week preference. [CHAR LIMIT=50]  -->
@@ -502,9 +536,9 @@
 
     <!-- The title of the confirmation dialog shown when the user selects one / several languages and tries to remove them [CHAR LIMIT=60] -->
     <string name="dlg_remove_locales_title">{count, plural,
-      =1      {Remove selected language?}
-      other   {Remove selected languages?}
-    }</string>
+        =1      {Remove selected language?}
+        other   {Remove selected languages?}
+        }</string>
 
     <!-- The text of the confirmation dialog shown when the user selects several languages and tries to remove them [CHAR LIMIT=NONE] -->
     <string name="dlg_remove_locales_message">Text will be displayed in another language.</string>
@@ -571,11 +605,15 @@
     <string name="roaming_warning">Roaming charges may apply.</string>
 
     <!-- Date & time setting screen setting switch title: whether the system clock (Unix epoch time) should be determined automatically [CHAR LIMIT=100] -->
-    <string name="date_time_auto">Set time automatically</string>
+    <string name="date_time_auto">Automatic date and time</string>
+    <!-- Date & time setting screen setting switch summary: whether the system clock (Unix epoch time) should be determined automatically [CHAR LIMIT=100] -->
+    <string name="date_time_auto_summary">Set automatically using your network and wireless signals</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 automatically</string>
+    <string name="zone_auto_title">Automatic time zone</string>
+    <!-- Date & time setting screen setting switch summary: whether the time zone should be determined automatically [CHAR LIMIT=100]  -->
+    <string name="zone_auto_title_summary">Set automatically based on mobile networks near you</string>
     <!-- Date & time setting screen setting switch summary for non-telephony devices [CHAR LIMIT=100] -->
-    <string name="auto_zone_requires_location_summary">Location will be used for setting the time zone when this toggle is on</string>
+    <string name="auto_zone_requires_location_summary">Set automatically using your device location, if available</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 -->
@@ -650,9 +688,9 @@
     <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]-->
     <string name="location_settings_summary_location_on">{count, plural,
-      =1      {On / # app has access to location}
-      other   {On / # apps have access to location}
-    }</string>
+        =1      {On / # app has access to location}
+        other   {On / # apps have access to location}
+        }</string>
     <!-- Location settings, loading the number of apps which have location permission [CHAR LIMIT=30] -->
     <string name="location_settings_loading_app_permission_stats">Loading\u2026</string>
     <!-- Location settings footer warning text when location is on [CHAR LIMIT=NONE] -->
@@ -733,6 +771,8 @@
     <string name="security_settings_face_enroll_introduction_accessibility_diversity"></string>
     <!-- Message shown for a toggle which when enabled, allows the user to enroll using a simpler flow for accessibility [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_introduction_accessibility_vision"></string>
+    <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_enroll_introduction_learn_more_message"></string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
@@ -841,9 +881,9 @@
     <string name="fingerprint_add_title">Add fingerprint</string>
     <!-- Message showing the current number of fingerprints set up. Shown for a menu item that launches fingerprint settings or enrollment. -->
     <string name="security_settings_fingerprint_preference_summary">{count, plural,
-      =1      {Fingerprint added}
-      other   {# fingerprints added}
-    }</string>
+        =1      {Fingerprint added}
+        other   {# fingerprints added}
+        }</string>
     <!-- message shown in summary field when no fingerprints are registered -->
     <string name="security_settings_fingerprint_preference_summary_none">Setup needed</string>
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature [CHAR LIMIT=29] -->
@@ -860,6 +900,8 @@
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1">You and your child are in control</string>
     <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2">Keep in mind</string>
+    <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_3">Secure and helpful</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog, when fingerprint unlock is disabled by device admin [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled">Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
@@ -890,6 +932,8 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6">For best results, use a screen protector that\u2019s Made for Google certified. With other screen protectors, your child\u2019s fingerprint may not work.</string>
     <!-- Introduction detail message shown in fingerprint enrollment introduction to learn more about fingerprint [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more"></string>
+    <!-- Introduction detail message shown in fingerprint enrollment introduction to learn more about fingerprint [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more_2"></string>
 
     <!-- Watch unlock enrollment and settings --><skip />
     <!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->
@@ -1223,6 +1267,16 @@
     <string name="security_settings_fingerprint_bad_calibration_title">Can\u2019t use fingerprint sensor</string>
     <!-- Text shown during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->
     <string name="security_settings_fingerprint_bad_calibration">Visit a repair provider.</string>
+
+    <!-- Key for screen off udfps unlock feature. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_screen_off_unlock_udfps_key" translatable="false">security_settings_screen_off_unlock_udfps</string>
+    <!-- Title for  Key for screen off udfps unlock feature. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_screen_off_unlock_udfps_title">Screen-off Fingerprint Unlock</string>
+    <!-- Description for screen off udfps unlock feature. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_screen_off_unlock_udfps_description">Use Fingerprint Unlock even when the screen is off</string>
+    <!-- Description for screen off udfps unlock feature. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_screen_off_unlock_udfps_keywords">Screen-off, Unlock</string>
+
     <!-- Title for the section that has additional security settings. [CHAR LIMIT=60] -->
     <string name="security_advanced_settings">More security settings</string>
     <!-- String for the "More security settings" summary when a work profile is on the device. [CHAR_LIMIT=NONE] -->
@@ -1442,6 +1496,12 @@
     <string name="private_space_category_lock">Lock</string>
     <!-- The title of the category for settings related to hiding the private space  [CHAR LIMIT=20] -->
     <string name="private_space_category_hide">Hide</string>
+    <!-- Header on pattern confirm screen inside private space settings when separate lock set for private space [CHAR LIMIT=50] -->
+    <string name="private_space_confirm_your_pattern_header">Confirm your private space pattern</string>
+    <!-- Header on PIN confirm screen inside private space settings when separate lock set for private space [CHAR LIMIT=50] -->
+    <string name="private_space_confirm_your_pin_header">Re-enter your private space PIN</string>
+    <!-- Header on password confirm screen inside private space when separate lock set for private space[CHAR LIMIT=50] -->
+    <string name="private_space_confirm_your_password_header">Re-enter your private space password</string>
 
     <!-- Text shown when "Add fingerprint" button is disabled -->
     <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>
@@ -1676,21 +1736,21 @@
 
     <!-- Hint shown in dialog screen when password is too short -->
     <string name="lockpassword_password_too_short">{count, plural,
-      =1      {Must contain at least # character}
-      other   {Must be at least # characters}
-    }</string>
+        =1      {Must contain at least # character}
+        other   {Must be at least # characters}
+        }</string>
     <!-- Hint shown in dialog screen when password is too short and only using numbers. [CHAR LIMIT=NONE] -->
     <string name="lockpassword_password_too_short_all_numeric">
         {count, plural,
-            =1    {If using only numbers, must be at least 1 digit}
-            other {If using only numbers, must be at least # digits}
+        =1    {If using only numbers, must be at least 1 digit}
+        other {If using only numbers, must be at least # digits}
         }
     </string>
     <!-- Hint shown in dialog screen when PIN is too short -->
     <string name="lockpassword_pin_too_short">{count, plural,
-      =1      {PIN must contain at least # digit}
-      other   {PIN must be at least # digits}
-    }</string>
+        =1      {PIN must contain at least # digit}
+        other   {PIN must be at least # digits}
+        }</string>
 
     <!-- Hint shown in dialog screen when PIN is too short with Additional text indicating minAutoConfirmLen(eg: 6) digits PIN offer additional security -->
     <string name="lockpassword_pin_too_short_autoConfirm_extra_message">{count, plural,
@@ -1700,14 +1760,14 @@
 
     <!-- Error shown in popup when password is too long -->
     <string name="lockpassword_password_too_long">{count, plural,
-      =1      {Must be fewer than # character}
-      other   {Must be fewer than # characters}
-    }</string>
+        =1      {Must be fewer than # character}
+        other   {Must be fewer than # characters}
+        }</string>
     <!-- Error shown in popup when PIN is too long -->
     <string name="lockpassword_pin_too_long">{count, plural,
-      =1      {Must be fewer than # digit}
-      other   {Must be fewer than # digits}
-    }</string>
+        =1      {Must be fewer than # digit}
+        other   {Must be fewer than # digits}
+        }</string>
 
     <!-- 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>
@@ -1717,45 +1777,45 @@
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
     <string name="lockpassword_password_requires_letters">{count, plural,
-      =1      {Must contain at least 1 letter}
-      other   {Must contain at least # letters}
-    }</string>
+        =1      {Must contain at least 1 letter}
+        other   {Must contain at least # letters}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
     <string name="lockpassword_password_requires_lowercase">{count, plural,
-      =1      {Must contain at least 1 lowercase letter}
-      other   {Must contain at least # lowercase letters}
-    }</string>
+        =1      {Must contain at least 1 lowercase letter}
+        other   {Must contain at least # lowercase letters}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
     <string name="lockpassword_password_requires_uppercase">{count, plural,
-      =1      {Must contain at least 1 uppercase letter}
-      other   {Must contain at least # uppercase letters}
-    }</string>
+        =1      {Must contain at least 1 uppercase letter}
+        other   {Must contain at least # uppercase letters}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
     <string name="lockpassword_password_requires_numeric">{count, plural,
-      =1      {Must contain at least 1 numerical digit}
-      other   {Must contain at least # numerical digits}
-    }</string>
+        =1      {Must contain at least 1 numerical digit}
+        other   {Must contain at least # numerical digits}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
     <string name="lockpassword_password_requires_symbols">{count, plural,
-      =1      {Must contain at least 1 special symbol}
-      other   {Must contain at least # special symbols}
-    }</string>
+        =1      {Must contain at least 1 special symbol}
+        other   {Must contain at least # special symbols}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
     <string name="lockpassword_password_requires_nonletter">{count, plural,
-      =1      {Must contain at least 1 non-letter character}
-      other   {Must contain at least # non-letter characters}
-    }</string>
+        =1      {Must contain at least 1 non-letter character}
+        other   {Must contain at least # non-letter characters}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-numerical characters -->
     <string name="lockpassword_password_requires_nonnumerical">{count, plural,
-      =1      {Must contain at least 1 non-numerical character}
-      other   {Must contain at least # non-numerical characters}
-    }</string>
+        =1      {Must contain at least 1 non-numerical character}
+        other   {Must contain at least # non-numerical characters}
+        }</string>
 
     <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
     <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent
@@ -1791,9 +1851,9 @@
 
     <!-- Summary of preference to manage device admin apps, informing the user how many device admin apps are installed and active -->
     <string name="number_of_device_admins">{count, plural,
-      =1      {# active app}
-      other   {# active apps}
-    }</string>
+        =1      {# active app}
+        other   {# active apps}
+        }</string>
 
     <!-- Title of preference to manage trust agents -->
     <string name="manage_trust_agents">Trust agents</string>
@@ -1806,9 +1866,9 @@
 
     <!-- Summary of preference to manage device policies when there is trust agent-->
     <string name="manage_trust_agents_summary_on">{count, plural,
-      =1      {1 active trust agent}
-      other   {# active trust agents}
-    }</string>
+        =1      {1 active trust agent}
+        other   {# active trust agents}
+        }</string>
 
     <!-- Bluetooth settings -->
     <!--Used as title on second screen after selecting Bluetooth settings -->
@@ -1953,6 +2013,8 @@
     <string name="external_display_off">Off</string>
     <!-- External Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="external_display_settings_title">External Display</string>
+    <!-- Built-in display settings category. Appears in External displays and Connected Displays fragments. -->
+    <string name="builtin_display_settings_category">Built-in display</string>
     <!-- External Display use. The title of the use preference. [CHAR LIMIT=40] -->
     <string name="external_display_use_title">Use external display</string>
     <!-- External Display resolution settings. The title of the screen. [CHAR LIMIT=40] -->
@@ -1975,6 +2037,8 @@
     <string name="external_display_not_found_footer_title">Your device must be connected to an external display to mirror your screen</string>
     <!-- External Display settings. More resolution options -->
     <string name="external_display_more_options_title">More options</string>
+    <!-- External Display settings. -->
+    <string name="external_display_topology_hint">Hold and drag to rearrange displays.</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
@@ -2287,6 +2351,10 @@
     <string name="wifi_dpp_failure_enrollee_rejected_configuration">Contact the device manufacturer</string>
     <!-- Hint for Wi-Fi connection fail [CHAR LIMIT=NONE]  -->
     <string name="wifi_dpp_check_connection_try_again">Check connection and try again</string>
+    <!-- Hint for Wi-Fi connection fail [CHAR LIMIT=NONE]  -->
+    <string name="wifi_dpp_check_connection_no_matched_ssid">This Wi\u2011Fi network isn\u2019t available right now</string>
+    <!-- Hint for Wi-Fi connection fail [CHAR LIMIT=NONE]  -->
+    <string name="wifi_dpp_check_connection_no_matched_security">There\u2019s a problem with this QR code. Try connecting another way.</string>
     <!-- Title for the fragment choose network [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_choose_network">Choose network</string>
     <!-- Hint for the user to center another device's QR code in the below camera window [CHAR LIMIT=NONE] -->
@@ -2398,19 +2466,19 @@
     <!-- Wi-Fi Advanced Settings --> <skip />
     <!-- Wi-Fi settings screen, Saved networks summary.  This shows below the "Saved networks" item and indicates the number of networks, not including passpoint network, a user has saved. [CHAR LIMIT=30] -->
     <string name="wifi_saved_access_points_summary">{count, plural,
-      =1      {1 network}
-      other   {# networks}
-    }</string>
+        =1      {1 network}
+        other   {# networks}
+        }</string>
     <!-- Wi-Fi settings screen, Saved networks summary.  This shows below the "Saved networks" item and indicates the number of passpoint networks a user has saved. [CHAR LIMIT=30] -->
     <string name="wifi_saved_passpoint_access_points_summary">{count, plural,
-      =1      {1 subscription}
-      other   {# subscriptions}
-    }</string>
+        =1      {1 subscription}
+        other   {# subscriptions}
+        }</string>
     <!-- Wi-Fi settings screen, Saved networks summary.  This shows below the "Saved networks" item and indicates number of whole kinds networks, if there are both normal saved networks and saved passpoint networks. The number will be at least 2, so the one case is only to prevent lint error. [CHAR LIMIT=60] -->
     <string name="wifi_saved_all_access_points_summary">{count, plural,
-      =1      {1 network &amp; subscription}
-      other   {# networks &amp; subscriptions}
-    }</string>
+        =1      {1 network &amp; subscription}
+        other   {# networks &amp; subscriptions}
+        }</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's SSID. [CHAR LIMIT=20] -->
     <string name="wifi_advanced_ssid_title">SSID</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the device's Wi-Fi MAC address. [CHAR LIMIT=50] -->
@@ -2811,9 +2879,9 @@
     <!-- Display settings screen, screen resolution option for high resolution [CHAR LIMIT=45] -->
     <string name="screen_resolution_option_high">High resolution</string>
     <!-- Display settings screen, screen resolution option for full resolution [CHAR LIMIT=45] -->
-    <string name="screen_resolution_option_full">Full resolution</string>
+    <string name="screen_resolution_option_full">Max resolution</string>
     <!-- The footer message for switch screen resolution [CHAR LIMIT=NONE] -->
-    <string name="screen_resolution_footer">Full resolution uses more of your battery. Switching your resolution may cause some apps to restart.</string>
+    <string name="screen_resolution_footer">Max resolution uses more of your battery. Switching your resolution may cause some apps to restart.</string>
     <!-- Message announced to a11y users when they selected one resolution [CHAR LIMIT=NONE] -->
     <string name="screen_resolution_selected_a11y">Selected</string>
 
@@ -2836,16 +2904,12 @@
     <string name="brightness">Brightness level</string>
     <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
     <string name="auto_brightness_title">Adaptive brightness</string>
-    <!-- Note: The content description title is only applied in adaptive brightness detailed page in setup wizard flow, to make the consistency with other accessibility suw pages. -->
-    <!-- ContentDescription title for adaptive brightness detailed page footer. [CHAR LIMIT=60] -->
-    <string name="auto_brightness_content_description_title">About adaptive brightness</string>
     <!-- Description about the feature adaptive brightness -->
     <string name="auto_brightness_description">Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences.</string>
     <!-- Setting option summary when adaptive brightness is on [CHAR LIMIT=NONE] -->
     <string name="auto_brightness_summary_on">On</string>
     <!-- Setting option summary when adaptive brightness is off [CHAR LIMIT=NONE] -->
     <string name="auto_brightness_summary_off">Off</string>
-
     <!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->
     <string name="display_white_balance_title">Display white balance</string>
     <!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->
@@ -2984,17 +3048,17 @@
     <!-- Dark UI screen footer summary text shown to indicate Modes may turn on/off Dark theme automatically according to their triggers. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_modes_footer_summary">
         {count, plural, offset:2
-            =0    {Modes can also activate dark theme}
-            =1    {{mode_1} also activates dark theme}
-            =2    {{mode_1} and {mode_2} also activate dark theme}
-            =3    {{mode_1}, {mode_2}, and {mode_3} also activate dark theme}
-            other {{mode_1}, {mode_2}, and # more also activate dark theme}
+        =0    {Modes can also activate dark theme}
+        =1    {{mode_1} also activates dark theme}
+        =2    {{mode_1} and {mode_2} also activate dark theme}
+        =3    {{mode_1}, {mode_2}, and {mode_3} also activate dark theme}
+        other {{mode_1}, {mode_2}, and # more also activate dark theme}
         }
     </string>
     <!-- Dark UI screen footer action text linking to Modes settings. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_modes_footer_action">Modes settings</string>
     <!-- Even Dimmer setting title. Allows device to reduce brightness even further than standard range. [CHAR LIMIT=NONE] -->
-    <string name="even_dimmer_display_title">Even dimmer</string>
+    <string name="even_dimmer_display_title">Extra dim</string>
     <!-- Even Dimmer setting summary. [CHAR LIMIT=NONE] -->
     <string name="even_dimmer_display_summary">Allow device to go dimmer than usual</string>
 
@@ -3139,9 +3203,9 @@
     <string name="wrong_pin_code_pukked">Incorrect SIM PIN code you must now contact your carrier to unlock your device.</string>
     <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
     <string name="wrong_pin_code">{count, plural,
-      =1      {Incorrect SIM PIN code, you have # remaining attempt before you must contact your carrier to unlock your device.}
-      other   {Incorrect SIM PIN code, you have # remaining attempts.}
-    }</string>
+        =1      {Incorrect SIM PIN code, you have # remaining attempt before you must contact your carrier to unlock your device.}
+        other   {Incorrect SIM PIN code, you have # remaining attempts.}
+        }</string>
 
     <!-- This is instruction text to inform the user that they have entered the wrong SIM PIN while trying to unlock the keyguard.
          The variable will be replaced with a number. [CHAR LIMIT=NONE] -->
@@ -3310,27 +3374,27 @@
 
     <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
     <string name="storage_dialog_unmountable">This <xliff:g id="name" example="SD card">^1</xliff:g> is corrupted.
-\n\nTo use this <xliff:g id="name" example="SD card">^1</xliff:g>, you have to set it up first.</string>
+        \n\nTo use this <xliff:g id="name" example="SD card">^1</xliff:g>, you have to set it up first.</string>
 
     <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
     <string name="storage_internal_format_details">You can format this SD card to store photos, videos, music,
         and more and access them on other devices.
         \n\n<b>All data on this SD card will be erased.</b>
         \n\n<b>Before formatting</b>
-\n\n<b>Back up photos &amp; other media</b>
-\nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable.
-\n\n<b>Back up apps</b>
-\nAll apps stored on this <xliff:g id="name" example="SD card">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.</string>
+        \n\n<b>Back up photos &amp; other media</b>
+        \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable.
+        \n\n<b>Back up apps</b>
+        \nAll apps stored on this <xliff:g id="name" example="SD card">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.</string>
 
     <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
     <string name="storage_internal_unmount_details"><b>When you eject this <xliff:g id="name" example="SD card">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.</b>
-\n\nThis <xliff:g id="name" example="SD card">^1</xliff:g> is formatted to work on this device only.  It won\u2019t work on any others.</string>
+        \n\nThis <xliff:g id="name" example="SD card">^1</xliff:g> is formatted to work on this device only.  It won\u2019t work on any others.</string>
 
     <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
     <string name="storage_internal_forget_details">To use the apps, photos, or data this <xliff:g id="name" example="SD card">^1</xliff:g> contains, reinsert it.
-\n\nAlternatively, you can choose to forget this storage if the device isn\u2019t available.
-\n\nIf you choose to forget, all the data the device contains will be lost forever.
-\n\nYou can reinstall the apps later, but their data stored on this device will be lost.</string>
+        \n\nAlternatively, you can choose to forget this storage if the device isn\u2019t available.
+        \n\nIf you choose to forget, all the data the device contains will be lost forever.
+        \n\nYou can reinstall the apps later, but their data stored on this device will be lost.</string>
 
     <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
     <string name="storage_internal_forget_confirm_title">Forget <xliff:g id="name" example="SD card">^1</xliff:g>?</string>
@@ -3364,7 +3428,7 @@
     <string name="storage_wizard_move_confirm_title">Move <xliff:g id="app" example="Calculator">^1</xliff:g></string>
     <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_move_confirm_body">Moving <xliff:g id="app" example="Calculator">^1</xliff:g> and its data to <xliff:g id="name" example="SD card">^2</xliff:g> will take only a few moments. You won\u2019t be able to use the app until the move is complete.
-\n\nDon\u2019t remove the <xliff:g id="name" example="SD card">^2</xliff:g> during the move.
+        \n\nDon\u2019t remove the <xliff:g id="name" example="SD card">^2</xliff:g> during the move.
     </string>
 
     <!-- Body of lock screen challenge message explaining that the given user must be unlocked before data can be moved [CHAR LIMIT=64] -->
@@ -3374,7 +3438,7 @@
     <string name="storage_wizard_move_progress_title">Moving <xliff:g id="app" example="Calculator">^1</xliff:g>\u2026</string>
     <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_move_progress_body">Don\u2019t remove the <xliff:g id="name" example="SD card">^1</xliff:g> during the move.
-\n\nThe <xliff:g id="app" example="Calculator">^2</xliff:g> app on this device won\u2019t be available until the move is complete.
+        \n\nThe <xliff:g id="app" example="Calculator">^2</xliff:g> app on this device won\u2019t be available until the move is complete.
     </string>
 
     <!-- This is the title of a full-screen message. After this question, the user will get to choose how they want to use the storage device that they have in their phone. The placeholder is for the specific device (e.g. SD card, USB drive, etc.). [CHAR LIMIT=32] -->
@@ -3394,7 +3458,7 @@
     <string name="storage_wizard_format_confirm_v2_title">Format this <xliff:g id="name" example="SD card">^1</xliff:g>?</string>
     <!-- Body of a dialog. This text is confirming that the user wants to use their SD card as extra phone storage, but the formatting process will erase existing content on the card. The first placeholder is for the name of the device (e.g. a brand name of the SD card or USB drive). The second and third placeholders are for the general references (e.g. SD card, USB drive). [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_format_confirm_v2_body">This <xliff:g id="name" example="SanDisk SD card">^1</xliff:g> needs to be formatted to store apps, files, and media.
-\n\nFormatting will erase existing content on the <xliff:g id="name" example="SD card">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="name" example="SD card">^3</xliff:g> or device.</string>
+        \n\nFormatting will erase existing content on the <xliff:g id="name" example="SD card">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="name" example="SD card">^3</xliff:g> or device.</string>
     <!-- Body of a dialog. This text is confirming that the user wants to use their SD card as portable storage, but the formatting process will erase existing content on the card. The first placeholder is for the name of the device (e.g. a brand name of the SD card or USB drive). The second and third placeholders are for the general references (e.g. SD card, USB drive). [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_format_confirm_v2_body_external">This <xliff:g id="name" example="SanDisk SD card">^1</xliff:g> needs to be formatted to store photos, videos, music, and more.
         \n\nFormatting will erase existing content on the <xliff:g id="name" example="SD card">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="name" example="SD card">^3</xliff:g> or device.</string>
@@ -3423,8 +3487,8 @@
     <string name="storage_wizard_slow_v2_title">Slow <xliff:g id="name" example="SD card">^1</xliff:g></string>
     <!-- Strings that are part of a full-screen message. These strings let the user know that their storage device is slow, and include some options they can try. The first placeholder is for the name of the storage device (e.g. brand name of the SD card), and the second and third placeholders are for the general references (e.g. SD card, USB drive, etc.). [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_slow_v2_body">You can still use this <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>, but it may be slow.
-\n\nApps stored on this <xliff:g id="name" example="SD card">^2</xliff:g> may not work properly, and content transfers could take a long time.
-\n\nTry using a faster <xliff:g id="name" example="SD card">^3</xliff:g>, or use this <xliff:g id="name" example="SD card">^4</xliff:g> for portable storage instead.</string>
+        \n\nApps stored on this <xliff:g id="name" example="SD card">^2</xliff:g> may not work properly, and content transfers could take a long time.
+        \n\nTry using a faster <xliff:g id="name" example="SD card">^3</xliff:g>, or use this <xliff:g id="name" example="SD card">^4</xliff:g> for portable storage instead.</string>
     <!-- Action of a dialog. This action will start the wizard from the beginning, letting the user make an alternative choice. [CHAR LIMIT=32] -->
     <string name="storage_wizard_slow_v2_start_over">Start over</string>
     <!-- Action of a dialog. This action will continue the wizard, meaning the user acknowledges their card is slow. [CHAR LIMIT=32] -->
@@ -3739,9 +3803,9 @@
 
     [CHAR LIMIT=NONE]-->
     <string name="location_app_permission_summary_location_on">{count, plural,
-      =1      {# of {total} apps has access to location}
-      other   {# of {total} apps have access to location}
-    }</string>
+        =1      {# of {total} apps has access to location}
+        other   {# of {total} apps have access to location}
+        }</string>
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for recent location access -->
     <string name="location_category_recent_location_access">Recent access</string>
     <!-- Location settings screen, displayed when there're more than three recent location access apps [CHAR LIMIT=30] -->
@@ -3772,7 +3836,7 @@
     <string name="location_services_screen_title">Location services</string>
 
     <!-- [CHAR LIMIT=60] Date&Time settings screen, toggle button title -->
-    <string name="location_time_zone_detection_toggle_title">Use location</string>
+    <string name="location_time_zone_detection_toggle_title">Use location for time zone</string>
     <!-- [CHAR LIMIT=50] Date&Time settings screen, title of the dialog when AutoTimeZone is degraded -->
     <string name="location_time_zone_detection_status_title">Cannot set the time zone automatically</string>
     <!-- Date&Time settings screen, summary of the dialog when AutoTimeZone is degraded by settings-->
@@ -3800,7 +3864,7 @@
     <!-- [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 is off</string>
+    <string name="location_time_zone_detection_auto_is_off">Not available when automatic time zone is off</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. -->
@@ -3811,7 +3875,7 @@
          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=NONE] Location settings screen, summary when location time zone detection is enabled. -->
-    <string name="location_time_zone_detection_auto_is_on">Location may be used to set time zone</string>
+    <string name="location_time_zone_detection_auto_is_on">If your device location is available, it may be used to set your time zone</string>
     <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
     <string name="about_settings_summary">View legal info, status, software version</string>
     <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
@@ -4127,9 +4191,9 @@
     <string name="recent_app_category_title">Recently opened apps</string>
     <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
     <string name="see_all_apps_title">{count, plural,
-      =1      {See all apps}
-      other   {See all # apps}
-    }</string>
+        =1      {See all apps}
+        other   {See all # apps}
+        }</string>
 
     <!-- Title of the dialog that asks the user to contact the IT admin to reset password [CHAR LIMIT=40] -->
     <string name="forgot_password_title">Contact your IT admin</string>
@@ -4160,9 +4224,9 @@
     <string name="cache_size_label">Cache</string>
     <!-- Manage applications, individual application info storage screen. Describes the number of URIs (directories or files) an app has been granted access (by another apps)-->
     <string name="uri_permissions_text">{count, plural,
-      =1      {1 item}
-      other   {# items}
-    }</string>
+        =1      {1 item}
+        other   {# items}
+        }</string>
     <!-- Manage applications, individual application info storage screen. Button below list of URIs. -->
     <string name="clear_uri_btn_text">Clear access</string>
     <!-- Manage applications, Header name used for other controls -->
@@ -4215,7 +4279,7 @@
     <string name="clear_activities">Clear default preferences</string>
     <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
     <string name="screen_compatibility_text">This app may not be designed for your screen. You can control how it
-            adjusts to your screen here.</string>
+        adjusts to your screen here.</string>
     <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
     <string name="ask_compatibility">Ask when launched</string>
     <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
@@ -4479,10 +4543,10 @@
     <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
          message when the user selects to enable a spell checker. -->
     <string name="spellchecker_security_warning">This spell checker may be able to collect
-    all the text you type, including personal data like passwords and credit
-    card numbers.  It comes from the app
-    <xliff:g id="spellchecker_application_name">%1$s</xliff:g>.
-    Use this spell checker?</string>
+        all the text you type, including personal data like passwords and credit
+        card numbers.  It comes from the app
+        <xliff:g id="spellchecker_application_name">%1$s</xliff:g>.
+        Use this spell checker?</string>
     <!-- Image button description for spell checker quick settings. -->
     <string name="spellchecker_quick_settings">Settings</string>
     <!-- Image button description for spell checker language. -->
@@ -4503,22 +4567,64 @@
     <string name="keyboard_a11y_category">Accessibility</string>
     <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->
     <string name="physical_keyboard_title">Physical keyboard</string>
+    <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->
+    <string name="physical_keyboard_layout_picker_title">Physical keyboard layout picker</string>
     <!-- Title for the 'Bounce keys' preference switch. [CHAR LIMIT=35] -->
     <string name="bounce_keys">Bounce keys</string>
     <!-- Summary text for the 'Bounce keys' preference sub-screen. [CHAR LIMIT=300] -->
-    <string name="bounce_keys_summary">The keyboard ignores quickly repeated presses of the same key within <xliff:g id="bounce_keys_threshold" example="500">%1$d</xliff:g> ms</string>
+    <string name="bounce_keys_summary">The keyboard ignores quickly repeated presses of the same key </string>
+    <!-- Title for the 'Bounce keys' threshold dialog. [CHAR LIMIT=35] -->
+    <string name="bounce_keys_dialog_title">Bounce key threshold</string>
+    <!-- Subtitle for the 'Bounce keys' threshold dialog. [CHAR LIMIT=300] -->
+    <string name="bounce_keys_dialog_subtitle">Choose the duration of time your keyboard ignores repeated key presses</string>
+    <!-- Option title for the input setting keys threshold dialog for 200 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_200">0.2s</string>
+    <!-- Option title for the input setting keys threshold dialog for 400 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_400">0.4s</string>
+    <!-- Option title for the input setting keys threshold dialog for 600 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_600">0.6s</string>
+    <!-- Option title for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_custom_title">Custom</string>
+    <!-- Option subtitle for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_custom_value">custom value</string>
+
     <!-- Title for the 'Slow keys' preference switch. [CHAR LIMIT=35] -->
     <string name="slow_keys">Slow keys</string>
     <!-- Summary text for the 'Slow keys' preference sub-screen. [CHAR LIMIT=300] -->
-    <string name="slow_keys_summary">Adjusts the time it takes for a key press to activate to <xliff:g id="slow_keys_threshold" example="500">%1$d</xliff:g> ms</string>
+    <string name="slow_keys_summary">Adjusts the time it takes for a key press to activate</string>
     <!-- Title for the 'Sticky keys' preference switch. [CHAR LIMIT=35] -->
     <string name="sticky_keys">Sticky keys</string>
     <!-- Summary text for the 'Sticky keys' preference sub-screen. [CHAR LIMIT=300] -->
     <string name="sticky_keys_summary">Press one key at a time for shortcuts instead of holding keys down together</string>
     <!-- Title for a toggle switch for 'mouse' keys,  an accessibility setting that allows the mouse pointer to be controlled using certain keys on a physical keyboard if keyboard is connected. [CHAR LIMIT=35] -->
     <string name="mouse_keys">Mouse keys</string>
+    <!-- Title for a toggle switch for 'mouse' keys under mouse key main page,  an accessibility setting that allows the mouse pointer to be controlled using certain keys on a physical keyboard if keyboard is connected. [CHAR LIMIT=35] -->
+    <string name="mouse_keys_main_title">Use mouse keys</string>
     <!-- Summary text for the accessibility setting 'Mouse keys' preference sub-screen. [CHAR LIMIT=100] -->
-    <string name="mouse_keys_summary">Use the physical keyboard to control the mouse.</string>
+    <string name="mouse_keys_summary">Use your keyboard to control the pointer</string>
+    <!-- Title for the 'Mouse reverse scrolling' preference switch, which reverses the direction of mouse scroll wheels so that moving the wheel up scrolls the content down. [CHAR LIMIT=60] -->
+    <string name="mouse_reverse_vertical_scrolling">Mouse reverse scrolling</string>
+    <!-- Summary text for the 'Mouse reverse scrolling' preference switch indicating to users that when the setting is enabled that scrolling up with their mouse wheel will move the page content down. [CHAR LIMIT=NONE] -->
+    <string name="mouse_reverse_vertical_scrolling_summary">Scroll up to move the page down</string>
+    <!-- Title for the 'Swap buttons' preference switch, which swaps the left and right buttons of connected mice so that right click will be the primary action button and left clicking will be the secondary action, for example showing the context menu. [CHAR LIMIT=60] -->
+    <string name="mouse_swap_primary_button">Swap left and right buttons</string>
+    <!-- Summary text for the 'Swap buttons' preference switch indicating to users that when this switch is enabled, their left click will behave as though it is the right click (secondary action) and that the right click will be the primary action. [CHAR LIMIT=NONE] -->
+    <string name="mouse_swap_primary_button_summary">Use the left mouse button as your right</string>
+    <!-- page title for Mouse key main page. [CHAR LIMIT=NONE] -->
+    <string name="mouse_key_main_page_title">Mouse keys for <xliff:g id="keyboard name" example="my keyboard">%s</xliff:g></string>
+    <!-- Summary text for Mouse keys directional image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_directional_summary">Use the \“<xliff:g id="directional_label" example="7,8,9,u,o,j,k,l">%s</xliff:g>\” keys to move the mouse pointer</string>
+    <!-- Summary text for Mouse keys click image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_click_summary">Use the \“<xliff:g id="click_label" example="i">%s</xliff:g>\” key to click the primary mouse button</string>
+    <!-- Summary text for Mouse keys press hold image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_press_hold_summary">Use the \“<xliff:g id="press_hold_label" example="m">%s</xliff:g>\” key to press &amp; hold the primary mouse button</string>
+    <!-- Summary text for Mouse keys release image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_release_summary">Use the \“<xliff:g id="release_label" example=",">%s</xliff:g>\” key to release the primary mouse button</string>
+    <!-- Summary text for Mouse keys toggle scroll image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_toggle_scroll_summary">Use the \“<xliff:g id="release_label_1" example=".">%1$s</xliff:g>\” key to toggle scroll mode. This will make the \“<xliff:g id="release_label_2" example="8, k, o, u">%2$s</xliff:g>\” keys scroll the view top, down, left or right</string>
+    <!-- Summary text for Mouse keys click secondary button image. [CHAR LIMIT=NONE] -->
+    <string name="mouse_keys_release2_summary">Use the \“<xliff:g id="release_2_label" example="/">%s</xliff:g>\” key to click the secondary mouse button</string>
+
     <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->
     <string name="keyboard_shortcuts_helper">Keyboard shortcuts</string>
     <!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->
@@ -4534,6 +4640,8 @@
     <string name="trackpad_settings">Touchpad</string>
     <!-- Title for the button to trigger the 'trackpad settings' page if connect with a touchpad and a mouse. [CHAR LIMIT=35] -->
     <string name="trackpad_mouse_settings">Touchpad &amp; mouse</string>
+    <!-- Title for the button to trigger the 'mouse settings' page if connect with a mouse. [CHAR LIMIT=35] -->
+    <string name="mouse_settings">Mouse</string>
     <!-- Summary text for the 'trackpad settings' page. [CHAR LIMIT=100] -->
     <string name="trackpad_settings_summary">Pointer speed, gestures</string>
 
@@ -4557,6 +4665,8 @@
     <string name="trackpad_bottom_right_tap_summary">Click in the bottom right corner of the touchpad for more options</string>
     <!-- Title text for 'Pointer speed'. [CHAR LIMIT=35] -->
     <string name="trackpad_pointer_speed">Pointer speed</string>
+    <!-- Title text for 'Three finger tap' touchpad preference. This preference allows the user to select an action that will trigger when they tap three fingers on a touchpad. [CHAR LIMIT=60] -->
+    <string name="three_finger_tap_preference_title">Use three finger tap</string>
     <!-- Title text for mouse pointer color. [CHAR LIMIT=35] -->
     <string name="pointer_fill_style">Pointer color</string>
     <!-- Content description for black pointer fill style. [CHAR LIMIT=60] -->
@@ -4581,10 +4691,23 @@
     <string name="pointer_stroke_style_name_none">None</string>
     <!-- Title for the button to trigger the 'touch gesture' education. [CHAR LIMIT=35] -->
     <string name="trackpad_touch_gesture">Learn touchpad gestures</string>
+    <!-- TODO(b/353947750): finalize this string and mark it translatable. -->
+    <!-- Notice displayed at the end of the touchpad settings page when the user has disabled system navigation gestures. "Pointer & touchpad accessibility" and "Use touchpad gestures" refer to other labels in Settings, and should be translated in exactly the same way. -->
+    <string name="trackpad_gestures_disabled_footer_text" translatable="false">Some settings are unavailable as touchpad gestures have been turned off. You can turn them on via Pointer &amp; touchpad accessibility > Use touchpad gestures</string>
     <!-- Search keywords for "touchpad" -->
     <string name="keywords_touchpad">trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer</string>
     <!-- Search keywords for 'Bottom-right tap', the name of the touchpad setting that allows the user to click the bottom right corner of the touchpad for more options. -->
     <string name="keywords_trackpad_bottom_right_tap">right click, tap</string>
+    <!-- Radio button text for 'middle click' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will act as a middle-click when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
+    <string name="three_finger_tap_middle_click">Middle click</string>
+    <!-- Radio button text for 'launch assistant' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will launch the Assistant when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
+    <string name="three_finger_tap_launch_gemini">Launch Assistant</string>
+    <!-- Radio button text for 'Go home' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will take the user home when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
+    <string name="three_finger_tap_go_home">Go home</string>
+    <!-- Radio button text for 'Go back' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will initiate a back gesture when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
+    <string name="three_finger_tap_go_back">Go back</string>
+    <!-- Radio button text for 'View recent apps' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will show the recent apps when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
+    <string name="three_finger_tap_recent_apps">View recent apps</string>
 
     <!-- Title text for 'Go home' gesture education [CHAR LIMIT=35] -->
     <string name="gesture_title_go_home">Go home</string>
@@ -4672,6 +4795,14 @@
     <string name="keyboard_a11y_settings">Physical keyboard accessibility</string>
     <!-- Summary for the button to trigger the 'Physical keyboard accessibility' page. [CHAR LIMIT=NONE] -->
     <string name="keyboard_a11y_settings_summary">Sticky keys, Bounce keys, Mouse keys</string>
+    <!-- Title for the keyboard repeat key option. [CHAR LIMIT=60] -->
+    <string name="keyboard_repeat_keys_title">Repeat Keys</string>
+    <!-- Title for the keyboard repeat key timeout option. [CHAR LIMIT=60] -->
+    <string name="keyboard_repeat_keys_timeout_title">Delay before repeat</string>
+    <!-- Title for the keyboard repeat key delay option. [CHAR LIMIT=60] -->
+    <string name="keyboard_repeat_keys_delay_title">Repeat Rate</string>
+    <!-- Summary for the keyboard repeat key option. [CHAR LIMIT=NONE] -->
+    <string name="keyboard_repeat_keys_summary">Hold down a key to repeat its character until the key is released</string>
 
     <!-- Title text for per IME subtype keyboard layout. [CHAR LIMIT=35] -->
     <string name="ime_label_title"><xliff:g id="ime_label" example="Gboard">%s</xliff:g> layout</string>
@@ -4845,6 +4976,15 @@
     <string name="accessibility_pointer_and_touchpad_summary">Pointer color, pointer size &amp; more</string>
     <!-- Title for the accessibility pointer color customization page. [CHAR LIMIT=50] -->
     <string name="accessibility_pointer_color_customization_title">Pointer color customization</string>
+    <!-- TODO(b/353947750): finalize the four strings below and mark them translatable. -->
+    <!-- Title for the touchpad section of the accessibility pointer and touchpad page. -->
+    <string name="accessibility_touchpad_title" translatable="false">Touchpad</string>
+    <!-- Title for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
+    <string name="accessibility_touchpad_system_gestures_enable_title" translatable="false">Use system gestures</string>
+    <!-- Description text for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
+    <string name="accessibility_touchpad_system_gestures_enable_summary" translatable="false">When turned off, 3- or 4-finger gestures are ignored</string>
+    <!-- List of synonyms used in the settings search bar to find the "Use system gestures" touchpad setting, which allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
+    <string name="keywords_accessibility_touchpad_system_gestures_enable" translatable="false">touchpad, trackpad, swipe</string>
     <!-- Title for the accessibility color contrast page. [CHAR LIMIT=50] -->
     <string name="accessibility_color_contrast_title">Color contrast</string>
     <!-- Intro for the accessibility color contrast page. [CHAR LIMIT=NONE] -->
@@ -5094,18 +5234,18 @@
     <string name="accessibility_tutorial_dialog_twofinger_doubletap_instruction">To start and stop magnification, quickly tap the screen twice with %1$d fingers</string>
     <!-- Instruction for the accessibility tutorial dialog in accessibility service with quick settings shortcut. [CHAR LIMIT=NONE]-->
     <string name="accessibility_tutorial_dialog_message_quick_setting">{count, plural,
-      =1    {To use this feature, swipe down from the top of your screen. Then, find the {featureName} tile.}
-      other {To use this feature, swipe down from the top of your screen with # fingers. Then, find the {featureName} tile.}
-    }</string>
+        =1    {To use this feature, swipe down from the top of your screen. Then, find the {featureName} tile.}
+        other {To use this feature, swipe down from the top of your screen with # fingers. Then, find the {featureName} tile.}
+        }</string>
     <!-- Warning for the accessibility shortcut type that is not available immediately during device setup when chosen, but will be available after setup. [CHAR LIMIT=NONE]-->
     <string name="accessibility_tutorial_dialog_shortcut_unavailable_in_suw">This shortcut will be available after you finish device setup.</string>
     <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is not enabled. [CHAR LIMIT=NONE] -->
     <string name="accessibility_tutorial_dialog_message_gesture">To use this feature, swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.</string>
     <!-- Instruction for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation. [CHAR LIMIT=NONE] -->
     <string name="accessibility_tutorial_dialog_gesture_shortcut_instruction">{count, plural,
-      =1    {To use this feature, swipe up from the bottom of your screen}
-      other {To use this feature, swipe up with # fingers from the bottom of your screen}
-    }</string>
+        =1    {To use this feature, swipe up from the bottom of your screen}
+        other {To use this feature, swipe up with # fingers from the bottom of your screen}
+        }</string>
     <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is enabled. [CHAR LIMIT=NONE] -->
     <string name="accessibility_tutorial_dialog_message_gesture_talkback">To use this feature, swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold.</string>
     <!-- Message for the accessibility tutorial dialog when user chooses gesture navigation in navigation settings, an accessibility service is using the accessibility button, and touch exploration is disabled. [CHAR LIMIT=NONE] -->
@@ -5138,9 +5278,9 @@
     <string name="accessibility_shortcut_edit_dialog_summary_software">Tap the accessibility button <xliff:g id="accessibility_icon" example="[Icon]">%s</xliff:g> at the bottom of your screen. To switch between features, touch &amp; hold the accessibility button.</string>
     <!-- Summary for gesture shortcut option -->
     <string name="accessibility_shortcut_edit_dialog_summary_gesture">{count, plural,
-      =1      {Swipe up from the bottom of your screen. To switch between features, swipe up and hold.}
-      other   {Swipe up with # fingers from the bottom of your screen. To switch between features, swipe up with # fingers and hold.}
-    }</string>
+        =1      {Swipe up from the bottom of your screen. To switch between features, swipe up and hold.}
+        other   {Swipe up with # fingers from the bottom of your screen. To switch between features, swipe up with # fingers and hold.}
+        }</string>
     <!-- Summary for software shortcut in accessibility edit shortcut dialog when user had enabled the accessibility floating button mode (Floating over other apps). [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_summary_software_floating"><annotation id="link">More options</annotation></string>
     <!-- Footer to show help link content description. [CHAR LIMIT=NONE] -->
@@ -5149,14 +5289,14 @@
     <string name="accessibility_shortcut_edit_dialog_title_quick_settings">Quick Settings</string>
     <!-- Summary for quick settings shortcut option in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_summary_quick_settings">{count, plural,
-      =1      {Swipe down from the top of your screen}
-      other   {Swipe down with # fingers from the top of your screen}
-    }</string>
+        =1      {Swipe down from the top of your screen}
+        other   {Swipe down with # fingers from the top of your screen}
+        }</string>
     <!-- Summary for quick settings shortcut option in accessibility edit shortcut dialog in Setup Wizard. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_summary_quick_settings_suw">{count, plural,
-      =1      {Swipe down from the top of your screen. This shortcut will be available after you finish device setup.}
-      other   {Swipe down with # fingers from the top of your screen. This shortcut will be available after you finish device setup.}
-    }</string>
+        =1      {Swipe down from the top of your screen. This shortcut will be available after you finish device setup.}
+        other   {Swipe down with # fingers from the top of your screen. This shortcut will be available after you finish device setup.}
+        }</string>
     <!-- Shown as one of the item in the chosen accessibility shortcut types list presented as a label next to the shortcut toggle. [CHAR LIMIT=NONE] -->
     <string name="accessibility_feature_shortcut_setting_summary_quick_settings">Quick Settings</string>
     <!-- Title for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
@@ -5576,25 +5716,25 @@
 
     <!-- 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] -->
     <string name="accessibilty_autoclick_preference_subtitle_short_delay">{count, plural,
-      =1      {Short ({time} second)}
-      other   {Short ({time} seconds)}
-    }</string>
+        =1      {Short ({time} second)}
+        other   {Short ({time} seconds)}
+        }</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] -->
     <string name="accessibilty_autoclick_preference_subtitle_medium_delay">{count, plural,
-      =1      {Medium ({time} second)}
-      other   {Medium ({time} seconds)}
-    }</string>
+        =1      {Medium ({time} second)}
+        other   {Medium ({time} seconds)}
+        }</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] -->
     <string name="accessibilty_autoclick_preference_subtitle_long_delay">{count, plural,
-      =1      {Long ({time} second)}
-      other   {Long ({time} seconds)}
-    }</string>
+        =1      {Long ({time} second)}
+        other   {Long ({time} seconds)}
+        }</string>
 
     <!-- Summary for autoclick seekbar settings preference when user selected custom item. [CHAR LIMIT=35] -->
     <string name="accessibilty_autoclick_delay_unit_second">{count, plural,
-      =1      {{time} second}
-      other   {{time} seconds}
-    }</string>
+        =1      {{time} second}
+        other   {{time} seconds}
+        }</string>
 
     <!-- Title for accessibility menu item to launch a settings activity. [CHAR LIMIT=15] -->
     <string name="accessibility_menu_item_settings">Settings</string>
@@ -5611,7 +5751,7 @@
     <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
     <string name="captioning_locale">Language</string>
     <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
-    <string name="captioning_text_size">Text size</string>
+    <string name="captioning_text_size">Caption size</string>
     <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
     <string name="captioning_preset">Caption style</string>
     <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
@@ -5756,15 +5896,15 @@
     <string name="print_settings_summary_no_service">Off</string>
 
     <string name="print_settings_summary">{count, plural,
-      =1      {1 print service on}
-      other   {# print services on}
-    }</string>
+        =1      {1 print service on}
+        other   {# print services on}
+        }</string>
 
     <!-- Print setting summary in settings screenm indicating how many print jobs are active [CHAR LIMIT=None] -->
     <string name="print_jobs_summary">{count, plural,
-      =1      {1 print job}
-      other   {# print jobs}
-    }</string>
+        =1      {1 print job}
+        other   {# print jobs}
+        }</string>
 
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
     <string name="print_settings_title">Print services</string>
@@ -5849,7 +5989,7 @@
     <string name="power_usage_summary">What has been using the battery</string>
     <!-- Display the battery level and status [CHAR_LIMIT=60] -->
     <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g>
-            - <xliff:g id="status">%2$s</xliff:g></string>
+        - <xliff:g id="status">%2$s</xliff:g></string>
     <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
     <string name="power_discharge_remaining"><xliff:g id="remain">%1$s</xliff:g> remaining</string>
     <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
@@ -5933,6 +6073,10 @@
 
     <!-- Title for the battery summary tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_summary_title">Apps are running normally</string>
+    <!-- Title for the battery replacement tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_replacement_title">Battery replacement recommended</string>
+    <!-- Summary for the battery replacement tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_replacement_summary">Battery capacity and charging performance are reduced, and battery replacement is recommended.</string>
     <!-- Title for the low battery tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_low_battery_title">Battery level low</string>
     <!-- Summary for the low battery tip [CHAR LIMIT=NONE] -->
@@ -5967,30 +6111,30 @@
     <string name="battery_tip_dialog_message_footer">Includes high-power background activity</string>
     <!-- Title for restricted app preference, showing how many app need to be restricted [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_title">{count, plural,
-      =1      {Restrict # app}
-      other   {Restrict # apps}
-    }</string>
+        =1      {Restrict # app}
+        other   {Restrict # apps}
+        }</string>
     <!-- Title for restricted app preference, showing how many app been restricted [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_handled_title">{count, plural,
-      =1      {{label} recently restricted}
-      other   {# apps recently restricted}
-    }</string>
+        =1      {{label} recently restricted}
+        other   {# apps recently restricted}
+        }</string>
     <!-- Summary for restricted app preference, showing the impact of the apps [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_summary">{count, plural,
-      =1      {{label} has high background battery usage}
-      other   {# apps have high background battery usage}
-    }</string>
+        =1      {{label} has high background battery usage}
+        other   {# apps have high background battery usage}
+        }</string>
     <!-- Summary for restricted app preference, showing the impact of the apps [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_handled_summary">{count, plural,
-      =1      {This app can\'t run in the background}
-      other   {These apps can\'t run in the background}
-    }</string>
+        =1      {This app can\'t run in the background}
+        other   {These apps can\'t run in the background}
+        }</string>
 
     <!-- Title for dialog to restrict the app [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_app_dialog_title">{count, plural,
-      =1      {Restrict app?}
-      other   {Restrict # apps?}
-    }</string>
+        =1      {Restrict app?}
+        other   {Restrict # apps?}
+        }</string>
     <!-- Message for battery tip dialog to show the info to restrict the app [CHAR LIMIT=NONE] -->
     <string name="battery_tip_restrict_app_dialog_message">To save battery, stop <xliff:g id="app">%1$s</xliff:g> from using battery in the background. This app may not work properly and notifications may be delayed.</string>
     <!-- Message for battery tip dialog to show the info to restrict the app, below it app list will be shown as a view [CHAR LIMIT=NONE] -->
@@ -6024,9 +6168,9 @@
     <string name="restricted_app_title">Restricted apps</string>
     <!-- Summary for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->
     <string name="restricted_app_summary">{count, plural,
-      =1      {Limiting battery usage for # app}
-      other   {Limiting battery usage for # apps}
-    }</string>
+        =1      {Limiting battery usage for # app}
+        other   {Limiting battery usage for # apps}
+        }</string>
 
     <!-- Summary for restricted app to show the restriction time [CHAR LIMIT=NONE] -->
     <string name="restricted_app_time_summary">Restricted <xliff:g id="time" example="5 days ago">%1$s</xliff:g></string>
@@ -6046,9 +6190,9 @@
 
     <!-- Summary for battery manager, showing app restricted -->
     <string name="battery_manager_app_restricted">{count, plural,
-      =1      {# app restricted}
-      other   {# apps restricted}
-    }</string>
+        =1      {# app restricted}
+        other   {# apps restricted}
+        }</string>
 
     <!-- Summary for top level battery tile if battery is not present. [CHAR LIMIT=NONE] -->
     <string name="battery_missing_message">Problem reading the battery meter.</string>
@@ -6536,9 +6680,9 @@
     <string name="remove_credential_management_app_dialog_message">This app won\u2019t manage certificates, but it will stay on your device. Any certificates installed by the app will be uninstalled.</string>
     <!-- List item found in the credential management app's authentication policy [CHAR LIMIT=NONE] -->
     <string name="number_of_urls">{count, plural,
-      =1      {# URL}
-      other   {# URLs}
-    }</string>
+        =1      {# URL}
+        other   {# URLs}
+        }</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency dialing signal</string>
@@ -6640,9 +6784,9 @@
 
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <string name="notification_history_count">{count, plural,
-      =1      {# notification}
-      other   {# notifications}
-    }</string>
+        =1      {# notification}
+        other   {# notifications}
+        }</string>
 
     <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
          [CHAR LIMIT=40] -->
@@ -6921,6 +7065,8 @@
     <string name="vpn_disconnect">Disconnect</string>
     <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
     <string name="vpn_version">Version</string>
+    <!-- Field label to show the version number for a VPN app dialog. [CHAR LIMIT=40] -->
+    <string name="vpn_version_info">Version <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
     <!-- Button label to forget a VPN profile [CHAR LIMIT=40] -->
     <string name="vpn_forget_long">Forget VPN</string>
     <!-- Dialog message title to set another VPN app to be always-on [CHAR LIMIT=40] -->
@@ -7061,9 +7207,9 @@
     <string name="done_button">Done</string>
     <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
     <string name="ssl_ca_cert_dialog_title">{count, plural,
-      =1      {Trust or remove certificate}
-      other   {Trust or remove certificates}
-    }</string>
+        =1      {Trust or remove certificate}
+        other   {Trust or remove certificates}
+        }</string>
     <!-- Text of message to show to device owner user whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
     <string name="ssl_ca_cert_info_message_device_owner"> {numberOfCertificates, plural,
         =1 {{orgName} has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about this certificate, contact your admin.}
@@ -7078,9 +7224,9 @@
     <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
     <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
     <string name="ssl_ca_cert_settings_button">{count, plural,
-      =1      {Check certificate}
-      other   {Check certificates}
-    }</string>
+        =1      {Check certificate}
+        other   {Check certificates}
+        }</string>
 
     <!-- User settings screen title [CHAR LIMIT=40] -->
     <string name="user_settings_title">Users</string>
@@ -7353,6 +7499,8 @@
     <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, Battery Replacement [DO NOT TRANSLATE] -->
+    <string name="help_url_battery_replacement" translatable="false"></string>
     <!-- Help URL, Dock Defender [DO NOT TRANSLATE] -->
     <string name="help_url_dock_defender" translatable="false"></string>
     <!-- Help URL, Incompatible charging [DO NOT TRANSLATE] -->
@@ -8038,9 +8186,9 @@
     <!-- Zen Modes: 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}
+        =0    {None}
+        =1    {1 schedule set}
+        other {# schedules set}
         }
     </string>
 
@@ -8076,20 +8224,22 @@
     <!-- Modes: Summary for the modes segment, when at least one mode is active. [CHAR LIMIT=NONE]-->
     <string name="zen_modes_summary_some_active">
         {count, plural, offset:2
-            =0    {}
-            =1    {{mode_1} is active}
-            =2    {{mode_1} and {mode_2} are active}
-            =3    {{mode_1}, {mode_2}, and {mode_3} are active}
-            other {{mode_1}, {mode_2}, and # more are active}
+        =0    {}
+        =1    {{mode_1} is active}
+        =2    {{mode_1} and {mode_2} are active}
+        =3    {{mode_1}, {mode_2}, and {mode_3} are active}
+        other {{mode_1}, {mode_2}, and # more are active}
         }
     </string>
 
     <!-- Modes: Summary for the modes segment, when no modes are active. [CHAR LIMIT=NONE]-->
-    <string name="zen_modes_summary_none_active">
+    <!-- Note: The "0" option should never actually occur. -->
+    <string name="zen_modes_summary">
         {count, plural,
-            =0    {}
-            =1    {1 mode can turn on automatically}
-            other {# modes can turn on automatically}
+        =0    {Do Not Disturb}
+        =1    {{mode_1}}
+        =2    {{mode_1}, {mode_2}}
+        other {{mode_1}, {mode_2}, {mode_3}}
         }
     </string>
 
@@ -8390,25 +8540,25 @@
     <!--  Do not disturb: Summary for zen mode duration setting indicating how long dnd will last when dnd is manually toggled on [CHAR LIMIT=NONE] -->
     <string name="zen_mode_duration_summary_time_hours">
         {count, plural,
-            =1    {1 hour}
-            other {# hours}
+        =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">
         {count, plural,
-            =1    {1 minute}
-            other {# minutes}
+        =1    {1 minute}
+        other {# minutes}
         }
     </string>
 
     <!-- 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}
+        =0    {Off}
+        =1    {Off / 1 schedule can turn on automatically}
+        other {Off / # schedules can turn on automatically}
         }
     </string>
 
@@ -8443,28 +8593,6 @@
     <!-- Do not disturb custom settings duration header [CHAR LIMIT=40]-->
     <string name="zen_custom_settings_duration_header">Duration</string>
 
-    <!-- Do not disturb settings, messages, events and reminders title [CHAR LIMIT=100]-->
-    <string name="zen_msg_event_reminder_title">Messages, events &amp; reminders</string>
-    <!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
-    <string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>
-
-    <!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->
-    <string name="zen_onboarding_ok">Done</string>
-    <!-- Do not disturb onboarding dialog, on click user goes to dnd settings page [CHAR LIMIT=30]-->
-    <string name="zen_onboarding_settings">Settings</string>
-
-    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_new_setting_title">No visuals or sound from notifications</string>
-    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_current_setting_title">No sound from notifications</string>
-    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
-    <string name="zen_onboarding_new_setting_summary">You won\u2019t see or hear notifications. Calls from starred contacts and repeat callers are allowed.</string>
-    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
-    <string name="zen_onboarding_current_setting_summary">(Current setting)</string>
-
-    <!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_dnd_visual_disturbances_header">Change Do Not Disturb notification settings?</string>
-
     <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->
     <string name="sound_work_settings">Work profile sounds</string>
 
@@ -8653,6 +8781,13 @@
     <!-- Configure Notifications: Title for the option controlling notifications for work profile. [CHAR LIMIT=30] -->
     <string name="locked_work_profile_notification_title">When work profile is locked</string>
 
+    <!-- Configure notifications: Title for the option controlling whether or not to minimalize the
+    number of notifications to show on the lock screen[CHAR LIMIT=60] -->
+    <string name="lock_screen_notif_minimalism">Lock screen notification minimalism</string>
+
+    <!-- Configure notifications: Summary for option lock_screen_notif_minimalism. [CHAR LIMIT=100] -->
+    <string name="lock_screen_notif_minimalism_summary">Show fewer notifications on lock screen</string>
+
     <!-- Configure notifications: Title for the option controlling whether only new notifications are displayed to the user
     on the lock screen [CHAR LIMIT=60] -->
     <string name="unseen_notifs_lock_screen">Show only new notifications on lock screen</string>
@@ -8660,6 +8795,18 @@
     <!-- Configure notifications: Summary for option of showing only new notifications on the lock screen. [CHAR LIMIT=100] -->
     <string name="unseen_notifs_lock_screen_summary">Automatically remove previously viewed notifications from the lock screen</string>
 
+    <!-- Configure notifications: Value for lockscreen notifications: show all notifications [CHAR LIMIT=60] -->
+    <string name="lock_screen_notifs_show_full_list">Full list</string>
+
+    <!-- Configure notifications: Summary for lockscreen notifications: show all notifications [CHAR LIMIT=100] -->
+    <string name="lock_screen_notifs_full_list_desc">The current default placement is a full shelf and notification stack.</string>
+
+    <!-- Configure notifications: Value for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=60] -->
+    <string name="lock_screen_notifs_show_compact">Compact</string>
+
+    <!-- Configure notifications: Summary for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=60] -->
+    <string name="lock_screen_notifs_compact_desc">New notifications are collapsed into a shelf on your lockscreen.</string>
+
     <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->
     <string name="lock_screen_notifs_title">Notifications on lock screen</string>
 
@@ -8722,6 +8869,18 @@
     <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
     <string name="lock_screen_notifications_interstitial_message_profile">When your device is locked, how do you want profile notifications to show?</string>
 
+    <!-- Notification Settings > Notifications on lock screen > Title for hiding seen notifications toggle. [CHAR LIMIT=30] -->
+    <string name="lock_screen_notification_hide_seen_title">Hide seen notifications</string>
+
+    <!-- Notification Settings > Notifications on lock screen > Summary for hiding seen notifications toggle. [CHAR LIMIT=30] -->
+    <string name="lock_screen_notification_hide_seen_summary">Seen notifications are removed from the lock screen.</string>
+
+    <!-- Notification Settings > Notifications on lock screen > Title for hiding silent notifications toggle. [CHAR LIMIT=30] -->
+    <string name="lock_screen_notification_hide_silent_title">Hide silent notifications</string>
+
+    <!-- Notification Settings > Notifications on lock screen > Summary for hiding seen notifications toggle. [CHAR LIMIT=30] -->
+    <string name="lock_screen_notification_hide_silent_summary">Silent notifications and conversations are removed from the lock screen.</string>
+
     <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=30] -->
     <string name="lock_screen_notifications_interstitial_title_profile">Profile notifications</string>
 
@@ -8766,9 +8925,9 @@
 
     <!-- [CHAR LIMIT=100] summary text on link to 'all conversations' page, some conversations are priority -->
     <string name="priority_conversation_count">{count, plural,
-      =1      {# priority conversation}
-      other   {# priority conversations}
-    }</string>
+        =1      {# priority conversation}
+        other   {# priority conversations}
+        }</string>
 
     <!-- [CHAR LIMIT=100] preference category title -->
     <string name="important_conversations">Priority conversations</string>
@@ -8865,13 +9024,13 @@
 
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <string name="notifications_sent_daily">{count, plural,
-      =1      {About # notification per day}
-      other   {About # notifications per day}
-    }</string>
+        =1      {About # notification per day}
+        other   {About # notifications per day}
+        }</string>
     <string name="notifications_sent_weekly">{count, plural,
-      =1      {About # notification per week}
-      other   {About # notifications per week}
-    }</string>
+        =1      {About # notification per week}
+        other   {About # notifications per week}
+        }</string>
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <string name="notifications_sent_never">Never</string>
 
@@ -8911,7 +9070,7 @@
     <!-- Title for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_listener_security_warning_title">Allow notification access for
-         <xliff:g id="service" example="NotificationReader">%1$s</xliff:g>?</string>
+        <xliff:g id="service" example="NotificationReader">%1$s</xliff:g>?</string>
     <!-- Summary for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_listener_security_warning_summary">
@@ -8965,6 +9124,13 @@
     <string name="notification_polite_work">Apply to work profiles</string>
     <string name="notification_polite_work_summary">Apply to work profile apps</string>
 
+    <!-- Title for Bundled Notifications setting  [CHAR LIMIT=45]-->
+    <string name="notification_bundle_title">Bundled notifications</string>
+    <string name="notification_bundle_on">On</string>
+    <string name="notification_bundle_off">Off</string>
+    <string name="notification_bundle_main_control_title">Use notification bundling</string>
+    <string name="notification_bundle_description">Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings.</string>
+
 
     <!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->
     <string name="vr_listeners_title">VR helper services</string>
@@ -8975,7 +9141,7 @@
     <!-- Title for a warning message about security implications of enabling a VR
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="vr_listener_security_warning_title">Allow VR service access for
-         <xliff:g id="service" example="VrCore">%1$s</xliff:g>?</string>
+        <xliff:g id="service" example="VrCore">%1$s</xliff:g>?</string>
     <!-- Summary for a warning message about security implications of enabling a VR
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="vr_listener_security_warning_summary">
@@ -9082,9 +9248,9 @@
 
     <!-- Summary of preference to manage connected work and personal apps, informing the user how many apps are connected -->
     <string name="interact_across_profiles_number_of_connected_apps">{count, plural,
-      =1      {# app connected}
-      other   {# apps connected}
-    }</string>
+        =1      {# app connected}
+        other   {# apps connected}
+        }</string>
 
     <!-- Banner title. This banner lets a user know that they need to install an app in their
     work profile in order to connect it to the corresponding personal app.
@@ -9156,9 +9322,9 @@
 
     <!-- [CHAR LIMIT=NONE] Footer listing a count of deleted channels. -->
     <string name="deleted_channels">{count, plural,
-      =1      {# category deleted}
-      other   {# categories deleted}
-    }</string>
+        =1      {# category deleted}
+        other   {# categories deleted}
+        }</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
     <string name="app_notification_block_title">Block all</string>
@@ -9319,11 +9485,15 @@
     <!-- [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}
+        =0    {None}
+        =1    {1 conversation}
+        other {# conversations}
         }
     </string>
+
+    <!-- Modes: Content description of the "gear" icon that takes the user to the Conversation settings. [CHAR LIMIT=NONE] -->
+    <string name="zen_mode_from_conversations_settings">Conversations settings</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>
@@ -9349,11 +9519,11 @@
     <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
     <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}
+        =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>
 
@@ -9380,9 +9550,9 @@
     <!-- Zen mode settings: Senders in contacts can bypass DND summary summary [CHAR LIMIT=NONE] -->
     <string name="zen_mode_contacts_count">
         {count, plural,
-            =0    {None}
-            =1    {1 contact}
-            other {# contacts}
+        =0    {None}
+        =1    {1 contact}
+        other {# contacts}
         }
     </string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
@@ -9392,6 +9562,11 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
     <string name="zen_mode_from_starred">Starred contacts</string>
 
+    <!-- Modes: Content description of the "gear" icon that takes the user to the Contacts app to manage contacts. [CHAR LIMIT=NONE] -->
+    <string name="zen_mode_from_contacts_settings">Contacts settings</string>
+    <!-- Modes: Content description of the "gear" icon that takes the user to the Contacts app to manage starred contacts. [CHAR LIMIT=NONE] -->
+    <string name="zen_mode_from_starred_settings">Starred contacts settings</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls option value: No calls allowed -->
     <string name="zen_mode_none_calls">None</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option value: No messages allowed -->
@@ -9453,17 +9628,19 @@
     <!-- [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_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}
+        =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>
     <!-- Modes: Entry in the "apps that can bypass DND" list that corresponds to a work profile app (e.g. "Chrome (Work)" [CHAR LIMIT=15]. -->
     <string name="zen_mode_apps_work_app"><xliff:g id="app_label" example="Chrome">%s</xliff:g> (Work)</string>
     <!-- Text displayed (for a brief time) while the list of bypassing apps is being fetched. Will be replaced by a zen_mode_apps_subtext. [CHAR_LIMIT=60] -->
     <string name="zen_mode_apps_calculating">Calculating\u2026</string>
+    <!-- Modes: Content description of the "gear" icon that takes the user to the "Apps that can interrupt" settings. [CHAR LIMIT=NONE] -->
+    <string name="zen_mode_apps_priority_apps_settings">Apps settings</string>
     <!-- Modes: Format for a string displayed when there are more items (e.g. apps, contacts) that can be shown. For example, we show (A)(B)(C)(+5), where this string represents the "+5" value. Needs to be as compact as possible, since it will be drawn in a really small area. [CHAR_LIMIT=4] -->
     <string name="zen_mode_plus_n_items">+<xliff:g id="number" example="42">%d</xliff:g></string>
 
@@ -9490,11 +9667,11 @@
     <!-- [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}
+        =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-->
@@ -9508,11 +9685,11 @@
     <!-- [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}
+        =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 -->
@@ -9556,14 +9733,14 @@
     <string name="zen_mode_summary_alarms_only_indefinite">Change to alarms only indefinitely</string>
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
     <string name="zen_mode_summary_alarms_only_by_minute">{count, plural,
-      =1      {Change to alarms only for one minute until {time}}
-      other   {Change to alarms only for # minutes (until {time})}
-    }</string>
+        =1      {Change to alarms only for one minute until {time}}
+        other   {Change to alarms only for # minutes (until {time})}
+        }</string>
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
     <string name="zen_mode_summary_alarms_only_by_hour">{count, plural,
-      =1      {Change to alarms only for one hour until {time}}
-      other   {Change to alarms only for # hours until {time}}
-    }</string>
+        =1      {Change to alarms only for one hour until {time}}
+        other   {Change to alarms only for # hours until {time}}
+        }</string>
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
     <string name="zen_mode_summary_alarms_only_by_time">Change to alarms only until <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
@@ -9581,6 +9758,12 @@
     <!-- Modes: Hint for the EditText for editing a mode's name [CHAR LIMIT=30] -->
     <string name="zen_mode_edit_name_hint">Mode name</string>
 
+    <!-- Modes: Error message when editing a mode's name and the name is empty [CHAR LIMIT=40] -->
+    <string name="zen_mode_edit_name_empty_error">Mode name cannot be empty</string>
+
+    <!-- Modes: Text shown above the list of icons in the mode editor. [CHAR LIMIT=40] -->
+    <string name="zen_mode_edit_choose_icon_title">Choose an icon</string>
+
     <!-- Modes: Trigger title for modes of type SCHEDULE_CALENDAR. [CHAR LIMIT=30] -->
     <string name="zen_mode_trigger_title_schedule_calendar">Calendar events</string>
     <!-- Modes: Trigger title for modes of type BEDTIME. [CHAR LIMIT=30] -->
@@ -9779,13 +9962,13 @@
 
     <!-- Title, message and button for verified links dialog. -->
     <string name="app_launch_verified_links_title">{count, plural,
-      =1      {# verified link}
-      other   {# verified links}
-    }</string>
+        =1      {# verified link}
+        other   {# verified links}
+        }</string>
     <string name="app_launch_verified_links_message">{count, plural,
-      =1      {This link is verified and automatically opens in this app.}
-      other   {These links are verified and automatically open in this app.}
-    }</string>
+        =1      {This link is verified and automatically opens in this app.}
+        other   {These links are verified and automatically open in this app.}
+        }</string>
     <!-- OK button for verified links dialog. [CHAR LIMIT=20] -->
     <string name="app_launch_dialog_ok">OK</string>
     <!-- Info icon description of the verified links. [CHAR LIMIT=NONE] -->
@@ -9798,9 +9981,9 @@
 
     <!-- Title and button for supported links dialog. -->
     <string name="app_launch_supported_links_title">{count, plural,
-      =1      {# supported link}
-      other   {# supported links}
-    }</string>
+        =1      {# supported link}
+        other   {# supported links}
+        }</string>
     <!-- Add button for supported links dialog. [CHAR LIMIT=20] -->
     <string name="app_launch_supported_links_add">Add</string>
     <!-- The subtext of the link title in supported links dialog. [CHAR LIMIT=30] -->
@@ -9836,15 +10019,15 @@
 
     <!-- Permissions preference summary [CHAR LIMIT=40] -->
     <string name="notifications_categories_off">{count, plural,
-      =1      {# category turned off}
-      other   {# categories turned off}
-    }</string>
+        =1      {# category turned off}
+        other   {# categories turned off}
+        }</string>
 
     <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
     <string name="runtime_permissions_additional_count">{count, plural,
-      =1      {# additional permission}
-      other   {# additional permissions}
-    }</string>
+        =1      {# additional permission}
+        other   {# additional permissions}
+        }</string>
 
     <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
     <string name="runtime_permissions_summary_no_permissions_granted">No permissions granted</string>
@@ -9866,9 +10049,9 @@
 
     <!-- Summary of number of apps that have not been used for months. [CHAR LIMIT=40]-->
     <string name="unused_apps_summary">{count, plural,
-      =1      {# unused app}
-      other   {# unused apps}
-    }</string>
+        =1      {# unused app}
+        other   {# unused apps}
+        }</string>
 
     <!-- Label for category for unused app settings for an app. [CHAR LIMIT=40]-->
     <string name="unused_apps_category">Unused app settings</string>
@@ -9936,9 +10119,9 @@
 
     <!-- Summary for allow app to open supported links [CHAR LIMIT=42] -->
     <string name="app_link_open_always_summary">{count, plural,
-      =1      {App claims to handle # link}
-      other   {App claims to handle # links}
-    }</string>
+        =1      {App claims to handle # link}
+        other   {App claims to handle # links}
+        }</string>
 
     <!-- Footer of open supported links settings [CHAR LIMIT=NONE] -->
     <string name="open_supported_links_footer">App claims to handle following links:</string>
@@ -10208,9 +10391,9 @@
 
     <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
     <string name="memory_usage_apps_summary">{count, plural,
-      =1      {1 app used memory in the last {time}}
-      other   {# apps used memory in the last {time}}
-    }</string>
+        =1      {1 app used memory in the last {time}}
+        other   {# apps used memory in the last {time}}
+        }</string>
 
     <!-- Label for toggle that enables the profiling/aggregating of memory usage [CHAR LIMIT=80]-->
     <string name="force_enable_pss_profiling_title">Enable memory usage profiling</string>
@@ -10310,6 +10493,10 @@
     <!-- Description for setting that allows apps to send full screen intents. [CHAR LIMIT=NONE] -->
     <string name="footer_description_full_screen_intent">Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls, or other urgent notifications.</string>
 
+    <string name="write_system_preferences_page_title">Write system preferences</string>
+    <string name="write_system_preferences_switch_title">Allow this app to modify system preferences on your behalf</string>
+    <string name="write_system_preferences_footer_description">This permission allows an app to modify core system preferences.</string>
+
     <!-- Media management apps settings title [CHAR LIMIT=40] -->
     <string name="media_management_apps_title">Media management apps</string>
     <!-- Label for a setting which controls whether an app can manage media files [CHAR LIMIT=45] -->
@@ -10636,9 +10823,9 @@
 
     <!-- Description of number of apps allowed to ignore Data Saver [CHAR LIMIT=NONE] -->
     <string name="data_saver_unrestricted_summary">{count, plural,
-      =1      {1 app allowed to use unrestricted mobile data when Data Saver is on}
-      other   {# apps allowed to use unrestricted mobile data when Data Saver is on}
-    }</string>
+        =1      {1 app allowed to use unrestricted mobile data when Data Saver is on}
+        other   {# apps allowed to use unrestricted mobile data when Data Saver is on}
+        }</string>
 
     <!-- Data usage title text [CHAR LIMIT=30] -->
     <string name="data_usage_title">Primary data</string>
@@ -10663,9 +10850,9 @@
 
     <!-- Informational text about time left in billing cycle [CHAR LIMIT=60] -->
     <string name="billing_cycle_days_left">{count, plural,
-      =1      {# day left}
-      other   {# days left}
-    }</string>
+        =1      {# day left}
+        other   {# days left}
+        }</string>
 
     <!-- Informational text about time left in billing cycle [CHAR LIMIT=60] -->
     <string name="billing_cycle_none_left">No time remaining</string>
@@ -11001,6 +11188,23 @@
     <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
     <string name="double_tap_power_for_camera_summary">To quickly open camera, press the power button twice. Works from any screen.</string>
 
+    <!-- Title text for double tap power gesture [CHAR LIMIT=80]-->
+    <string name="double_tap_power_title">Double tap power button</string>
+    <!-- Summary for double tap power settings [DO NOT TRANSLATE] -->
+    <string name="double_tap_power_summary" translatable="false"><xliff:g id="double_tap_power_on_off" example="On">%1$s</xliff:g> / <xliff:g id="double_tap_power_actions" example="Access Wallet">%2$s</xliff:g></string>
+    <!-- Switch label to enable/disable double tap power button gesture [CHAR LIMIT=60] -->
+    <string name="double_tap_power_enabled">Use double tap</string>
+    <!-- Category title for double tap power gesture [CHAR_LIMIT=80] -->
+    <string name="double_tap_power_target_action_category">Double Tap Power Button</string>
+    <!-- Double Tap Power Gesture camera launch action title [CHAR_LIMIT=60] -->
+    <string name="double_tap_power_camera_action_title">Open Camera</string>
+    <!-- Setting summary to describe double tap power button will open camera. [CHAR LIMIT=NONE] -->
+    <string name="double_tap_power_camera_action_summary">Access Camera</string>
+    <!-- Double Tap Power Gesture wallet launch action title [CHAR_LIMIT=60] -->
+    <string name="double_tap_power_wallet_action_title">Open Wallet</string>
+    <!-- Setting summary to describe double tap power button will open wallet. [CHAR LIMIT=NONE] -->
+    <string name="double_tap_power_wallet_action_summary">Access Wallet</string>
+
     <!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
     <string name="double_twist_for_camera_mode_title">Flip camera for selfie</string>
 
@@ -11242,9 +11446,9 @@
     <string name="enterprise_privacy_apps_count_estimation_info">Number of apps is estimated. It may not include apps installed outside of the Play Store.</string>
     <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. The number shown is a minimum as there may be additional apps we do not know about. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_number_packages_lower_bound">{count, plural,
-      =1      {Minimum # app}
-      other   {Minimum # apps}
-    }</string>
+        =1      {Minimum # app}
+        other   {Minimum # apps}
+        }</string>
     <!-- Label indicating that the admin granted one or more apps access to the device's location. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_location_access">Location permissions</string>
     <!-- Label indicating that the admin granted one or more apps access to the microphone. [CHAR LIMIT=NONE] -->
@@ -11255,9 +11459,9 @@
     <string name="enterprise_privacy_enterprise_set_default_apps">Default apps</string>
     <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_number_packages">{count, plural,
-      =1      {# app}
-      other   {# apps}
-    }</string>
+        =1      {# app}
+        other   {# apps}
+        }</string>
     <!-- Label explaining that the current input method was set by the admin. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_input_method">Default keyboard</string>
     <!-- Summary indicating the input method set by the admin. [CHAR LIMIT=NONE] -->
@@ -11278,9 +11482,9 @@
     <string name="enterprise_privacy_ca_certs_work">Trusted credentials in your work profile</string>
     <!-- Summary indicating the number of trusted CA certificates installed by the admin. The number shown is a minimum as there may be additional CA certificates we do not know about. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_number_ca_certs">{count, plural,
-      =1      {Minimum # CA certificate}
-      other   {Minimum # CA certificates}
-    }</string>
+        =1      {Minimum # CA certificate}
+        other   {Minimum # CA certificates}
+        }</string>
     <!-- Label explaining that the admin can lock the device and change the user's password. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_lock_device">Admin can lock the device and reset password</string>
     <!-- Label explaining that the admin can wipe the device remotely. [CHAR LIMIT=NONE] -->
@@ -11291,9 +11495,9 @@
     <string name="enterprise_privacy_failed_password_wipe_work">Failed password attempts before deleting work profile data</string>
     <!-- Summary indicating the number of mistyped passwords after which the device or work profile wipes itself. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_number_failed_password_wipe">{count, plural,
-      =1      {# attempt}
-      other   {# attempts}
-    }</string>
+        =1      {# attempt}
+        other   {# attempts}
+        }</string>
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
     <string name="do_disclosure_generic">This device is managed by your organization.</string>
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
@@ -11356,25 +11560,25 @@
     <!-- Strings for displaying which applications were set as default for specific actions. -->
     <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->
     <string name="default_camera_app_title">{count, plural,
-      =1      {Camera app}
-      other   {Camera apps}
-    }</string>
+        =1      {Camera app}
+        other   {Camera apps}
+        }</string>
     <!-- Title for the app that has been set as default handler of calendar-related intents. [CHAR LIMIT=30] -->
     <string name="default_calendar_app_title">Calendar app</string>
     <!-- Title for the app that has been set as default handler of contacts-related intents. [CHAR LIMIT=30] -->
     <string name="default_contacts_app_title">Contacts app</string>
     <!-- Title for the apps that have been set as default handlers of new email intents. [CHAR LIMIT=30] -->
     <string name="default_email_app_title">{count, plural,
-      =1      {Email client app}
-      other   {Email client apps}
-    }</string>
+        =1      {Email client app}
+        other   {Email client apps}
+        }</string>
     <!-- Title for the app that has been set as default handler of geo-related intents. [CHAR LIMIT=30] -->
     <string name="default_map_app_title">Map app</string>
     <!-- Title for the apps that have been set as default handlers of call-related intents. [CHAR LIMIT=30] -->
     <string name="default_phone_app_title">{count, plural,
-      =1      {Phone app}
-      other   {Phone apps}
-    }</string>
+        =1      {Phone app}
+        other   {Phone apps}
+        }</string>
     <!-- Template for concatenating two app names -->
     <string name="app_names_concatenation_template_2"><xliff:g id="first_app_name">%1$s</xliff:g>, <xliff:g id="second_app_name">%2$s</xliff:g></string>
     <!-- Template for concatenating three app names -->
@@ -11469,9 +11673,9 @@
     <!-- Summary for passwords settings that shows how many passwords are saved for each autofill
          service. [CHAR LIMIT=NONE] -->
     <string name="autofill_passwords_count">{count, plural,
-      =1      {# password}
-      other   {# passwords}
-    }</string>
+        =1      {# password}
+        other   {# passwords}
+        }</string>
     <!-- DO NOT TRANSLATE Summary placeholder for when the passwords count is still loading or is
          unavailable. -->
     <string name="autofill_passwords_count_placeholder" translatable="false">\u2014</string>
@@ -12132,15 +12336,15 @@
     <!-- Summary for _satellite_setting_preference_layout. [CHAR LIMIT=NONE]-->
     <string name="satellite_setting_disabled_summary">Send and receive text messages by satellite. Not included with your account.</string>
     <!-- Search keywords for "_satellite_setting_preference_layout" [CHAR_LIMIT=NONE] -->
-    <string name="keywords_satellite_setting">Satellite messaging</string>
+    <string name="keywords_satellite_setting">Satellite messaging, satellite connectivity</string>
     <!-- Category name "About satellite messaging" [CHAR_LIMIT=NONE] -->
-    <string name="category_name_about_satellite_messaging">About satellite messaging</string>
+    <string name="category_name_about_satellite_messaging">About <xliff:g id="subject" example="satellite messaging">%1$s</xliff:g></string>
     <!-- Summary for category "About satellite messaging" [CHAR_LIMIT=NONE] -->
     <string name="title_about_satellite_setting">You can send and receive text messages by satellite as part of an eligible <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> account</string>
     <!-- Category title "Your mobile plan" [CHAR_LIMIT=NONE] -->
     <string name="category_title_your_satellite_plan">Your <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> plan</string>
     <!-- Title for category "Your mobile plan when satellite is included in plan" [CHAR_LIMIT=NONE] -->
-    <string name="title_have_satellite_plan">Satellite messaging is included with your account</string>
+    <string name="title_have_satellite_plan">Messaging is included with your account</string>
     <!-- Title for category "Your mobile plan when satellite is not included in plan" [CHAR_LIMIT=NONE] -->
     <string name="title_no_satellite_plan">Satellite messaging isn\u2019t included with your account</string>
     <!-- text view "Learn more" [CHAR_LIMIT=NONE] -->
@@ -12156,14 +12360,23 @@
     <!-- Summary for satellite supported service [CHAR_LIMIT=NONE] -->
     <string name="summary_supported_service">You can text anyone, including emergency services. Your phone will reconnect to a mobile network when available.</string>
     <!-- learn more text - more about satellite messaging [CHAR_LIMIT=NONE] -->
-    <string name="satellite_setting_summary_more_information">Satellite messaging may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your carrier for details.</string>
+    <string name="satellite_setting_summary_more_information"><xliff:g id="subject" example="satellite messaging">%1$s</xliff:g> may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> for details.</string>
     <!-- more about satellite messaging [CHAR_LIMIT=NONE] -->
-    <string name="more_about_satellite_messaging">More about satellite messaging</string>
+    <string name="more_about_satellite_messaging">More about <xliff:g id="subject" example="satellite messaging">%1$s</xliff:g></string>
     <!-- Title for satellite warning dialog to avoid user using wifi/bluetooth/airplane mode [CHAR_LIMIT=NONE] -->
     <string name="satellite_warning_dialog_title">Can’t turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g></string>
     <!-- Content for satellite warning dialog to avoid user using wifi/bluetooth/airplane mode [CHAR_LIMIT=NONE] -->
     <string name="satellite_warning_dialog_content">To turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g>, first end the satellite connection</string>
-
+    <!-- Category title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->
+    <string name="category_title_satellite_connectivity">Satellite connectivity</string>
+    <!-- Title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->
+    <string name="title_satellite_setting_connectivity">Satellite connectivity</string>
+    <!-- Description of satellite function with data transmission [CHAR LIMIT=60] -->
+    <string name="description_satellite_setting_connectivity">satellite connectivity</string>
+    <!-- Description of satellite function [CHAR LIMIT=60] -->
+    <string name="description_satellite_setting_messaging">satellite messaging</string>
+    <!-- Title for notifying user's account be able to use data transmission of Satellite" [CHAR_LIMIT=NONE] -->
+    <string name="title_have_satellite_data_plan">Use of data is included with your account</string>
 
     <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->
     <string name="mobile_network_apn_title">Access Point Names</string>
@@ -12330,10 +12543,10 @@
     <string name="choose_sim_title">Choose a SIM to use</string>
     <!--  The body text of choose SIM activity. [CHAR LIMIT=NONE] -->
     <string name="choose_sim_text">{count, plural,
-      =1      {1 SIM is available on this device, but only one can be used at a time}
-      =2      {2 SIMs are available on this device, but only one can be used at a time}
-      other   {# SIMs are available on this device, but only one can be used at a time}
-    }</string>
+        =1      {1 SIM is available on this device, but only one can be used at a time}
+        =2      {2 SIMs are available on this device, but only one can be used at a time}
+        other   {# SIMs are available on this device, but only one can be used at a time}
+        }</string>
     <!-- String indicating that we are activating the profile [CHAR LIMIT=NONE] -->
     <string name="choose_sim_activating">Turning on<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
     <!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] -->
@@ -12464,9 +12677,9 @@
 
     <!-- Summary for the accessibility usage preference in the Privacy page.  [CHAR LIMIT=NONE] -->
     <string name="accessibility_usage_summary">{count, plural,
-      =1      {1 app has full access to your device}
-      other   {# apps have full access to your device}
-    }</string>
+        =1      {1 app has full access to your device}
+        other   {# apps have full access to your device}
+        }</string>
 
     <!-- Label for the title on wfc disclaimer fragment. [CHAR LIMIT=40] -->
     <string name="wfc_disclaimer_title_text">Important information</string>
@@ -12640,6 +12853,9 @@
     <string name="page_agnostic_notification_channel_name">16 KB Page-agnostic Mode</string>
     <string name="page_agnostic_notification_action">Read more</string>
 
+    <string name= "enable_16k_app_compat_title">Run app with page size compat mode</string>
+    <string name= "enable_16k_app_compat_details">App will be run in page size compatibility mode on 16 KB device when toggled.</string>
+
     <!-- DSU Loader. Do not translate. -->
 
     <string name="dsu_loader_title" translatable="false">DSU Loader</string>
@@ -13219,9 +13435,9 @@
     <!-- Background Install Control UI -->
     <!-- [CHAR LIMIT=NONE] Preference Feature Summary -->
     <string name="background_install_preference_summary">{count, plural,
-    =1    {# app}
-    other {# apps}
-    }</string>
+        =1    {# app}
+        other {# apps}
+        }</string>
 
     <!-- [CHAR LIMIT=NONE] Feature Title -->
     <string name="background_install_title">Apps installed in the background</string>
@@ -13233,14 +13449,14 @@
     <string name="background_install_uninstall_button_description">Uninstall app</string>
     <!-- [CHAR LIMIT=NONE] Before time period group list title -->
     <string name="background_install_before">{count, plural,
-    =1    {Apps installed in the last # month}
-    other {Apps installed in the last # months}
-    }</string>
+        =1    {Apps installed in the last # month}
+        other {Apps installed in the last # months}
+        }</string>
     <!-- [CHAR LIMIT=NONE] After time period group list title -->
     <string name="background_install_after">{count, plural,
-    =1    {Apps installed more than # month ago}
-    other {Apps installed more than # months ago}
-    }</string>
+        =1    {Apps installed more than # month ago}
+        other {Apps installed more than # months ago}
+        }</string>
 
     <!-- App Aspect Ratio (User Aspect Ratio Override) -->
     <!-- [CHAR LIMIT=60] Aspect ratio title setting to choose app aspect ratio -->
@@ -13433,11 +13649,11 @@
     <!--Text for Stylus Pointer Icon preference -->
     <string name="show_stylus_pointer_icon">Show pointer while hovering</string>
 
-     <!-- Developer settings title: Media DRM settings screen. [CHAR LIMIT=50] -->
+    <!-- Developer settings title: Media DRM settings screen. [CHAR LIMIT=50] -->
     <string name="media_drm_settings_title">Media DRM settings</string>
-     <!-- Developer settings title: select whether to enable force Software Secure Crypto fallback. [CHAR LIMIT=50] -->
+    <!-- Developer settings title: select whether to enable force Software Secure Crypto fallback. [CHAR LIMIT=50] -->
     <string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string>
-     <!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
+    <!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
     <string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string>
 
     <!--Text for acquire msg on UDFPS devices -->
@@ -13657,17 +13873,47 @@
     <string name="audio_streams_main_page_password_dialog_join_button">Listen to stream</string>
     <!-- Le audio streams main page qr code scanner summary [CHAR LIMIT=NONE] -->
     <string name="audio_streams_main_page_qr_code_scanner_summary">Scan an audio stream QR code to listen with <xliff:g example="LE headset" id="device_name">%1$s</xliff:g></string>
-    <!-- Le audio streams password dialog  [CHAR LIMIT=NONE] -->
+    <!-- Le audio streams password dialog not editable message [CHAR LIMIT=NONE] -->
     <string name="audio_streams_main_page_password_dialog_cannot_edit">Can\u0027t edit password while sharing. To change the password, first turn off audio sharing.</string>
+    <!-- Le audio streams password dialog password format alert [CHAR LIMIT=NONE] -->
+    <string name="audio_streams_main_page_password_dialog_format_alert">Your password must contain 4-16 characters and use only letters, numbers and symbols</string>
     <!-- Text for audio sharing qrcode scanner [CHAR LIMIT=none]-->
     <string name="audio_streams_qr_code_scanner_label">QR code scanner</string>
     <!-- Learn more link for audio sharing qrcode [CHAR LIMIT=none]-->
     <string name="audio_streams_qr_code_help_with_link"><annotation id="link">Need help?</annotation></string>
 
-
     <!-- url for learning more about bluetooth audio sharing -->
     <string name="help_url_audio_sharing" translatable="false"></string>
 
     <!-- Text for Search bar of Settings home screen [CHAR LIMIT=34] -->
     <string name="homepage_search">Search Settings</string>
+
+    <!-- Keywords for contacts storage item [CHAR LIMIT=NONE] -->
+    <string name="keywords_contacts_storage">contacts, storage, account</string>
+    <!-- Text for Contacts Storage Settings title [CHAR LIMIT=50]-->
+    <string name="contacts_storage_settings_title">Contacts storage</string>
+    <!-- Text for "device only" preference label in Contacts Storage Settings [CHAR LIMIT=34] -->
+    <string name="contacts_storage_device_only_preference_label">Device only</string>
+    <!-- Text for "device only" preference summary in Contacts Storage Settings [CHAR LIMIT=NONE] -->
+    <string name="contacts_storage_device_only_preference_summary">New contacts won\'t be synced with an account</string>
+    <!-- Text for explaining the selection in Contacts Storage Settings [CHAR LIMIT=NONE] -->
+    <string name="contacts_storage_selection_message">Contacts will be saved to your device and synced to your account by default</string>
+    <!-- Text for error toast when there's error setting the default account in Contacts Storage Settings [CHAR LIMIT=NONE] -->
+    <string name="contacts_storage_set_default_account_error_message">Error setting the default account</string>
+    <!-- Text for displaying when no account is set as default account [CHAR LIMIT=50] -->
+    <string name="contacts_storage_no_account_set_summary">No default set</string>
+    <!-- Text for displaying when default account is set as local only [CHAR LIMIT=50] -->
+    <string name="contacts_storage_local_account_summary">Device only</string>
+    <!-- Text for displaying eligible account preference title [CHAR LIMIT=50] -->
+    <string name="contacts_storage_account_title">Device and %1$s</string>
+    <!-- Text for add account selection message when no account has been added [CHAR LIMIT=100] -->
+    <string name="contacts_storage_first_time_add_account_message">Add an account to get started</string>
+    <!-- Text for account preference category title for contacts storage settings page [CHAR LIMIT=100] -->
+    <string name="contacts_storage_account_category_title">Where to save contacts</string>
+    <!-- Circle to Search (shared between all entrypoints) -->
+    <!-- Name of Google's new feature to circle to search anything on your phone screen,
+         without switching apps. Also used as the setting title. [CHAR LIMIT=60] -->
+    <string name="search_gesture_feature_title">Circle to Search</string>
+    <!-- Summary text for press and hold nav handle OR home button to invoke Circle to Search. [CHAR LIMIT=NONE] -->
+    <string name="search_gesture_feature_summary">Touch and hold the Home button or the navigation handle to search using the content on your screen.</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5bcb805aeaf..c656e138b13 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -249,7 +249,7 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textSize">@dimen/search_bar_text_size</item>
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
+        <item name="android:textColor">@androidprv:color/materialColorOnSurfaceVariant</item>
         <item name="android:singleLine">true</item>
     </style>
 
@@ -448,7 +448,7 @@
         <item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
         <item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
         <item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
-        <item name="cardBackgroundColor">?androidprv:attr/materialColorSurfaceContainer</item>
+        <item name="cardBackgroundColor">@androidprv:color/materialColorSurfaceContainer</item>
         <item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
         <item name="cardElevation">0dp</item>
         <item name="rippleColor">?android:attr/colorControlHighlight</item>
diff --git a/res/values/styles_preference_expressive.xml b/res/values/styles_preference_expressive.xml
new file mode 100644
index 00000000000..a6fe2f18068
--- /dev/null
+++ b/res/values/styles_preference_expressive.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- This file only contains custom attribute and style definition for preferences -->
+<!-- Things unrelated to preference framework UI customization should go to other styles files -->
+<resources>
+
+    <style name="SettingsPreferenceTheme.Expressive" parent="@style/PreferenceTheme.SettingsLib.Expressive">
+        <item name="apnPreferenceStyle">@style/ApnPreference</item>
+        <item name="cardPreferenceStyle">@style/CardPreference</item>
+        <item name="slicePreferenceStyle">@style/SlicePreference</item>
+        <item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
+        <item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
+        <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
+    </style>
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e91ca491213..9d416f729fd 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -67,12 +67,15 @@
         <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
 
         <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
-        <item name="notification_importance_button_border_color_unselected">?androidprv:attr/materialColorOutlineVariant</item>
-        <item name="notification_importance_button_foreground_color_unselected">?androidprv:attr/materialColorOnSurfaceVariant</item>
+        <item name="notification_importance_button_border_color_unselected">@androidprv:color/materialColorOutlineVariant</item>
+        <item name="notification_importance_button_foreground_color_unselected">@androidprv:color/materialColorOnSurfaceVariant</item>
 
-        <item name="notification_importance_button_background_color_selected">?androidprv:attr/materialColorSecondaryContainer</item>
-        <item name="notification_importance_button_border_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
-        <item name="notification_importance_button_foreground_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
+        <item name="notification_importance_button_background_color_selected">@androidprv:color/materialColorSecondaryContainer</item>
+        <item name="notification_importance_button_border_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
+        <item name="notification_importance_button_foreground_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
+
+        <!-- For AppCompat widgets, e.g. TextInputLayout -->
+        <item name="colorAccent">?android:attr/colorAccent</item>
     </style>
 
     <!-- Variant of the settings theme with no action bar. -->
@@ -114,13 +117,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
 
-    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@android:color/system_primary_light</item>
-        <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@android:color/system_surface_container_high_light</item>
-    </style>
-
-    <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
+    <style name="Theme.AlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:clipToPadding">true</item>
         <item name="android:clipChildren">true</item>
diff --git a/res/values/themes_expressive.xml b/res/values/themes_expressive.xml
new file mode 100644
index 00000000000..0a8b45dafdc
--- /dev/null
+++ b/res/values/themes_expressive.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <style name="Theme.Settings.Expressive" parent="Theme.SettingsBase.Expressive">
+        <item name="android:clipToPadding">false</item>
+        <item name="android:clipChildren">false</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme.Expressive</item>
+        <item name="android:listPreferredItemHeight">72dip</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
+
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
+        <item name="face_layout_theme">@style/FaceLayoutTheme</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+
+        <!-- For edge-to-edge -->
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+
+        <!-- For wifi icon -->
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_signal_color">?android:attr/colorAccent</item>
+        <item name="wifi_friction">@drawable/wifi_friction</item>
+
+        <item name="side_margin">0dp</item>
+        <item name="sudListItemIconColor">?android:attr/colorAccent</item>
+
+        <!-- Redefine the ActionBar style for contentInsetStart -->
+        <item name="android:actionBarStyle">@style/Widget.ActionBar</item>
+
+        <item name="preferenceBackgroundColor">@drawable/preference_background</item>
+
+        <!-- For AndroidX AlertDialog -->
+        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
+
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
+
+        <!-- For AppBarLayout -->
+        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
+        <item name="colorPrimaryVariant">@android:color/white</item>
+
+        <!-- For slice view in settings -->
+        <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
+
+        <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
+        <item name="notification_importance_button_border_color_unselected">@androidprv:color/materialColorOutlineVariant</item>
+        <item name="notification_importance_button_foreground_color_unselected">@androidprv:color/materialColorOnSurfaceVariant</item>
+
+        <item name="notification_importance_button_background_color_selected">@androidprv:color/materialColorSecondaryContainer</item>
+        <item name="notification_importance_button_border_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
+        <item name="notification_importance_button_foreground_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
+
+        <!-- For AppCompat widgets, e.g. TextInputLayout -->
+        <item name="colorAccent">?android:attr/colorAccent</item>
+    </style>
+
+    <style name="Theme.Settings.Expressive.NoActionBar">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="colorSurface">@color/settingslib_colorSurface</item>
+    </style>
+
+    <style name="Theme.SubSettings.Expressive.Base" parent="Theme.Settings.Expressive.NoActionBar">
+        <!-- Redefine the ActionBar style for contentInsetStart -->
+        <item name="android:actionBarStyle">@style/Widget.ActionBar.SubSettings</item>
+
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.SubSettings.Expressive" parent="Theme.SubSettings.Expressive.Base"/>
+</resources>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index 7a199285bb7..3a1bcd3aa05 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -21,7 +21,8 @@
 
     <com.android.settingslib.widget.TopIntroPreference
         android:key="accessibility_autoclick_intro"
-        android:title="@string/accessibility_autoclick_intro_text"/>
+        android:title="@string/accessibility_autoclick_intro_text"
+        settings:searchable="false"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="accessibility_autoclick_banner"
@@ -29,32 +30,42 @@
         settings:searchable="false"
         settings:lottie_rawRes="@drawable/accessibility_dwell"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_autoclick_default"
         android:title="@string/accessibility_autoclick_default_title"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickPreferenceController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_autoclick_200ms"
         android:title="@string/accessibility_autoclick_short_title"
         android:summary="@string/accessibility_autoclick_short_summary"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickPreferenceController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_autoclick_600ms"
         android:title="@string/accessibility_autoclick_medium_title"
         android:summary="@string/accessibility_autoclick_medium_summary"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickPreferenceController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_autoclick_1sec"
         android:title="@string/accessibility_autoclick_long_title"
         android:summary="@string/accessibility_autoclick_long_summary"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickPreferenceController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_autoclick_custom"
         android:title="@string/accessibility_autoclick_custom_title"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickPreferenceController"/>
 
     <com.android.settingslib.widget.LayoutPreference
@@ -62,6 +73,7 @@
         android:layout="@layout/accessibility_autoclick_custom_seekbar"
         android:selectable="false"
         android:visibility="gone"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickCustomSeekbarController"/>
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
index 2b1392d4498..5be0cdb8124 100644
--- a/res/xml/accessibility_button_settings.xml
+++ b/res/xml/accessibility_button_settings.xml
@@ -20,7 +20,8 @@
     <com.android.settingslib.widget.TopIntroPreference
         android:key="accessibility_button_intro"
         android:persistent="false"
-        android:title="@string/accessibility_button_intro_text" />
+        android:title="@string/accessibility_button_intro_text"
+        settings:searchable="false" />
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="accessibility_button_preview"
diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml
index a500b72d958..ffcdbddf7fe 100644
--- a/res/xml/accessibility_color_and_motion.xml
+++ b/res/xml/accessibility_color_and_motion.xml
@@ -39,6 +39,8 @@
         settings:keywords="@string/keywords_color_inversion"
         settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
 
+    <!-- DarkModePreference is searchable in the Display & Touch setting.
+         Therefore, we set searchable = false here to avoid duplicate search results. -->
     <com.android.settings.display.darkmode.DarkModePreference
         android:key="dark_ui_mode_accessibility"
         android:icon="@drawable/ic_dark_ui"
@@ -59,8 +61,7 @@
 
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_accessibility_animation"
-        android:key="toggle_disable_animations"
-        android:persistent="false"
+        android:key="animator_duration_scale"
         android:summary="@string/accessibility_disable_animations_summary"
         android:title="@string/accessibility_disable_animations"
         settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml
index 4f1c2b3f44f..4c65d897063 100644
--- a/res/xml/accessibility_control_timeout_settings.xml
+++ b/res/xml/accessibility_control_timeout_settings.xml
@@ -22,35 +22,46 @@
 
     <com.android.settingslib.widget.TopIntroPreference
         android:key="accessibility_control_timeout_intro"
-        android:title="@string/accessibility_control_timeout_preference_intro_text"/>
+        android:title="@string/accessibility_control_timeout_preference_intro_text"
+        settings:searchable="false"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="accessibility_control_timeout_banner"
         settings:lottie_rawRes="@raw/a11y_timeout_banner"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_timeout_default"
         android:title="@string/accessibility_timeout_default"
-        settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
+        settings:searchable="false"
+        settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController" />
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_timeout_10secs"
         android:title="@string/accessibility_timeout_10secs"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_timeout_30secs"
         android:title="@string/accessibility_timeout_30secs"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_timeout_1min"
         android:title="@string/accessibility_timeout_1min"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
 
+    <!-- Items in a list should not be searchable. -->
     <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="accessibility_control_timeout_2mins"
         android:title="@string/accessibility_timeout_2mins"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController"/>
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
diff --git a/res/xml/accessibility_edit_shortcuts.xml b/res/xml/accessibility_edit_shortcuts.xml
index bb555271864..77c09dace28 100644
--- a/res/xml/accessibility_edit_shortcuts.xml
+++ b/res/xml/accessibility_edit_shortcuts.xml
@@ -90,11 +90,5 @@
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="false"
         settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />
-    <!--
-        LINT.ThenChange(
-            /src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java:shortcut_type_ui_order,
-            /src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java:shortcut_type_ui_order,
-            /src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java:shortcut_type_ui_order
-        )
-    -->
+    <!-- LINT.ThenChange(/src/com/android/settings/accessibility/AccessibilityUtil.java:shortcut_type_ui_order) -->
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/accessibility_hearing_aids.xml b/res/xml/accessibility_hearing_aids.xml
index 9c6e661235a..16128281182 100644
--- a/res/xml/accessibility_hearing_aids.xml
+++ b/res/xml/accessibility_hearing_aids.xml
@@ -20,7 +20,8 @@
     android:title="@string/accessibility_hearingaid_title">
 
     <com.android.settingslib.widget.TopIntroPreference
-        android:title="@string/accessibility_hearingaid_intro" />
+        android:title="@string/accessibility_hearingaid_intro"
+        settings:searchable="false" />
 
     <PreferenceCategory
         android:key="available_hearing_devices"
diff --git a/res/xml/accessibility_pointer_and_touchpad.xml b/res/xml/accessibility_pointer_and_touchpad.xml
index 8da41779d95..a46c8572bb5 100644
--- a/res/xml/accessibility_pointer_and_touchpad.xml
+++ b/res/xml/accessibility_pointer_and_touchpad.xml
@@ -46,4 +46,17 @@
         settings:keywords="@string/keywords_auto_click"
         settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
 
+    <PreferenceCategory
+        android:key="touchpad_category"
+        android:persistent="false"
+        android:title="@string/accessibility_touchpad_title">
+
+        <SwitchPreferenceCompat
+            android:key="touchpad_system_gestures_enable"
+            android:title="@string/accessibility_touchpad_system_gestures_enable_title"
+            android:summary="@string/accessibility_touchpad_system_gestures_enable_summary"
+            settings:keywords="@string/keywords_accessibility_touchpad_system_gestures_enable"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 18e645591ff..6703fafb218 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -47,7 +47,7 @@
 
         <Preference
             android:fragment="com.android.settings.accessibility.ColorAndMotionFragment"
-            android:key="color_and_motion"
+            android:key="accessibility_color_and_motion"
             android:icon="@drawable/ic_color_and_motion"
             android:persistent="false"
             android:title="@string/accessibility_color_and_motion_title"
@@ -120,37 +120,14 @@
             settings:controller="com.android.settings.inputmethod.PointerTouchpadPreferenceController"
             settings:searchable="true"/>
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="physical_keyboard_options_category"
-        android:persistent="false"
-        android:title="@string/keyboard_category_title">
-
-        <SwitchPreferenceCompat
+        <Preference
             android:icon="@drawable/ic_sticky_keys"
-            android:key="toggle_keyboard_sticky_keys"
+            android:key="physical_keyboard_a11y"
+            android:title="@string/keyboard_a11y_settings"
+            android:summary="@string/keyboard_a11y_settings_summary"
             android:persistent="false"
-            android:summary="@string/sticky_keys_summary"
-            android:title="@string/sticky_keys"
-            settings:controller="com.android.settings.accessibility.KeyboardStickyKeyPreferenceController"
-            settings:searchable="true" />
-
-        <SwitchPreferenceCompat
-            android:icon="@drawable/ic_bounce_keys"
-            android:key="toggle_keyboard_bounce_keys"
-            android:persistent="false"
-            android:title="@string/bounce_keys"
-            settings:controller="com.android.settings.accessibility.KeyboardBounceKeyPreferenceController"
-            settings:searchable="true" />
-
-        <SwitchPreferenceCompat
-            android:icon="@drawable/ic_slow_keys"
-            android:key="toggle_keyboard_slow_keys"
-            android:persistent="false"
-            android:title="@string/slow_keys"
-            settings:controller="com.android.settings.accessibility.KeyboardSlowKeyPreferenceController"
-            settings:searchable="true" />
+            android:fragment="com.android.settings.inputmethod.PhysicalKeyboardA11yFragment"
+            settings:controller="com.android.settings.inputmethod.PhysicalKeyboardA11yPreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml
index a69dc26ce3f..250954353f5 100644
--- a/res/xml/accessibility_settings_for_setup_wizard.xml
+++ b/res/xml/accessibility_settings_for_setup_wizard.xml
@@ -37,13 +37,13 @@
         settings:useAdminDisabledSummary="true"
         settings:userRestriction="no_config_brightness"/>
 
-    <com.android.settingslib.PrimarySwitchPreference
+    <com.android.settingslib.RestrictedSwitchPreference
         android:key="@string/preference_key_auto_brightness"
         android:icon="@drawable/ic_suw_brightness_auto"
         android:title="@string/auto_brightness_title"
-        android:fragment="com.android.settings.accessibility.AutoBrightnessPreferenceFragmentForSetupWizard"
         settings:useAdminDisabledSummary="true"
-        settings:userRestriction="no_config_brightness"/>
+        settings:userRestriction="no_config_brightness"
+        settings:controller="com.android.settings.display.AutoBrightnessPreferenceControllerForSetupWizard"/>
 
     <Preference
         android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard"
diff --git a/res/xml/accessibility_system_controls.xml b/res/xml/accessibility_system_controls.xml
index 460214fa3b6..a8cb1bb28ab 100644
--- a/res/xml/accessibility_system_controls.xml
+++ b/res/xml/accessibility_system_controls.xml
@@ -20,6 +20,9 @@
     android:persistent="false"
     android:title="@string/accessibility_system_controls_title">
 
+    <!-- The item is not specific to Accessibility.
+        The same entry is under System, which is unlikely to be removed,
+        so this is not searchable. -->
     <Preference
         android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
         android:key="gesture_system_navigation_input_summary_accessibility"
@@ -28,6 +31,9 @@
         settings:searchable="false"
         settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
 
+    <!-- The item is not specific to Accessibility.
+        The same entry is under System > Gesture, which is unlikely to be removed,
+        so this is not searchable. -->
     <Preference
         android:fragment="com.android.settings.gestures.OneHandedSettings"
         android:key="gesture_system_navigation_one_handed_accessibility"
@@ -43,21 +49,28 @@
         settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
 
     <!-- Standard auto-rotation preference that will be shown when device state based auto-rotation
-         settings are NOT available. -->
+         settings are NOT available.
+         The item is not specific to Accessibility.
+         The same entry is under Display & touch, which is unlikely to be removed,
+         so this is not searchable.-->
     <SwitchPreferenceCompat
         android:key="toggle_lock_screen_rotation_preference"
         android:persistent="false"
         android:title="@string/accelerometer_title"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
 
     <!-- Auto-rotation preference that will be shown when device state based auto-rotation settings
-         are available. -->
+         are available.
+         The item is not specific to Accessibility.
+         The same entry is under Display & touch, which is unlikely to be removed,
+         so this is not searchable. -->
     <Preference
         android:key="device_state_auto_rotate_accessibility"
         android:persistent="false"
         android:title="@string/accelerometer_title"
         android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"
-        settings:keywords="@string/keywords_auto_rotate"
+        settings:searchable="false"
         settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/accessibility_vibration_intensity_settings.xml b/res/xml/accessibility_vibration_intensity_settings.xml
index f9a5578c517..ba1bd83da94 100644
--- a/res/xml/accessibility_vibration_intensity_settings.xml
+++ b/res/xml/accessibility_vibration_intensity_settings.xml
@@ -20,7 +20,7 @@
     android:title="@string/accessibility_vibration_settings_title">
 
     <com.android.settingslib.widget.MainSwitchPreference
-        android:key="vibration_intensity_switch_main"
+        android:key="vibrate_on"
         android:title="@string/accessibility_vibration_primary_switch_title"
         app:keywords="@string/keywords_accessibility_vibration_primary_switch"
         app:controller="com.android.settings.accessibility.VibrationMainSwitchPreferenceController"/>
diff --git a/res/xml/accessibility_vibration_settings.xml b/res/xml/accessibility_vibration_settings.xml
index 3ce92a6e303..be45659b310 100644
--- a/res/xml/accessibility_vibration_settings.xml
+++ b/res/xml/accessibility_vibration_settings.xml
@@ -20,7 +20,7 @@
     android:title="@string/accessibility_vibration_settings_title">
 
     <com.android.settingslib.widget.MainSwitchPreference
-        android:key="vibration_switch_main"
+        android:key="vibrate_on"
         android:title="@string/accessibility_vibration_primary_switch_title"
         app:keywords="@string/keywords_accessibility_vibration_primary_switch"
         app:controller="com.android.settings.accessibility.VibrationMainSwitchPreferenceController"/>
diff --git a/res/xml/adaptive_connectivity_settings.xml b/res/xml/adaptive_connectivity_settings.xml
index 63060065f83..0c8ff88dd47 100644
--- a/res/xml/adaptive_connectivity_settings.xml
+++ b/res/xml/adaptive_connectivity_settings.xml
@@ -29,7 +29,7 @@
         settings:lottie_rawRes="@drawable/ic_enhanced_connectivity"/>
 
     <com.android.settingslib.widget.MainSwitchPreference
-        android:key="adaptive_connectivity"
+        android:key="adaptive_connectivity_enabled"
         android:title="@string/adaptive_connectivity_main_switch_title"
         settings:controller="com.android.settings.network.AdaptiveConnectivityTogglePreferenceController"/>
 
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
deleted file mode 100644
index e5c04e02a24..00000000000
--- a/res/xml/apn_editor.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/apn_edit">
-    <EditTextPreference
-        android:title="@string/apn_name"
-        android:dialogTitle="@string/apn_name"
-        android:key="apn_name"
-        android:singleLine="true"
-        android:inputType="text"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_apn"
-        android:dialogTitle="@string/apn_apn"
-        android:key="apn_apn"
-        android:singleLine="true"
-        android:inputType="textEmailAddress"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_http_proxy"
-        android:dialogTitle="@string/apn_http_proxy"
-        android:key="apn_http_proxy"
-        android:singleLine="true"
-        android:inputType="textUri"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_http_port"
-        android:dialogTitle="@string/apn_http_port"
-        android:key="apn_http_port"
-        android:singleLine="true"
-        android:inputType="number"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_user"
-        android:dialogTitle="@string/apn_user"
-        android:key="apn_user"
-        android:singleLine="true"
-        android:inputType="textEmailAddress"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_password"
-        android:dialogTitle="@string/apn_password"
-        android:key="apn_password"
-        android:singleLine="true"
-        android:inputType="textPassword"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_server"
-        android:dialogTitle="@string/apn_server"
-        android:key="apn_server"
-        android:singleLine="true"
-        android:inputType="textUri"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_mmsc"
-        android:dialogTitle="@string/apn_mmsc"
-        android:key="apn_mmsc"
-        android:singleLine="true"
-        android:inputType="textUri"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_mms_proxy"
-        android:dialogTitle="@string/apn_mms_proxy"
-        android:key="apn_mms_proxy"
-        android:singleLine="true"
-        android:inputType="textUri"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_mms_port"
-        android:dialogTitle="@string/apn_mms_port"
-        android:key="apn_mms_port"
-        android:singleLine="true"
-        android:inputType="number"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_mcc"
-        android:dialogTitle="@string/apn_mcc"
-        android:key="apn_mcc"
-        android:singleLine="true"
-        android:inputType="number"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_mnc"
-        android:dialogTitle="@string/apn_mnc"
-        android:key="apn_mnc"
-        android:singleLine="true"
-        android:inputType="number"
-        android:persistent="false"
-        />
-    <ListPreference
-        android:title="@string/apn_auth_type"
-        android:key="auth_type"
-        android:entries="@array/apn_auth_entries"
-        android:entryValues="@array/apn_auth_values"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/apn_type"
-        android:dialogTitle="@string/apn_type"
-        android:key="apn_type"
-        android:singleLine="true"
-        android:inputType="textNoSuggestions"
-        android:persistent="false"
-        />
-    <ListPreference
-        android:title="@string/apn_protocol"
-        android:dialogTitle="@string/apn_protocol"
-        android:key="apn_protocol"
-        android:entries="@array/apn_protocol_entries"
-        android:entryValues="@array/apn_protocol_values"
-        android:persistent="false"
-        />
-    <ListPreference
-        android:title="@string/apn_roaming_protocol"
-        android:dialogTitle="@string/apn_roaming_protocol"
-        android:key="apn_roaming_protocol"
-        android:entries="@array/apn_protocol_entries"
-        android:entryValues="@array/apn_protocol_values"
-        android:persistent="false"
-        />
-    <SwitchPreferenceCompat
-        android:title="@string/carrier_enabled"
-        android:key="carrier_enabled"
-        android:enabled="false"
-        android:summaryOn="@string/carrier_enabled_summaryOn"
-        android:summaryOff="@string/carrier_enabled_summaryOff"
-        android:persistent="false"
-        />
-    <MultiSelectListPreference
-        android:title="@string/bearer"
-        android:key="bearer_multi"
-        android:entries="@array/bearer_entries"
-        android:entryValues="@array/bearer_values"
-        android:persistent="false"
-        style="@style/SettingsMultiSelectListPreference"
-        />
-    <ListPreference
-        android:title="@string/mvno_type"
-        android:key="mvno_type"
-        android:entries="@array/mvno_type_entries"
-        android:entryValues="@array/mvno_type_values"
-        android:persistent="false"
-        />
-    <EditTextPreference
-        android:title="@string/mvno_match_data"
-        android:dialogTitle="@string/mvno_match_data"
-        android:key="mvno_match_data"
-        android:singleLine="true"
-        android:inputType="text"
-        android:persistent="false"
-        />
-</PreferenceScreen>
diff --git a/res/xml/app_channels_bypassing_dnd_settings.xml b/res/xml/app_channels_bypassing_dnd_settings.xml
index 4f6291dc447..433d26d04f0 100644
--- a/res/xml/app_channels_bypassing_dnd_settings.xml
+++ b/res/xml/app_channels_bypassing_dnd_settings.xml
@@ -16,7 +16,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/zen_mode_settings_title">
+    android:title="@string/zen_mode_apps_title">
     <com.android.settingslib.widget.LayoutPreference
         android:key="pref_app_header"
         android:layout="@layout/settings_entity_header" />
@@ -26,4 +26,4 @@
         android:title="@string/zen_mode_bypassing_app_channels_header">
         <!-- add app channel toggles here -->
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 1eee0cb8a77..30a57a24bb7 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -21,7 +21,8 @@
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="pref_app_header"
-        android:layout="@layout/settings_entity_header" />
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false" />
 
     <com.android.settings.widget.SettingsMainSwitchPreference
         android:key="block" />
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index 2ffd0b1eaba..77b210f1821 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -79,6 +79,16 @@
         android:key="dashboard_tile_placeholder"
         android:order="10"/>
 
+    <Preference
+        android:key="contacts_storage"
+        android:title="@string/contacts_storage_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:order="13"
+        settings:controller="com.android.settings.applications.contacts.ContactsStoragePreferenceController"
+        android:fragment="com.android.settings.applications.contacts.ContactsStorageSettings"
+        settings:keywords="@string/keywords_contacts_storage">
+    </Preference>
+
     <Preference
         android:key="hibernated_apps"
         android:title="@string/unused_apps"
diff --git a/res/xml/bluetooth_device_more_settings_fragment.xml b/res/xml/bluetooth_device_more_settings_fragment.xml
index 4fb4acae03c..83aee8a26a4 100644
--- a/res/xml/bluetooth_device_more_settings_fragment.xml
+++ b/res/xml/bluetooth_device_more_settings_fragment.xml
@@ -19,6 +19,9 @@
     android:key="bluetooth_device_more_settings_screen"
     android:title="@string/device_details_more_settings">
 
+    <PreferenceCategory
+        android:key="bluetooth_audio_device_type_group"/>
+
     <PreferenceCategory
         android:key="bluetooth_profiles"/>
 </PreferenceScreen>
diff --git a/res/xml/bluetooth_screen.xml b/res/xml/bluetooth_screen.xml
index 51507fb0ba1..e815d44410b 100644
--- a/res/xml/bluetooth_screen.xml
+++ b/res/xml/bluetooth_screen.xml
@@ -21,6 +21,7 @@
     <SwitchPreferenceCompat
         android:key="bluetooth_auto_on_settings_toggle"
         android:title="@string/bluetooth_screen_auto_on_title"
+        android:summary="@string/bluetooth_screen_auto_on_summary"
         settings:controller="com.android.settings.bluetooth.BluetoothAutoOnPreferenceController"/>
 
     <Preference
diff --git a/res/xml/bundle_notifications_settings.xml b/res/xml/bundle_notifications_settings.xml
new file mode 100644
index 00000000000..34efd7dd49b
--- /dev/null
+++ b/res/xml/bundle_notifications_settings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2024 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/notification_bundle_title">
+
+    <com.android.settingslib.widget.IllustrationPreference
+        android:key="illustration"
+        settings:searchable="false"
+        android:selectable="false"
+        app:lottie_cacheComposition="false"
+        settings:dynamicColor="true"/>
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="feature_description"
+        settings:searchable="false"
+        android:title="@string/notification_bundle_description"/>
+
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="global_pref"
+        android:title="@string/notification_bundle_main_control_title"
+        settings:controller="com.android.settings.notification.BundleGlobalPreferenceController" />
+
+    <CheckBoxPreference
+        android:key="promotions"
+        android:title="@*android:string/promotional_notification_channel_label"
+        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+
+    <CheckBoxPreference
+        android:key="news"
+        android:title="@*android:string/news_notification_channel_label"
+        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+
+    <CheckBoxPreference
+        android:key="social"
+        android:title="@*android:string/social_notification_channel_label"
+        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+
+    <CheckBoxPreference
+        android:key="recs"
+        android:title="@*android:string/recs_notification_channel_label"
+        settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/button_navigation_settings.xml b/res/xml/button_navigation_settings.xml
index 1de011c7089..1f895399b5b 100644
--- a/res/xml/button_navigation_settings.xml
+++ b/res/xml/button_navigation_settings.xml
@@ -28,7 +28,8 @@
         settings:searchable="false"
         settings:dynamicColor="true"
         settings:lottie_imageAssetsFolder="button_nav_menu"
-        settings:lottie_rawRes="@raw/lottie_button_nav_menu"/>
+        settings:lottie_rawRes="@raw/lottie_button_nav_menu"
+        settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController"/>
 
     <SwitchPreferenceCompat
         android:key="assistant_long_press_home_gesture"
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 8cf05bea9fa..747923fe044 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -22,7 +22,8 @@
 
     <com.android.settingslib.widget.TopIntroPreference
         android:key="captioning_intro"
-        android:title="@string/accessibility_captioning_preference_intro"/>
+        android:title="@string/accessibility_captioning_preference_intro"
+        settings:searchable="false"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="captioning_preview"
@@ -44,7 +45,8 @@
     <Preference
         android:fragment="com.android.settings.accessibility.CaptioningMoreOptionsFragment"
         android:key="captioning_more_options"
-        android:title="@string/captioning_more_options_title" />
+        android:title="@string/captioning_more_options_title"
+        settings:searchable="false" />
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="captioning_settings_footer"
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index b673a0839b0..e5fddc4e58e 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -43,6 +43,14 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
         </Preference>
+
+        <Preference
+            android:fragment="com.android.settings.notification.BundlePreferenceFragment"
+            android:key="bundle_notifications_preference"
+            android:persistent="false"
+            android:order="12"
+            android:title="@string/notification_bundle_title"
+            settings:controller="com.android.settings.notification.BundlePreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -84,23 +92,31 @@
             android:singleLineTitle="false"
             android:summary="@string/summary_placeholder" />
 
+        <Preference
+            android:key="lock_screen_notifications_page"
+            android:order="14"
+            android:persistent="false"
+            android:title="@string/lock_screen_notifs_title"
+            android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
+            settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
+
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="lock_screen_redact"
-            android:order="14"
+            android:order="15"
             android:title="@string/lock_screen_notifs_redact"
             android:summary="@string/lock_screen_notifs_redact_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="lock_screen_work_redact"
-            android:order="15"
+            android:order="16"
             android:title="@string/lock_screen_notifs_redact_work"
             android:summary="@string/lock_screen_notifs_redact_work_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreferenceCompat
             android:key="notification_lockscreen_bypass"
-            android:order="16"
+            android:order="17"
             android:title="@string/lockscreen_bypass_title"
             android:summary="@string/lockscreen_bypass_summary"
             settings:searchable="false"
@@ -121,23 +137,31 @@
         <Preference
             android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"
             android:key="polite_notifications_preference"
-            android:order="17"
+            android:order="18"
             android:persistent="false"
             android:title="@string/notification_polite_title"
             settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />
 
         <com.android.settingslib.RestrictedPreference
             android:key="zen_mode_notifications"
-            android:order="18"
+            android:order="19"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
             android:fragment="com.android.settings.notification.zen.ZenModeSettings"
             settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
         />
 
+        <SwitchPreferenceCompat
+            android:key="lock_screen_notif_minimalism"
+            android:order="20"
+            android:title="@string/lock_screen_notif_minimalism"
+            android:summary="@string/lock_screen_notif_minimalism_summary"
+            settings:controller="com.android.settings.notification.LockscreenNotificationMinimalismPreferenceController"
+            />
+
         <SwitchPreferenceCompat
             android:key="lock_screen_show_only_unseen_notifs"
-            android:order="19"
+            android:order="21"
             android:title="@string/unseen_notifs_lock_screen"
             android:summary="@string/unseen_notifs_lock_screen_summary"
             settings:controller="com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController"
@@ -146,7 +170,7 @@
         <Preference
             android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"
             android:key="flash_notifications_preference"
-            android:order="20"
+            android:order="22"
             android:persistent="false"
             android:title="@string/flash_notifications_title"
             settings:searchable="false"
@@ -154,7 +178,7 @@
 
         <com.android.settingslib.RestrictedPreference
             android:key="app_and_notif_cell_broadcast_settings"
-            android:order="21"
+            android:order="23"
             android:title="@string/cell_broadcast_settings"
             settings:useAdminDisabledSummary="true">
             <intent
@@ -165,33 +189,33 @@
 
         <SwitchPreferenceCompat
              android:key="silent_icons"
-             android:order="22"
+             android:order="24"
              android:title="@string/silent_notifications_status_bar"
              settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
 
         <SwitchPreferenceCompat
             android:key="show_snooze_options"
-            android:order="23"
+            android:order="25"
             android:title="@string/snooze_options_title"
             settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
 
         <!-- Notification badging -->
         <SwitchPreferenceCompat
             android:key="notification_badging"
-            android:order="24"
+            android:order="26"
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
         <!-- Pulse notification light, on devices that support it -->
         <SwitchPreferenceCompat
             android:key="notification_pulse"
-            android:order="25"
+            android:order="27"
             android:title="@string/notification_pulse_title"
             settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
 
         <SwitchPreferenceCompat
             android:key="notification_assistant"
-            android:order="26"
+            android:order="28"
             android:title="@string/notification_assistant_title"
             android:summary="@string/notification_assistant_summary"
             settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
diff --git a/res/xml/contacts_storage_settings.xml b/res/xml/contacts_storage_settings.xml
new file mode 100644
index 00000000000..691a1cc16fd
--- /dev/null
+++ b/res/xml/contacts_storage_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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/contacts_storage_settings_title">
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:title="@string/contacts_storage_selection_message" />
+
+    <PreferenceCategory
+        android:key="account_category"
+        android:persistent="false"
+        android:title="@string/contacts_storage_account_category_title">
+    </PreferenceCategory>
+
+    <com.android.settingslib.widget.SelectorWithWidgetPreference
+        android:key="device_only_account_preference"
+        android:summary="@string/contacts_storage_device_only_preference_summary"
+        android:title="@string/contacts_storage_device_only_preference_label"
+        android:icon="@drawable/cloud_off"
+        android:order="999"
+        settings:allowDividerAbove="true"/>
+</PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 3fb4a065d7c..d8643be35f9 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -23,7 +23,7 @@
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="auto_time"
         android:title="@string/date_time_auto"
-        settings:useAdditionalSummary="true"
+        android:summary="@string/summary_placeholder"
         settings:userRestriction="no_config_date_time"
         settings:controller="com.android.settings.datetime.AutoTimePreferenceController" />
 
@@ -48,6 +48,7 @@
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="auto_zone"
             android:title="@string/zone_auto_title"
+            android:summary="@string/summary_placeholder"
             settings:userRestriction="no_config_date_time"
             settings:controller="com.android.settings.datetime.AutoTimeZonePreferenceController" />
 
@@ -60,6 +61,7 @@
         <SwitchPreferenceCompat
             android:key="location_time_zone_detection"
             android:title="@string/location_time_zone_detection_toggle_title"
+            android:summary="@string/summary_placeholder"
             settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
 
         <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/date_time_prefs_revamped.xml b/res/xml/date_time_prefs_revamped.xml
new file mode 100644
index 00000000000..fe0fd7e2c52
--- /dev/null
+++ b/res/xml/date_time_prefs_revamped.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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/date_and_time"
+    settings:keywords="@string/keywords_date_and_time">
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="auto_time"
+        android:title="@string/date_time_auto"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_date_time"
+        settings:controller="com.android.settings.datetime.AutoTimePreferenceController" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="date"
+        android:title="@string/date_time_set_date_title"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_date_time"
+        settings:controller="com.android.settings.datetime.DatePreferenceController" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="time"
+        android:title="@string/date_time_set_time_title"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_date_time"
+        settings:controller="com.android.settings.datetime.TimePreferenceController" />
+
+    <PreferenceCategory
+        android:key="timezone_preference_category"
+        android:title="@string/date_time_set_timezone_title">
+
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="auto_zone"
+            android:title="@string/zone_auto_title"
+            android:summary="@string/summary_placeholder"
+            settings:userRestriction="no_config_date_time"
+            settings:controller="com.android.settings.datetime.AutoTimeZonePreferenceController" />
+
+        <com.android.settingslib.widget.BannerMessagePreference
+            android:key="location_time_zone_detection_status"
+            android:title="@string/location_time_zone_detection_status_title"
+            settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
+
+        <!-- This preference gets removed if location-based time zone detection is not supported -->
+        <SwitchPreferenceCompat
+            android:key="location_time_zone_detection"
+            android:title="@string/location_time_zone_detection_toggle_title"
+            android:summary="@string/summary_placeholder"
+            settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="timezone"
+            android:title="@string/date_time_set_timezone_title"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
+            settings:userRestriction="no_config_date_time"
+            settings:keywords="@string/keywords_time_zone"
+            settings:controller="com.android.settings.datetime.TimeZonePreferenceController" />
+
+    </PreferenceCategory>
+
+    <!-- An optional preference category for feedback. Only displayed up if enabled via flags and config. -->
+    <PreferenceCategory
+            android:key="time_feedback_preference_category"
+            android:title="@string/time_feedback_category_title"
+            settings:keywords="@string/keywords_time_feedback_category"
+            settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceCategoryController">
+
+        <Preference
+                android:key="time_feedback"
+                android:title="@string/time_feedback_title"
+                settings:keywords="@string/keywords_time_feedback"
+                settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceController" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="time_format_preference_category"
+        android:title="@string/time_format_category_title"
+        settings:keywords="@string/keywords_time_format">
+
+        <SwitchPreferenceCompat
+            android:key="24 hour"
+            android:title="@string/date_time_24hour"
+            settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 294f9025a64..9d688543805 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -393,6 +393,11 @@
             android:entries="@array/bluetooth_leaudio_mode"
             android:entryValues="@array/bluetooth_leaudio_mode_values"/>
 
+        <SwitchPreferenceCompat
+            android:key="bluetooth_leaudio_broadcast_ui"
+            android:title="@string/bluetooth_leaudio_broadcast_ui"
+            android:summary="@string/bluetooth_leaudio_broadcast_ui_summary"/>
+
         <SwitchPreferenceCompat
             android:key="bluetooth_show_leaudio_device_details"
             android:title="@string/bluetooth_show_leaudio_device_details"/>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 4e52cf49092..3baf439035a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -28,12 +28,13 @@
         <com.android.settingslib.RestrictedPreference
             android:key="@string/preference_key_brightness_level"
             android:title="@string/brightness"
+            android:persistent="false"
             settings:keywords="@string/keywords_display_brightness_level"
             settings:useAdminDisabledSummary="true"
             settings:userRestriction="no_config_brightness"/>
 
         <com.android.settingslib.PrimarySwitchPreference
-            android:key="@string/preference_key_auto_brightness"
+            android:key="screen_brightness_mode"
             android:title="@string/auto_brightness_title"
             android:fragment="com.android.settings.display.AutoBrightnessSettings"
             settings:useAdminDisabledSummary="true"
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index fb5dd52b913..783d045b5d5 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2024 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -18,19 +18,28 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/double_tap_power_for_camera_title">
-
+    android:title="@string/double_tap_power_title">
     <com.android.settingslib.widget.IllustrationPreference
         android:key="gesture_double_tap_power_video"
         settings:searchable="false"
-        app:lottie_rawRes="@drawable/quickly_open_camera"/>
-
-    <SwitchPreferenceCompat
-        android:key="gesture_double_tap_power"
-        android:title="@string/double_tap_power_for_camera_title"
-        android:summary="@string/double_tap_power_for_camera_summary"
-        app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController"/>
+        settings:lottie_rawRes="@drawable/quickly_open_camera"
+        settings:controller="com.android.settings.gestures.DoubleTapPowerIllustrationPreferenceController"/>
 
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="gesture_double_tap_power_enabled_main_switch"
+        android:title="@string/double_tap_power_enabled"
+        settings:keywords="@string/keywords_gesture"
+        settings:controller="com.android.settings.gestures.DoubleTapPowerMainSwitchPreferenceController"/>
+    <PreferenceCategory
+        android:key="gesture_double_tap_power_actions"
+        android:title="@string/double_tap_power_target_action_category">
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="gesture_double_power_tap_camera"
+            android:title="@string/double_tap_power_camera_action_title"
+            settings:controller="com.android.settings.gestures.DoubleTapPowerForCameraPreferenceController"/>
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="gesture_double_power_tap_wallet"
+            android:title="@string/double_tap_power_wallet_action_title"
+            settings:controller="com.android.settings.gestures.DoubleTapPowerForWalletPreferenceController"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/double_tap_power_to_open_camera_settings.xml b/res/xml/double_tap_power_to_open_camera_settings.xml
new file mode 100644
index 00000000000..315c7f04da4
--- /dev/null
+++ b/res/xml/double_tap_power_to_open_camera_settings.xml
@@ -0,0 +1,35 @@
+<?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"
+    android:title="@string/double_tap_power_for_camera_title">
+
+    <com.android.settingslib.widget.IllustrationPreference
+        android:key="gesture_double_tap_power_video"
+        settings:searchable="false"
+        settings:lottie_rawRes="@drawable/quickly_open_camera"/>
+
+    <SwitchPreferenceCompat
+        android:key="gesture_double_tap_power"
+        android:title="@string/double_tap_power_for_camera_title"
+        android:summary="@string/double_tap_power_for_camera_summary"
+        settings:keywords="@string/keywords_gesture"
+        settings:controller="com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
index fff6bfe0333..bfc9855dd28 100644
--- a/res/xml/dream_fragment_overview.xml
+++ b/res/xml/dream_fragment_overview.xml
@@ -27,11 +27,6 @@
         settings:controller="com.android.settings.dream.DreamMainSwitchPreferenceController"
         settings:searchable="false"/>
 
-    <Preference
-        android:key="when_to_start"
-        android:title="@string/screensaver_settings_when_to_dream"
-        android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
-
     <PreferenceCategory
         android:title="@string/dream_picker_category">
         <com.android.settingslib.widget.LayoutPreference
@@ -40,6 +35,11 @@
             android:layout="@layout/dream_picker_layout"/>
     </PreferenceCategory>
 
+    <Preference
+        android:key="when_to_start"
+        android:title="@string/screensaver_settings_when_to_dream"
+        android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
+
     <SwitchPreferenceCompat
         android:key="dream_complications_toggle"
         android:title="@string/dream_complications_toggle_title"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 035c7f7c801..bfb359ae804 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -29,7 +29,7 @@
 
     <Preference
         android:key="gesture_double_tap_power_input_summary"
-        android:title="@string/double_tap_power_for_camera_title"
+        android:title="@string/double_tap_power_title"
         android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"
         settings:searchable="false"
         settings:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController" />
diff --git a/res/xml/input_touchpad_three_finger_tap_customization.xml b/res/xml/input_touchpad_three_finger_tap_customization.xml
new file mode 100644
index 00000000000..74510811158
--- /dev/null
+++ b/res/xml/input_touchpad_three_finger_tap_customization.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="input_touchpad_three_finger_tap"
+    android:persistent="false"
+    android:title="@string/three_finger_tap_preference_title">
+
+    <com.android.settings.inputmethod.TouchpadThreeFingerTapSelector
+        android:key="input_touchpad_three_finger_tap_preference"
+        android:title="@string/three_finger_tap_preference_title"/>
+
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 4613cb0bad0..f9f423e5ca5 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/languages_settings"
-    android:key="languages_settings">
+    android:key="language_settings">
     <PreferenceCategory
         android:key="languages_category"
         android:title="@string/locale_picker_category_title">
@@ -28,12 +28,13 @@
             android:title="@string/system_language"
             android:fragment="com.android.settings.localepicker.LocaleListEditor"
             settings:controller="com.android.settings.language.PhoneLanguagePreferenceController" />
+
         <Preference
             android:key="apps_language"
             android:title="@string/app_locales_picker_menu_title"
             android:summary="@string/app_locale_picker_summary"
             android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-            settings:controller="com.android.settings.applications.appinfo.ManageAppLocalePreferenceController">
+            settings:controller="com.android.settings.applications.appinfo.AppsLocalePreferenceController">
             <extra
                 android:name="classname"
                 android:value="com.android.settings.applications.appinfo.AppLocaleDetails" />
@@ -48,6 +49,61 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="more_language_settings_category"
+        android:title="@string/more_language_settings_category"
+        settings:controller="com.android.settings.language.MoreLanguagesSettingsCategoryController">
+        <Preference
+            android:key="apps_language_in_more_language_settings"
+            android:title="@string/app_locales_picker_menu_title"
+            android:summary="@string/app_locale_picker_summary"
+            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+            settings:controller="com.android.settings.applications.appinfo.NewAppsLocalePreferenceController">
+            <extra
+                android:name="classname"
+                android:value="com.android.settings.applications.appinfo.AppLocaleDetails" />
+        </Preference>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="regional_preferences_category"
+        android:title="@string/regional_preferences_category_title"
+        settings:controller="com.android.settings.regionalpreferences.RegionalPreferencesCategoryController">
+
+        <Preference
+            android:key="temperature_preference"
+            android:title="@string/temperature_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.NewTemperatureUnitController"
+            settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="mu"/>
+        </Preference>
+
+        <Preference
+            android:key="first_day_of_week_preference"
+            android:title="@string/first_day_of_week_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.NewFirstDayOfWeekController"
+            settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="fw"/>
+        </Preference>
+
+        <Preference
+            android:key="numbering_system_preference"
+            android:title="@string/numbers_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.NewNumberingSystemController"
+            settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="arg_value_language_select"/>
+        </Preference>
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="speech_category"
         android:title="@string/speech_category_title">
@@ -69,4 +125,11 @@
             android:fragment="com.android.settings.tts.TextToSpeechSettings"
             settings:searchable="false"/>
     </PreferenceCategory>
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="new_regional_pref_footer"
+        android:title="@string/title_regional_pref_footer"
+        android:selectable="false"
+        settings:searchable="false"
+        settings:controller="com.android.settings.regionalpreferences.NewRegionalFooterPreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/lock_screen_notifications_settings.xml b/res/xml/lock_screen_notifications_settings.xml
new file mode 100644
index 00000000000..b5fb12869e0
--- /dev/null
+++ b/res/xml/lock_screen_notifications_settings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2024 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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/lock_screen_notifs_title"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="lock_screen_notification_global_pref"
+        android:title="@string/switch_on_text"
+        settings:controller="com.android.settings.notification.LockScreenNotificationsGlobalPreferenceController"/>
+
+<!--    TODO: replace res with actual illustrations when we have -->
+    <com.android.settingslib.widget.IllustrationPreference
+        android:key="compact_illustration"
+        settings:searchable="false"
+        android:selectable="false"
+        settings:dynamicColor="true"/>
+
+    <com.android.settingslib.widget.IllustrationPreference
+        android:key="full_list_illustration"
+        settings:searchable="false"
+        android:selectable="false"
+        settings:dynamicColor="true"/>
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="ls_minimalism"
+        android:selectable="false"
+        android:layout="@layout/notification_ls_minimalism_selector"
+        settings:controller="com.android.settings.notification.lockscreen.MinimalismPreferenceController" />
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="lock_screen_notification_show_sensitive_toggle"
+        android:title="@string/lock_screen_notifications_summary_hide"
+        settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="work_profile_show_sensitive_notif_toggle"
+        android:title="@string/lock_screen_notifications_summary_hide_profile"
+        settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
+
+    <SwitchPreferenceCompat
+        android:key="lock_screen_notification_hide_seen_toggle"
+        android:title="@string/lock_screen_notification_hide_seen_title"
+        android:summary="@string/lock_screen_notification_hide_seen_summary"
+        settings:controller="com.android.settings.notification.LockScreenNotificationHideSeenToggleController" />
+
+    <SwitchPreferenceCompat
+        android:key="lock_screen_notification_hide_silent_toggle"
+        android:title="@string/lock_screen_notification_hide_silent_title"
+        android:summary="@string/lock_screen_notification_hide_silent_summary"
+        settings:controller="com.android.settings.notification.LockScreenNotificationHideSilentToggleController" />
+
+</PreferenceScreen>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 29e7c253943..a1a2276ee14 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -18,7 +18,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="mobile_network_pref_screen">
 
-    <com.android.settings.spa.preference.ComposePreference
+    <com.android.settings.spa.preference.ComposeMainSwitchPreference
         android:key="use_sim_switch"
         settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>
 
@@ -204,6 +204,21 @@
             settings:enableCopying="true"
             settings:controller="com.android.settings.network.telephony.MobileNetworkEidPreferenceController"/>
 
+        <PreferenceCategory
+            android:key="telephony_satellite_settings_category_key"
+            android:title="@string/satellite_setting_title"
+            settings:controller="com.android.settings.network.telephony.SatelliteSettingsPreferenceCategoryController">
+
+            <com.android.settingslib.RestrictedPreference
+                android:key="telephony_satellite_setting_key"
+                android:persistent="false"
+                android:title="@string/satellite_setting_title"
+                settings:keywords="@string/keywords_satellite_setting"
+                settings:controller=
+                    "com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>
+
+        </PreferenceCategory>
+
         <PreferenceCategory
             android:key="calling_category"
             android:title="@string/call_category"
@@ -267,14 +282,6 @@
                 settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>
         </PreferenceCategory>
 
-        <com.android.settingslib.RestrictedPreference
-            android:key="telephony_satellite_setting_key"
-            android:persistent="false"
-            android:title="@string/satellite_setting_title"
-            settings:keywords="@string/keywords_satellite_setting"
-            settings:controller=
-                "com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>
-
         <!--We want separate APN setting from reset of settings because we want user to change it with caution-->
         <com.android.settingslib.RestrictedPreference
             android:key="telephony_apn_key"
diff --git a/res/xml/modes_edit_name_icon.xml b/res/xml/modes_edit_name_icon.xml
index 2109c776ac8..4bcf67deccc 100644
--- a/res/xml/modes_edit_name_icon.xml
+++ b/res/xml/modes_edit_name_icon.xml
@@ -33,13 +33,15 @@
         android:key="name"
         android:layout="@layout/modes_edit_name" />
 
-    <com.android.settings.applications.SpacePreference
-        android:layout_height="32dp" />
+    <PreferenceCategory
+        android:title="@string/zen_mode_edit_choose_icon_title"
+        android:key="modes_filters">
 
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="icon_list"
-        android:selectable="false"
-        android:layout="@layout/modes_icon_list"/>
+        <com.android.settingslib.widget.LayoutPreference
+            android:key="icon_list"
+            android:selectable="false"
+            android:layout="@layout/modes_icon_list" />
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="done"
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index f2004937f60..56706c3f91a 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -83,6 +83,12 @@
             android:summary="@string/summary_placeholder"
             settings:searchable="false"/>
 
+        <Preference
+            android:key="more_security_lock_screen_notifications_page"
+            android:title="@string/lock_screen_notifs_title"
+            android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
+            settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
+
         <!-- Show media on lock screen -->
         <SwitchPreferenceCompat
             android:key="privacy_media_controls_lockscreen"
diff --git a/res/xml/mouse_keys_main_page.xml b/res/xml/mouse_keys_main_page.xml
new file mode 100644
index 00000000000..d781b519e79
--- /dev/null
+++ b/res/xml/mouse_keys_main_page.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/mouse_keys"
+    android:key="mouse_key_main_page">
+
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="mouse_keys_main_switch"
+        android:title="@string/mouse_keys_main_title"
+        settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityMouseKeysController"/>
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="mouse_keys_list"
+        android:layout="@layout/mouse_keys_image_list"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/mouse_settings.xml b/res/xml/mouse_settings.xml
new file mode 100644
index 00000000000..bb6d1a04f4b
--- /dev/null
+++ b/res/xml/mouse_settings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/mouse_settings">
+
+    <SwitchPreferenceCompat
+        android:key="mouse_reverse_vertical_scrolling"
+        android:title="@string/mouse_reverse_vertical_scrolling"
+        android:summary="@string/mouse_reverse_vertical_scrolling_summary"
+        settings:controller="com.android.settings.inputmethod.MouseReverseVerticalScrollingPreferenceController" />
+
+    <SwitchPreferenceCompat
+        android:key="mouse_swap_primary_button"
+        android:title="@string/mouse_swap_primary_button"
+        android:summary="@string/mouse_swap_primary_button_summary"
+        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />
+</PreferenceScreen>
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
index 292f1824552..7a333672317 100644
--- a/res/xml/network_provider_internet.xml
+++ b/res/xml/network_provider_internet.xml
@@ -30,6 +30,7 @@
         settings:allowDividerAbove="true"
         settings:keywords="@string/keywords_internet"
         settings:useAdminDisabledSummary="true"
+        settings:userRestriction="no_config_wifi"
         settings:controller="com.android.settings.network.InternetPreferenceControllerV2" />
 
     <com.android.settingslib.RestrictedPreference
@@ -56,7 +57,7 @@
         settings:controller="com.android.settings.network.MobileNetworkSummaryController" />
 
     <com.android.settingslib.RestrictedSwitchPreference
-        android:key="airplane_mode"
+        android:key="airplane_mode_on"
         android:title="@string/airplane_mode"
         android:icon="@drawable/ic_airplanemode_active"
         android:order="-5"
@@ -80,6 +81,7 @@
         android:title="@string/data_saver_title"
         android:icon="@drawable/ic_settings_data_usage"
         android:order="10"
+        android:persistent="false"
         settings:isPreferenceVisible="@bool/config_show_data_saver"
         android:fragment="com.android.settings.datausage.DataSaverSummary"/>
 
diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
index 418bb8d6819..74ec948713c 100644
--- a/res/xml/network_provider_settings.xml
+++ b/res/xml/network_provider_settings.xml
@@ -53,6 +53,7 @@
         android:key="main_toggle_wifi"
         android:title="@string/wifi"
         settings:keywords="@string/keywords_wifi"
+        settings:restrictedSwitchSummary="@string/not_allowed_by_ent"
         settings:allowDividerAbove="true"/>
 
     <PreferenceCategory
diff --git a/res/xml/one_handed_settings.xml b/res/xml/one_handed_settings.xml
index ab4d6f7c8b7..ad3bf3a1e4e 100644
--- a/res/xml/one_handed_settings.xml
+++ b/res/xml/one_handed_settings.xml
@@ -24,7 +24,8 @@
 
     <com.android.settingslib.widget.TopIntroPreference
         android:key="gesture_one_handed_mode_intro"
-        android:title="@string/one_handed_mode_intro_text"/>
+        android:title="@string/one_handed_mode_intro_text"
+        settings:searchable="false"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="one_handed_header"
diff --git a/res/xml/physical_keyboard_a11y_settings.xml b/res/xml/physical_keyboard_a11y_settings.xml
index eb787d0353f..9d634c00195 100644
--- a/res/xml/physical_keyboard_a11y_settings.xml
+++ b/res/xml/physical_keyboard_a11y_settings.xml
@@ -19,37 +19,40 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/keyboard_a11y_settings"
-    android:key="physical_keyboard_a11y">
+    android:key="physical_keyboard_a11y_page">
 
     <PreferenceCategory
-        android:key="keyboard_a11y_category"
+        android:key="keyboard_a11y_page_category"
         android:title="@string/keyboard_a11y_category">
 
         <SwitchPreferenceCompat
-            android:key="accessibility_sticky_keys"
+            android:key="keyboard_a11y_page_sticky_keys"
             android:title="@string/sticky_keys"
             android:summary="@string/sticky_keys_summary"
             android:defaultValue="false"
             settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/>
 
-        <SwitchPreferenceCompat
-            android:key="accessibility_bounce_keys"
+        <com.android.settingslib.PrimarySwitchPreference
+            android:key="keyboard_a11y_page_bounce_keys"
             android:title="@string/bounce_keys"
+            android:summary="@string/bounce_keys_summary"
             android:defaultValue="false"
             settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/>
 
-        <SwitchPreferenceCompat
-            android:key="accessibility_slow_keys"
+        <com.android.settingslib.PrimarySwitchPreference
+            android:key="keyboard_a11y_page_slow_keys"
             android:title="@string/slow_keys"
             android:defaultValue="false"
-            settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" />
+            android:summary="@string/slow_keys_summary"
+            settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController"/>
 
-        <SwitchPreferenceCompat
-            android:key="accessibility_mouse_keys"
+        <com.android.settingslib.PrimarySwitchPreference
+            android:key="keyboard_a11y_page_mouse_keys"
             android:title="@string/mouse_keys"
             android:summary="@string/mouse_keys_summary"
             android:defaultValue="false"
-            settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityMouseKeysController" />
+            android:fragment="com.android.settings.inputmethod.MouseKeysMainPageFragment"
+            settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityMouseKeysController"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index 1527ff52866..56914052b28 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -15,6 +15,7 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/physical_keyboard_title">
     <!-- Additional preference screens are inserted here programmatically
          with low order values to set the key map of each attached keyboard. -->
@@ -31,6 +32,15 @@
             android:title="@string/modifier_keys_settings"
             android:summary="@string/modifier_keys_settings_summary"
             android:fragment="com.android.settings.inputmethod.ModifierKeysSettings" />
+
+        <com.android.settingslib.PrimarySwitchPreference
+            android:key="physical_keyboard_repeat_keys"
+            android:title="@string/keyboard_repeat_keys_title"
+            android:summary="@string/keyboard_repeat_keys_summary"
+            android:defaultValue="false"
+            android:fragment="com.android.settings.inputmethod.KeyboardRepeatKeysMainFragment"
+            settings:controller="com.android.settings.inputmethod.KeyboardRepeatKeysController" />
+
         <Preference
             android:key="physical_keyboard_a11y"
             android:title="@string/keyboard_a11y_settings"
diff --git a/res/xml/power_background_usage_detail.xml b/res/xml/power_background_usage_detail.xml
index 5c7b6a5235a..05e4cfbe9b0 100644
--- a/res/xml/power_background_usage_detail.xml
+++ b/res/xml/power_background_usage_detail.xml
@@ -20,27 +20,29 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/manager_battery_usage_allow_background_usage_settings_title">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.IntroPreference
         android:key="header_view"
-        android:layout="@layout/settings_entity_header"
         android:selectable="false"/>
 
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="allow_background_usage"
-        android:title="@string/manager_battery_usage_allow_background_usage_title"
-        settings:controller="com.android.settings.fuelgauge.AllowBackgroundPreferenceController"/>
+    <PreferenceCategory
+        android:key="battery_optimization_mode_category"
+        android:layout="@layout/settingslib_preference_category_no_title"
+        settings:controller="com.android.settings.fuelgauge.BatteryOptimizationModePreferenceController">
 
-    <com.android.settingslib.widget.SelectorWithWidgetPreference
-        android:key="optimized_preference"
-        android:title="@string/manager_battery_usage_optimized_title"
-        android:summary="@string/manager_battery_usage_optimized_summary"
-        settings:controller="com.android.settings.fuelgauge.OptimizedPreferenceController"/>
+        <com.android.settingslib.widget.MainSwitchPreference
+            android:key="background_usage_allowability_switch"
+            android:title="@string/manager_battery_usage_allow_background_usage_title"/>
 
-    <com.android.settingslib.widget.SelectorWithWidgetPreference
-        android:key="unrestricted_preference"
-        android:title="@string/manager_battery_usage_unrestricted_title"
-        android:summary="@string/manager_battery_usage_unrestricted_summary"
-        settings:controller="com.android.settings.fuelgauge.UnrestrictedPreferenceController"/>
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="optimized_preference"
+            android:title="@string/manager_battery_usage_optimized_title"
+            android:summary="@string/manager_battery_usage_optimized_summary"/>
+
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="unrestricted_preference"
+            android:title="@string/manager_battery_usage_unrestricted_title"
+            android:summary="@string/manager_battery_usage_unrestricted_summary"/>
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="app_usage_footer_preference"
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
index f2c3d878e19..3258b7b9ca2 100644
--- a/res/xml/power_usage_advanced.xml
+++ b/res/xml/power_usage_advanced.xml
@@ -59,16 +59,15 @@
 
         <com.android.settingslib.widget.SettingsSpinnerPreference
             android:key="battery_usage_spinner"
+            android:order="0"
             settings:isPreferenceVisible="false" />
 
-        <PreferenceCategory
-            android:key="app_list"
-            android:layout="@layout/preference_category_no_label"
-            settings:isPreferenceVisible="false" />
+        <!-- App usage preference list will be added here with the order in range [100, 1000). -->
 
         <com.android.settingslib.widget.FooterPreference
             android:key="battery_usage_footer"
             android:selectable="false"
+            android:order="1000"
             settings:isPreferenceVisible="false"
             settings:searchable="false" />
 
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index f3b30b6323f..c2b1c5e3905 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -19,9 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.IntroPreference
         android:key="header_view"
-        android:layout="@layout/settings_entity_header"
         android:selectable="false"/>
 
     <com.android.settingslib.widget.ActionButtonsPreference
@@ -48,12 +47,12 @@
 
     <PreferenceCategory
         android:title="@string/manager_battery_usage_category_title"
-        android:key="manage_battery_usage_category">
+        android:key="background_usage_allowability_category"
+        settings:controller="com.android.settings.fuelgauge.BackgroundUsageAllowabilityPreferenceController">
 
         <com.android.settingslib.PrimarySwitchPreference
-            android:key="allow_background_usage"
-            android:title="@string/manager_battery_usage_allow_background_usage_title"
-            settings:controller="com.android.settings.fuelgauge.AllowBackgroundPreferenceController"/>
+            android:key="background_usage_allowability_switch"
+            android:title="@string/manager_battery_usage_allow_background_usage_title"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 77c6b7322c2..21a836d6d9a 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -25,8 +25,14 @@
         android:key="battery_header"
         android:title="@string/summary_placeholder"
         android:selectable="false"
+        android:paddingBottom="0px"
         settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />
 
+    <com.android.settings.fuelgauge.BatteryHeaderTextPreference
+        android:key="battery_header_text"
+        android:selectable="false"
+        settings:controller="com.android.settings.fuelgauge.BatteryHeaderTextPreferenceController" />
+
     <com.android.settingslib.widget.LayoutPreference
         android:key="battery_help_message"
         android:layout="@layout/preference_battery_error"
@@ -59,7 +65,7 @@
         settings:keywords="@string/keywords_battery_adaptive_preferences" />
 
     <SwitchPreferenceCompat
-        android:key="battery_percentage"
+        android:key="status_bar_show_battery_percent"
         android:title="@string/battery_percentage"
         android:summary="@string/battery_percentage_description"
         settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index d5cb2f52094..248f6c8c199 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -91,6 +91,12 @@
         android:title="@string/lock_screen_notifs_title"
         android:summary="@string/summary_placeholder"/>
 
+    <Preference
+        android:key="privacy_lock_screen_notifications_page"
+        android:title="@string/lock_screen_notifs_title"
+        android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
+        settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
+
     <!-- Show media on lock screen -->
     <SwitchPreferenceCompat
         android:key="privacy_media_controls_lockscreen"
diff --git a/res/xml/reduce_bright_colors_settings.xml b/res/xml/reduce_bright_colors_settings.xml
index d092e138fb3..683190ee271 100644
--- a/res/xml/reduce_bright_colors_settings.xml
+++ b/res/xml/reduce_bright_colors_settings.xml
@@ -30,8 +30,12 @@
         settings:tickMark="@android:color/transparent"
     />
 
+    <!-- The term `restarts` is usually used for indicating restarting devices.
+         Therefore, We wouldn't want `Keep on after device restarts` preference in the Extra Dim
+         shows up as the search result when the user searches `restart`-->
     <SwitchPreferenceCompat
         android:key="rbc_persist"
         android:persistent="false"
-        android:title="@string/reduce_bright_colors_persist_preference_title" />
+        android:title="@string/reduce_bright_colors_persist_preference_title"
+        settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/regional_preference_main_page.xml b/res/xml/regional_preference_main_page.xml
index 5c46f8c5732..704019f3bee 100644
--- a/res/xml/regional_preference_main_page.xml
+++ b/res/xml/regional_preference_main_page.xml
@@ -20,41 +20,46 @@
     android:key="regional_preferences">
 
     <com.android.settingslib.widget.TopIntroPreference
+        android:key="regional_pref_intro"
         android:title="@string/regional_preferences_main_page_sub_title"
-        android:persistent="false" />
+        android:persistent="false"/>
 
-    <Preference
-        android:key="key_temperature_unit"
-        android:title="@string/temperature_preferences_title"
-        android:summary="@string/default_string_of_regional_preference"
-        settings:controller="com.android.settings.regionalpreferences.TemperatureUnitController"
-        settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
-        <extra
-            android:name="arg_key_regional_preference"
-            android:value="mu" />
-    </Preference>
+    <PreferenceCategory
+        android:key="regional_preferences_category"
+        android:layout="@layout/settingslib_preference_category_no_title">
+        <Preference
+            android:key="key_temperature_unit"
+            android:title="@string/temperature_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.TemperatureUnitController"
+            settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="mu"/>
+        </Preference>
 
-    <Preference
-        android:key="key_first_day_of_week"
-        android:title="@string/first_day_of_week_preferences_title"
-        android:summary="@string/default_string_of_regional_preference"
-        settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekController"
-        settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
-        <extra
-            android:name="arg_key_regional_preference"
-            android:value="fw" />
-    </Preference>
+        <Preference
+            android:key="key_first_day_of_week"
+            android:title="@string/first_day_of_week_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekController"
+            settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="fw"/>
+        </Preference>
 
-    <Preference
-        android:key="key_numbering_system"
-        android:title="@string/numbers_preferences_title"
-        android:summary="@string/default_string_of_regional_preference"
-        settings:controller="com.android.settings.regionalpreferences.NumberingSystemController"
-        settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
-        <extra
-            android:name="arg_key_regional_preference"
-            android:value="arg_value_language_select" />
-    </Preference>
+        <Preference
+            android:key="key_numbering_system"
+            android:title="@string/numbers_preferences_title"
+            android:summary="@string/default_string_of_regional_preference"
+            settings:controller="com.android.settings.regionalpreferences.NumberingSystemController"
+            settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
+            <extra
+                android:name="arg_key_regional_preference"
+                android:value="arg_value_language_select"/>
+        </Preference>
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="regional_pref_footer"
diff --git a/res/xml/regional_preferences_first_day_of_week.xml b/res/xml/regional_preferences_first_day_of_week.xml
index d9de5e5bd86..28487482a18 100644
--- a/res/xml/regional_preferences_first_day_of_week.xml
+++ b/res/xml/regional_preferences_first_day_of_week.xml
@@ -21,6 +21,7 @@
     android:key="regional_preference_first_day_of_week">
 
     <com.android.settingslib.widget.TopIntroPreference
+        android:key="first_day_of_week_intro"
         android:title="@string/regional_preferences_option_page_sub_title"
         android:persistent="false" />
 
diff --git a/res/xml/regional_preferences_temperature.xml b/res/xml/regional_preferences_temperature.xml
index 2519dfafcd4..888a0ec286b 100644
--- a/res/xml/regional_preferences_temperature.xml
+++ b/res/xml/regional_preferences_temperature.xml
@@ -21,6 +21,7 @@
     android:key="regional_preference_temperature">
 
     <com.android.settingslib.widget.TopIntroPreference
+        android:key="temperature_unit_intro"
         android:title="@string/regional_preferences_option_page_sub_title"
         android:persistent="false" />
 
diff --git a/res/xml/repeat_key_main_page.xml b/res/xml/repeat_key_main_page.xml
new file mode 100644
index 00000000000..c33eba79854
--- /dev/null
+++ b/res/xml/repeat_key_main_page.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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/keyboard_repeat_keys_title"
+    android:key="repeat_keys_main_page">
+
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="repeat_keys_main_switch"
+        android:title="@string/keyboard_repeat_keys_title"
+        settings:controller="com.android.settings.inputmethod.KeyboardRepeatKeysController"/>
+    <com.android.settings.widget.LabeledSeekBarPreference
+        android:key="repeat_keys_timeout_preference"
+        android:title="@string/keyboard_repeat_keys_timeout_title"
+        android:min="0"
+        android:max="6"
+        settings:seekBarIncrement="1"
+        settings:controller= "com.android.settings.inputmethod.KeyboardRepeatKeysTimeOutPreferenceController" />
+    <com.android.settings.widget.LabeledSeekBarPreference
+        android:key="repeat_keys_delay_preference"
+        android:title="@string/keyboard_repeat_keys_delay_title"
+        android:min="0"
+        android:max="8"
+        settings:seekBarIncrement="1"
+        settings:controller= "com.android.settings.inputmethod.KeyboardRepeatKeysDelayPreferenceController" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/satellite_setting.xml b/res/xml/satellite_setting.xml
index 09fbbd66171..60fe5bfb335 100644
--- a/res/xml/satellite_setting.xml
+++ b/res/xml/satellite_setting.xml
@@ -22,7 +22,7 @@
     settings:keywords="@string/keywords_satellite_setting">
 
     <PreferenceCategory
-        android:title="@string/category_name_about_satellite_messaging">
+        android:key="key_category_about_satellite">
 
         <com.android.settingslib.widget.TopIntroPreference
             android:key="key_about_satellite_messaging"/>
@@ -35,6 +35,12 @@
         <Preference
             android:key="key_your_satellite_plan"
             android:icon="?android:attr/textColorPrimary"/>
+
+        <Preference
+            android:key="key_your_satellite_data_plan"
+            android:icon="?android:attr/textColorPrimary"
+            settings:isPreferenceVisible="false"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 15d530357d9..9b9df3e29f0 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="lockscreen_from_display_settings"
     android:title="@string/lockscreen_settings_title">
 
     <PreferenceCategory
@@ -28,6 +29,13 @@
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_lock_screen_notif"/>
 
+        <Preference
+            android:key="security_lock_screen_notifications_page"
+            android:title="@string/lock_screen_notifs_title"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
+            settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
+
         <SwitchPreferenceCompat
             android:key="security_display_lockscreen_bypass"
             android:title="@string/lockscreen_bypass_title"
diff --git a/res/xml/security_settings_fingerprint.xml b/res/xml/security_settings_fingerprint.xml
index 9c8b0a3f9ea..32f09244f97 100644
--- a/res/xml/security_settings_fingerprint.xml
+++ b/res/xml/security_settings_fingerprint.xml
@@ -40,7 +40,16 @@
             android:title="@string/security_settings_require_screen_on_to_auth_title"
             android:summary="@string/security_settings_require_screen_on_to_auth_description"
             settings:keywords="@string/security_settings_require_screen_on_to_auth_keywords"
-            settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsRequireScreenOnToAuthPreferenceController" />
+            settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsRequireScreenOnToAuthPreferenceController"
+            settings:isPreferenceVisible="false"/>
+
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="@string/security_settings_screen_off_unlock_udfps_key"
+            android:title="@string/security_settings_screen_off_unlock_udfps_title"
+            android:summary="@string/security_settings_screen_off_unlock_udfps_description"
+            settings:keywords="@string/security_settings_screen_off_unlock_udfps_keywords"
+            settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsScreenOffUnlockUdfpsPreferenceController"
+            settings:isPreferenceVisible="false"/>
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 15312c8b067..eed44067619 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -170,7 +170,7 @@
 
     <!-- Dial pad tones -->
     <SwitchPreferenceCompat
-        android:key="dial_pad_tones"
+        android:key="dtmf_tone"
         android:title="@string/dial_pad_tones_title"
         android:order="-50"/>
 
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 7e8969de07d..f3a5f3216c7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -60,7 +60,7 @@
 
     <Preference
         android:key="zen_access"
-        android:title="@string/manage_zen_access_title"
+        android:title="@string/manage_zen_modes_access_title"
         android:order="-1500"
         android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
         settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
@@ -106,6 +106,11 @@
         android:title="@string/full_screen_intent_title"
         settings:controller="com.android.settings.spa.app.specialaccess.UseFullScreenIntentPreferenceController" />
 
+    <Preference
+        android:key="write_system_preferences"
+        android:title="@string/write_system_preferences_page_title"
+        settings:controller="com.android.settings.spa.app.specialaccess.WriteSystemPreferencesPreferenceController" />
+
     <Preference
         android:key="picture_in_picture"
         android:title="@string/picture_in_picture_title"
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index f14f4adad0d..6c2b8d48b66 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -101,7 +101,8 @@
             android:key="pref_system"
             android:title="@string/storage_os_name"
             android:icon="@drawable/ic_android_vd_theme_24"
-            android:order="202"/>
+            android:order="202"
+            settings:searchable="false"/>
         <com.android.settings.deviceinfo.StorageItemPreference
             android:key="temporary_files"
             android:title="@string/storage_temporary_files"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 621a3253a83..83cdf64fc00 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -43,8 +43,8 @@
         android:summary="@string/trackpad_settings_summary"
         android:icon="@drawable/ic_settings_trackpad"
         android:order="-254"
-        android:fragment="com.android.settings.inputmethod.TrackpadSettings"
-        settings:controller="com.android.settings.inputmethod.TrackpadSettingsController"/>
+        android:fragment="com.android.settings.inputmethod.TouchpadAndMouseSettings"
+        settings:controller="com.android.settings.inputmethod.TouchpadAndMouseSettingsController"/>
 
     <Preference
         android:key="gesture_settings"
diff --git a/res/xml/system_language_picker.xml b/res/xml/system_language_picker.xml
new file mode 100644
index 00000000000..cccf56ea063
--- /dev/null
+++ b/res/xml/system_language_picker.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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/language_selection_title"
+    android:key="key_system_language_picker_page">
+
+    <PreferenceCategory
+        android:key="system_language_suggested_category"
+        android:title="@string/suggested_locales_title"/>
+
+    <PreferenceCategory
+        android:key="system_language_all_supported_category"
+        android:title="@string/all_supported_locales_title"/>
+
+</PreferenceScreen>
diff --git a/res/xml/system_navigation_gesture_settings.xml b/res/xml/system_navigation_gesture_settings.xml
index a75875bc745..8919a4085a2 100644
--- a/res/xml/system_navigation_gesture_settings.xml
+++ b/res/xml/system_navigation_gesture_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2018 The Android Open Source Project
+  Copyright (C) 2024 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,4 +19,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/system_navigation_title"
-    settings:keywords="@string/keywords_system_navigation"/>
+    settings:keywords="@string/keywords_system_navigation">
+
+    <SwitchPreferenceCompat
+        android:key="search_gesture_press_hold"
+        android:title="@string/search_gesture_feature_title"
+        android:summary="@string/search_gesture_feature_summary"
+        android:order="100"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.gestures.NavigationSettingsContextualSearchController"
+        settings:highlightableMenuKey="@string/menu_key_system" />
+
+</PreferenceScreen>
diff --git a/res/xml/terms_of_address.xml b/res/xml/terms_of_address.xml
index 90cbe52f6ca..3c1ba312243 100644
--- a/res/xml/terms_of_address.xml
+++ b/res/xml/terms_of_address.xml
@@ -24,22 +24,22 @@
         android:title="@string/terms_of_address_intro_title"
         android:persistent="false"/>
 
-    <com.android.settings.widget.TickButtonPreference
+    <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="key_terms_of_address_not_specified"
         android:title="@string/terms_of_address_not_specified"
         settings:controller="com.android.settings.localepicker.TermsOfAddressNotSpecifiedController"/>
 
-    <com.android.settings.widget.TickButtonPreference
+    <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="key_terms_of_address_feminine"
         android:title="@string/terms_of_address_feminine"
         settings:controller="com.android.settings.localepicker.TermsOfAddressFeminineController"/>
 
-    <com.android.settings.widget.TickButtonPreference
+    <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="key_terms_of_address_masculine"
         android:title="@string/terms_of_address_masculine"
         settings:controller="com.android.settings.localepicker.TermsOfAddressMasculineController"/>
 
-    <com.android.settings.widget.TickButtonPreference
+    <com.android.settingslib.widget.SelectorWithWidgetPreference
         android:key="key_terms_of_address_neutral"
         android:title="@string/terms_of_address_neutral"
         settings:controller="com.android.settings.localepicker.TermsOfAddressNeutralController"/>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 89bd631bcd2..c3ea3cbcd8b 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -28,8 +28,7 @@
         android:title="@string/wifi_hotspot_checkbox_text"
         android:summary="@string/wifi_hotspot_off_subtext"
         android:fragment="com.android.settings.wifi.tether.WifiTetherSettings"
-        settings:allowDividerAbove="true"
-        settings:maxLines="2"/>
+        settings:allowDividerAbove="true"/>
 
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="usb_tether_settings"
diff --git a/res/xml/touchpad_and_mouse_settings.xml b/res/xml/touchpad_and_mouse_settings.xml
new file mode 100644
index 00000000000..b82b3a62ea3
--- /dev/null
+++ b/res/xml/touchpad_and_mouse_settings.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/trackpad_mouse_settings">
+    <Preference
+        android:key="trackpad_gesture_settings"
+        android:title="@string/trackpad_touchpad_gesture_title"
+        android:summary="@string/trackpad_touchpad_gesture_summary"
+        android:order="-10"
+        android:fragment="com.android.settings.inputmethod.TrackpadTouchGestureSettings"
+        settings:controller="com.android.settings.inputmethod.TrackpadTouchGestureSettingsController"/>
+
+    <SwitchPreferenceCompat
+        android:key="trackpad_tap_to_click"
+        android:title="@string/trackpad_tap_to_click"
+        settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"
+        android:order="10"/>
+
+    <SwitchPreferenceCompat
+        android:key="trackpad_reverse_scrolling"
+        android:title="@string/trackpad_reverse_scrolling_title"
+        android:summary="@string/trackpad_reverse_scrolling_summary"
+        settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"
+        android:order="20"/>
+
+    <SwitchPreferenceCompat
+        android:key="trackpad_bottom_right_tap"
+        android:title="@string/trackpad_bottom_right_tap_title"
+        android:summary="@string/trackpad_bottom_right_tap_summary"
+        settings:controller="com.android.settings.inputmethod.TrackpadBottomPreferenceController"
+        android:order="30"
+        settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>
+
+    <SwitchPreferenceCompat
+        android:key="trackpad_tap_dragging"
+        android:title="@string/trackpad_tap_dragging_title"
+        android:summary="@string/trackpad_tap_dragging_summary"
+        settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"
+        android:order="35"/>
+
+    <Preference
+        android:fragment="com.android.settings.inputmethod.TouchpadThreeFingerTapFragment"
+        android:key="three_finger_tap"
+        android:title="@string/three_finger_tap_preference_title"
+        settings:controller="com.android.settings.inputmethod.TouchpadThreeFingerTapPreferenceController"
+        android:order="37"/>
+
+    <com.android.settings.widget.SeekBarPreference
+        android:key="trackpad_pointer_speed"
+        android:title="@string/trackpad_pointer_speed"
+        android:order="40"
+        android:selectable="false"
+        settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
+
+    <SwitchPreferenceCompat
+        android:key="mouse_reverse_vertical_scrolling"
+        android:title="@string/mouse_reverse_vertical_scrolling"
+        android:summary="@string/mouse_reverse_vertical_scrolling_summary"
+        settings:controller="com.android.settings.inputmethod.MouseReverseVerticalScrollingPreferenceController"
+        android:order="45"/>
+
+    <SwitchPreferenceCompat
+        android:key="mouse_swap_primary_button"
+        android:title="@string/mouse_swap_primary_button"
+        android:summary="@string/mouse_swap_primary_button_summary"
+        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController"
+        android:order="47"/>
+
+    <Preference
+        android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
+        android:key="pointer_and_touchpad"
+        android:order="50"
+        android:persistent="false"
+        android:title="@string/accessibility_pointer_and_touchpad_title"
+        android:summary="@string/accessibility_pointer_and_touchpad_summary"
+        settings:searchable="true"/>
+
+    <com.android.settingslib.widget.ButtonPreference
+        android:key="trackpad_touch_gesture"
+        android:title="@string/trackpad_touch_gesture"
+        settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="trackpad_gestures_disabled_footer"
+        android:title="@string/trackpad_gestures_disabled_footer_text"
+        settings:searchable="false"
+        settings:controller="com.android.settings.inputmethod.TrackpadGesturesDisabledFooterPreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/trackpad_settings.xml b/res/xml/touchpad_settings.xml
similarity index 96%
rename from res/xml/trackpad_settings.xml
rename to res/xml/touchpad_settings.xml
index 7e9494476fe..1e82d822586 100644
--- a/res/xml/trackpad_settings.xml
+++ b/res/xml/touchpad_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2022 The Android Open Source Project
+  Copyright 2024 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
   WITHOUT 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/trackpad_mouse_settings">
+    android:title="@string/trackpad_settings">
     <Preference
         android:key="trackpad_gesture_settings"
         android:title="@string/trackpad_touchpad_gesture_title"
diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
index c45f702ca13..2ce408b98dc 100644
--- a/res/xml/wifi_calling_settings.xml
+++ b/res/xml/wifi_calling_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:key="wifi_calling_settings"
+                  android:key="wifi_calling"
                   android:title="@string/wifi_calling_settings_title">
 
     <com.android.settings.widget.SettingsMainSwitchPreference
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index c233ddab3c2..c0d9ffce4d3 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -147,9 +147,24 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener {
      * @return any subscription within device is under ECM mode
      */
     public boolean isInEcmMode() {
+        return isInEcmMode(mContext, mTelephonyManager);
+    }
+
+    /**
+     * Check the status of ECM mode
+     *
+     * @param context Caller's {@link Context}
+     * @param telephonyManager The default {@link TelephonyManager}
+     *
+     * @return any subscription within device is under ECM mode
+     */
+    public static boolean isInEcmMode(Context context, TelephonyManager telephonyManager) {
+        if (context == null || telephonyManager == null) {
+            return false;
+        }
         if (Flags.enforceTelephonyFeatureMappingForPublicApis()) {
             try {
-                if (mTelephonyManager.getEmergencyCallbackMode()) {
+                if (telephonyManager.getEmergencyCallbackMode()) {
                     return true;
                 }
             } catch (UnsupportedOperationException e) {
@@ -157,26 +172,26 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener {
                 // Ignore exception, device is not in ECM mode.
             }
         } else {
-            if (mTelephonyManager.getEmergencyCallbackMode()) {
+            if (telephonyManager.getEmergencyCallbackMode()) {
                 return true;
             }
         }
         final List<SubscriptionInfo> subInfoList =
-                ProxySubscriptionManager.getInstance(mContext).getActiveSubscriptionsInfo();
+                ProxySubscriptionManager.getInstance(context).getActiveSubscriptionsInfo();
         if (subInfoList == null) {
             return false;
         }
         for (SubscriptionInfo subInfo : subInfoList) {
-            final TelephonyManager telephonyManager =
-                    mTelephonyManager.createForSubscriptionId(subInfo.getSubscriptionId());
-            if (telephonyManager != null) {
+            final TelephonyManager telephonyManagerForSubId =
+                    telephonyManager.createForSubscriptionId(subInfo.getSubscriptionId());
+            if (telephonyManagerForSubId != null) {
                 if (!Flags.enforceTelephonyFeatureMappingForPublicApis()) {
-                    if (telephonyManager.getEmergencyCallbackMode()) {
+                    if (telephonyManagerForSubId.getEmergencyCallbackMode()) {
                         return true;
                     }
                 } else {
                     try {
-                        if (telephonyManager.getEmergencyCallbackMode()) {
+                        if (telephonyManagerForSubId.getEmergencyCallbackMode()) {
                             return true;
                         }
                     } catch (UnsupportedOperationException e) {
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 97b9aae0cd1..10763d00102 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -20,9 +20,13 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
+import com.android.settings.display.DisplayScreen;
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
@@ -92,4 +96,9 @@ public class DisplaySettings extends DashboardFragment {
                     return buildPreferenceControllers(context, null);
                 }
             };
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return DisplayScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java
index 9cb3bf4ef84..533dde3bb29 100644
--- a/src/com/android/settings/LegalSettings.java
+++ b/src/com/android/settings/LegalSettings.java
@@ -17,8 +17,13 @@
 package com.android.settings;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.deviceinfo.legal.LegalSettingsScreen;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
@@ -44,4 +49,9 @@ public class LegalSettings extends DashboardFragment {
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.about_legal);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return LegalSettingsScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/MainClearConfirm.java b/src/com/android/settings/MainClearConfirm.java
index c9887e81f5b..5aee5de3712 100644
--- a/src/com/android/settings/MainClearConfirm.java
+++ b/src/com/android/settings/MainClearConfirm.java
@@ -17,6 +17,8 @@
 package com.android.settings;
 
 
+import static android.content.Context.MODE_PRIVATE;
+
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.app.ProgressDialog;
@@ -25,6 +27,7 @@ import android.app.admin.FactoryResetProtectionPolicy;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -33,6 +36,7 @@ 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;
@@ -42,6 +46,7 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -90,7 +95,7 @@ public class MainClearConfirm extends InstrumentedFragment {
             } else {
                 pdbManager = null;
             }
-
+            setSimDialogProgressState();
             if (shouldWipePersistentDataBlock(pdbManager)) {
 
                 new AsyncTask<Void, Void, Void>() {
@@ -128,6 +133,17 @@ public class MainClearConfirm extends InstrumentedFragment {
             } else {
                 doMainClear();
             }
+
+        }
+
+        private void setSimDialogProgressState() {
+            if (getActivity() != null) {
+                final SharedPreferences prefs = getActivity().getSharedPreferences(
+                        SubscriptionActionDialogActivity.SIM_ACTION_DIALOG_PREFS, MODE_PRIVATE);
+                prefs.edit().putInt(SubscriptionActionDialogActivity.KEY_PROGRESS_STATE,
+                        SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING).apply();
+                Log.d(TAG, "SIM dialog setProgressState: 1");
+            }
         }
 
         private ProgressDialog getProgressDialog() {
diff --git a/src/com/android/settings/PreferenceRestrictionMixin.kt b/src/com/android/settings/PreferenceRestrictionMixin.kt
new file mode 100644
index 00000000000..8a3640756fd
--- /dev/null
+++ b/src/com/android/settings/PreferenceRestrictionMixin.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context
+import android.os.UserHandle
+import android.os.UserManager
+import androidx.annotation.CallSuper
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin
+import com.android.settingslib.RestrictedLockUtilsInternal
+import com.android.settingslib.metadata.PreferenceRestrictionProvider
+
+/** Mixin to support restriction. */
+interface PreferenceRestrictionMixin : PreferenceRestrictionProvider {
+
+    /**
+     * Keys for restriction.
+     *
+     * Preference is restricted when **ANY** key in the list is restricted.
+     */
+    val restrictionKeys: Array<String>
+
+    val useAdminDisabledSummary: Boolean
+        get() = false
+
+    @CallSuper fun isEnabled(context: Context) = !context.hasBaseUserRestriction(restrictionKeys)
+
+    override fun isRestricted(context: Context) =
+        context.getRestrictionEnforcedAdmin(restrictionKeys) != null
+}
+
+/** Returns the admin that has enforced restriction on given keys. */
+fun Context.getRestrictionEnforcedAdmin(restrictionKeys: Array<String>): EnforcedAdmin? {
+    val userId = UserHandle.myUserId()
+    return restrictionKeys.firstNotNullOfOrNull {
+        RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this, it, userId)
+    }
+}
+
+/** Returns if there is **any** base user restriction on given keys. */
+fun Context.hasBaseUserRestriction(restrictionKeys: Array<String>): Boolean {
+    val userManager = getSystemService(UserManager::class.java) ?: return false
+    val userHandle = UserHandle.of(UserHandle.myUserId())
+    return restrictionKeys.any { userManager.hasBaseUserRestriction(it, userHandle) }
+}
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
index 6b5ccc79047..4038aa8a43b 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
@@ -69,6 +69,6 @@ class RegulatoryInfoDisplayActivity : Activity() {
     private fun getRegulatoryText(): CharSequence? {
         val regulatoryInfoText = resources.getText(R.string.regulatory_info_text)
         if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText
-        return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel
+        return featureFactory.hardwareInfoFeatureProvider?.countryOfOriginLabel
     }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index f86e29f14d1..2178b603d1b 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -47,7 +47,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.ResetNetworkRestrictionViewBuilder;
@@ -142,13 +141,10 @@ public class ResetNetwork extends InstrumentedFragment {
         Context context = getContext();
         boolean resetSims = false;
 
-        // TODO(b/317276437) Simplify the logic once flag is released
         int resetOptions = ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER
-                        | ResetNetworkRequest.RESET_VPN_MANAGER;
-        if (Flags.resetMobileNetworkSettings()) {
-            resetOptions |= ResetNetworkRequest.RESET_IMS_STACK;
-            resetOptions |= ResetNetworkRequest.RESET_PHONE_PROCESS;
-        }
+                        | ResetNetworkRequest.RESET_VPN_MANAGER
+                        | ResetNetworkRequest.RESET_IMS_STACK
+                        | ResetNetworkRequest.RESET_PHONE_PROCESS;
         ResetNetworkRequest request = new ResetNetworkRequest(resetOptions);
         if (mSubscriptions != null && mSubscriptions.size() > 0) {
             int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
@@ -156,9 +152,7 @@ public class ResetNetwork extends InstrumentedFragment {
             int subId = subscription.getSubscriptionId();
             request.setResetTelephonyAndNetworkPolicyManager(subId)
                     .setResetApn(subId);
-            if (Flags.resetMobileNetworkSettings()) {
-                request.setResetImsSubId(subId);
-            }
+            request.setResetImsSubId(subId);
         }
         if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) {
             resetSims = true;
diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java
index d75f1b8fae9..d5bc3418627 100644
--- a/src/com/android/settings/RestrictedListPreference.java
+++ b/src/com/android/settings/RestrictedListPreference.java
@@ -33,6 +33,7 @@ import android.widget.CheckedTextView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.preference.ListPreferenceDialogFragmentCompat;
@@ -40,11 +41,14 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class RestrictedListPreference extends CustomListPreference {
+public class RestrictedListPreference extends CustomListPreference implements
+        RestrictedPreferenceHelperProvider {
+
     private final RestrictedPreferenceHelper mHelper;
     private final List<RestrictedItem> mRestrictedItems = new ArrayList<>();
     private boolean mRequiresActiveUnlockedProfile = false;
@@ -61,6 +65,11 @@ public class RestrictedListPreference extends CustomListPreference {
         mHelper = new RestrictedPreferenceHelper(context, this, attrs);
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mHelper;
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 7678338976a..d5cf9aa2281 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -92,13 +92,17 @@ public class Settings extends SettingsActivity {
     public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
     public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }
+    public static class PhysicalKeyboardLayoutPickerActivity extends SettingsActivity {
+        /* empty */
+    }
     public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }
     public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LocalePickerActivity extends SettingsActivity { /* empty */ }
-    public static class LanguageAndInputSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }
     /** Activity for the regional preferences settings. */
     public static class RegionalPreferencesActivity extends SettingsActivity { /* empty */ }
+    public static class TemperatureUnitSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class FirstDayOfWeekSettingsActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardSettingsActivity extends SettingsActivity { /* empty */ }
     /** Activity for the navigation mode settings. */
     public static class NavigationModeSettingsActivity extends SettingsActivity { /* empty */ }
@@ -112,6 +116,7 @@ public class Settings extends SettingsActivity {
     public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
+    public static class AppStorageSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageAssistActivity extends SettingsActivity { /* empty */ }
     public static class HighPowerApplicationsActivity extends SettingsActivity { /* empty */ }
     public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }
@@ -485,6 +490,7 @@ public class Settings extends SettingsActivity {
     public static class NetworkDashboardActivity extends SettingsActivity {}
     public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
+    public static class PowerUsageAdvancedActivity extends SettingsActivity { /* empty */ }
     public static class StorageDashboardActivity extends SettingsActivity {}
     public static class AccountDashboardActivity extends SettingsActivity {}
     public static class SystemDashboardActivity extends SettingsActivity {}
@@ -515,4 +521,5 @@ public class Settings extends SettingsActivity {
 
     public static class HearingDevicesActivity extends SettingsActivity { /* empty */ }
     public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ }
+    public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index a79ba8073ac..c81d504b223 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -73,6 +73,7 @@ import com.android.settings.widget.SettingsMainSwitchBar;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
 import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.widget.SettingsThemeHelper;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
@@ -169,6 +170,9 @@ public class SettingsActivity extends SettingsBaseActivity
 
     private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
 
+    private static final int EXPRESSIVE_BACK_ICON =
+            com.android.settingslib.collapsingtoolbar.R.drawable.settingslib_expressive_icon_back;
+
     private String mFragmentClass;
     private String mHighlightMenuKey;
 
@@ -301,10 +305,17 @@ public class SettingsActivity extends SettingsBaseActivity
         // If this is in setup flow, don't apply theme. Because light theme needs to be applied
         // in SettingsBaseActivity#onCreate().
         if (isSubSettings(intent) && !WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            setTheme(R.style.Theme_SubSettings);
+            int themeId = SettingsThemeHelper.isExpressiveTheme(this)
+                    ? R.style.Theme_SubSettings_Expressive : R.style.Theme_SubSettings;
+            setTheme(themeId);
         }
 
         setContentView(R.layout.settings_main_prefs);
+        mMainSwitch = findViewById(R.id.switch_bar);
+        if (mMainSwitch != null) {
+            mMainSwitch.setMetricsCategory(lookupMetricsCategory());
+            mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
+        }
 
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
@@ -324,12 +335,6 @@ public class SettingsActivity extends SettingsBaseActivity
             launchSettingFragment(initialFragmentName, intent);
         }
 
-        mMainSwitch = findViewById(R.id.switch_bar);
-        if (mMainSwitch != null) {
-            mMainSwitch.setMetricsCategory(lookupMetricsCategory());
-            mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
-        }
-
         // see if we should show Back/Next buttons
         if (intent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)) {
 
@@ -388,6 +393,9 @@ public class SettingsActivity extends SettingsBaseActivity
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(isActionBarButtonEnabled);
             actionBar.setHomeButtonEnabled(isActionBarButtonEnabled);
+            if (SettingsThemeHelper.isExpressiveTheme(this)) {
+                actionBar.setHomeAsUpIndicator(EXPRESSIVE_BACK_ICON);
+            }
             actionBar.setDisplayShowTitleEnabled(true);
         }
     }
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index b1177dd2d87..99d3d922a0c 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -24,6 +24,7 @@ import android.hardware.fingerprint.FingerprintManager;
 import android.net.Uri;
 import android.provider.Settings;
 import android.util.FeatureFlagUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -45,6 +46,7 @@ import com.android.settingslib.datastore.BackupRestoreStorageManager;
 import com.android.settingslib.metadata.PreferenceScreenMetadata;
 import com.android.settingslib.metadata.PreferenceScreenRegistry;
 import com.android.settingslib.metadata.ProvidePreferenceScreenOptions;
+import com.android.settingslib.preference.PreferenceBindingFactory;
 import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -58,8 +60,9 @@ import java.util.List;
 )
 public class SettingsApplication extends Application {
 
+    private static final String TAG = "SettingsApplication";
     private WeakReference<SettingsHomepageActivity> mHomeActivity = new WeakReference<>(null);
-    @Nullable private BiometricsEnvironment mBiometricsEnvironment;
+    @Nullable volatile private BiometricsEnvironment mBiometricsEnvironment;
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -74,6 +77,7 @@ public class SettingsApplication extends Application {
         if (Flags.catalyst()) {
             PreferenceScreenRegistry.INSTANCE.setPreferenceScreensSupplier(
                     this::getPreferenceScreens);
+            PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());
         }
 
         BackupRestoreStorageManager.getInstance(this)
@@ -138,20 +142,23 @@ public class SettingsApplication extends Application {
 
     @Nullable
     public BiometricsEnvironment getBiometricEnvironment() {
-        if (Flags.fingerprintV2Enrollment()) {
-            if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-                final FingerprintManager fpm = getSystemService(FingerprintManager.class);
-                if (mBiometricsEnvironment == null) {
-                    mBiometricsEnvironment = new BiometricsEnvironment(this, fpm);
+        BiometricsEnvironment localEnvironment = mBiometricsEnvironment;
+        if (localEnvironment == null) {
+            synchronized (this) {
+                if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+                    return null;
+                }
+                final FingerprintManager fpm = getSystemService(FingerprintManager.class);
+                localEnvironment = mBiometricsEnvironment;
+                if (fpm != null && localEnvironment == null) {
+                    mBiometricsEnvironment = localEnvironment = new BiometricsEnvironment(this,
+                            fpm);
+                } else {
+                    Log.e(TAG, "Error when creating environment, fingerprint manager was null");
                 }
-                return  mBiometricsEnvironment;
-
-            } else {
-                return null;
             }
-
         }
-        return null;
+        return localEnvironment;
     }
 
     @Override
diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index 4887e26940c..254ef8c8b1a 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -39,6 +39,7 @@ import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.activityembedding.ActivityEmbeddingUtils;
+import com.android.settings.core.instrumentation.ElapsedTimeUtils;
 import com.android.settings.homepage.DeepLinkHomepageActivity;
 import com.android.settings.search.SearchStateReceiver;
 import com.android.settingslib.utils.ThreadUtils;
@@ -69,6 +70,7 @@ public class SettingsInitialize extends BroadcastReceiver {
         webviewSettingSetup(context, pm, userInfo);
         ThreadUtils.postOnBackgroundThread(() -> refreshExistingShortcuts(context));
         enableTwoPaneDeepLinkActivityIfNecessary(pm, context);
+        storeSuwCompleteTimestamp(context, broadcast);
     }
 
     private void managedProfileSetup(Context context, final PackageManager pm, Intent broadcast,
@@ -161,4 +163,10 @@ public class SettingsInitialize extends BroadcastReceiver {
         pm.setComponentEnabledSetting(searchStateReceiver, enableState,
                 PackageManager.DONT_KILL_APP);
     }
+
+    private void storeSuwCompleteTimestamp(Context context, Intent broadcast) {
+        if (SetupWizardUtils.ACTION_SETUP_WIZARD_FINISHED.equals(broadcast.getAction())) {
+            ElapsedTimeUtils.storeSuwFinishedTimestamp(context, System.currentTimeMillis());
+        }
+    }
 }
diff --git a/src/com/android/settings/SettingsPreferenceBindingFactory.kt b/src/com/android/settings/SettingsPreferenceBindingFactory.kt
new file mode 100644
index 00000000000..b0fa4d98d7b
--- /dev/null
+++ b/src/com/android/settings/SettingsPreferenceBindingFactory.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.preference.Preference
+import com.android.settingslib.RestrictedPreferenceHelperProvider
+import com.android.settingslib.metadata.PreferenceHierarchyNode
+import com.android.settingslib.preference.DefaultPreferenceBindingFactory
+import com.android.settingslib.preference.PreferenceBinding
+
+/** Preference binding factory for settings app. */
+class SettingsPreferenceBindingFactory : DefaultPreferenceBindingFactory() {
+    override fun bind(
+        preference: Preference,
+        node: PreferenceHierarchyNode,
+        preferenceBinding: PreferenceBinding?,
+    ) {
+        super.bind(preference, node, preferenceBinding)
+
+        // handle restriction consistently
+        val metadata = node.metadata
+        if (metadata is PreferenceRestrictionMixin) {
+            if (preference is RestrictedPreferenceHelperProvider) {
+                preference.getRestrictedPreferenceHelper().apply {
+                    useAdminDisabledSummary(metadata.useAdminDisabledSummary)
+                    val context = preference.context
+                    val restrictionKeys = metadata.restrictionKeys
+                    if (!context.hasBaseUserRestriction(restrictionKeys)) {
+                        setDisabledByAdmin(context.getRestrictionEnforcedAdmin(restrictionKeys))
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 66397c0e66f..363d601d0d1 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -16,6 +16,9 @@
 
 package com.android.settings;
 
+import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+import static com.android.settingslib.media.PhoneMediaDevice.isDesktop;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
@@ -33,6 +36,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.XmlRes;
 import androidx.fragment.app.DialogFragment;
@@ -45,12 +50,14 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.flags.Flags;
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.widget.HighlightablePreferenceGroupAdapter;
 import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.CustomDialogPreferenceCompat;
 import com.android.settingslib.CustomEditTextPreferenceCompat;
 import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.preference.PreferenceScreenCreator;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.widget.LayoutPreference;
 
@@ -173,6 +180,31 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         }
     }
 
+    @Override
+    protected final int getPreferenceScreenResId(@NonNull Context context) {
+        return getPreferenceScreenResId();
+    }
+
+    /** Returns if catalyst is enabled on current screen. */
+    public final boolean isCatalystEnabled() {
+        // TODO(b/379130874): make Catalyst compatible with desktop device, such as user restriction
+        // check.
+        Context context = getContext();
+        if (context != null && isDesktop(context)) {
+            return false;
+        }
+
+        return getPreferenceScreenCreator() != null;
+    }
+
+    protected @Nullable PreferenceScreenCreator getPreferenceScreenCreator() {
+        if (!Flags.catalyst()) {
+            return null;
+        }
+        Context context = getContext();
+        return context != null ? getPreferenceScreenCreator(context) : null;
+    }
+
     public View setPinnedHeaderView(int layoutResId) {
         final LayoutInflater inflater = getActivity().getLayoutInflater();
         final View pinnedHeader =
@@ -367,9 +399,13 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
     @Override
     protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
         final Bundle arguments = getArguments();
-        mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen,
-                arguments == null
-                        ? null : arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),
+        String key = arguments == null ? null : arguments.getString(EXTRA_FRAGMENT_ARG_KEY);
+        if (Flags.catalyst() && key == null) {
+            Activity activity = getActivity();
+            Intent intent = activity != null ? activity.getIntent() : null;
+            key = intent != null ? intent.getStringExtra(EXTRA_FRAGMENT_ARG_KEY) : null;
+        }
+        mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen, key,
                 mPreferenceHighlighted);
         return mAdapter;
     }
diff --git a/src/com/android/settings/SettingsService.kt b/src/com/android/settings/SettingsService.kt
new file mode 100644
index 00000000000..70713c3c35c
--- /dev/null
+++ b/src/com/android/settings/SettingsService.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Application
+import android.content.Intent
+import com.android.settings.flags.Flags
+import com.android.settingslib.graph.PreferenceGetterRequest
+import com.android.settingslib.graph.PreferenceSetterRequest
+import com.android.settingslib.ipc.ApiPermissionChecker
+import com.android.settingslib.service.PreferenceService
+
+/** Service to expose settings APIs. */
+class SettingsService :
+    PreferenceService(
+        graphPermissionChecker = ApiPermissionChecker.alwaysAllow(),
+        setterPermissionChecker = SetterPermissionChecker(),
+        getterPermissionChecker = GetterPermissionChecker(),
+    ) {
+
+    override fun onBind(intent: Intent) =
+        if (Flags.catalystService()) super.onBind(intent) else null
+}
+
+/** Permission checker for external setter API. */
+private class SetterPermissionChecker : ApiPermissionChecker<PreferenceSetterRequest> {
+
+    override fun hasPermission(
+        application: Application,
+        myUid: Int,
+        callingUid: Int,
+        request: PreferenceSetterRequest,
+    ) = true
+}
+
+/** Permission checker for external getter API. */
+private class GetterPermissionChecker : ApiPermissionChecker<PreferenceGetterRequest> {
+
+    override fun hasPermission(
+        application: Application,
+        myUid: Int,
+        callingUid: Int,
+        request: PreferenceGetterRequest,
+    ) = true
+}
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 25e91598f3b..57adeee895d 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -32,6 +32,9 @@ import java.util.Arrays;
 
 public class SetupWizardUtils {
 
+    public static final String ACTION_SETUP_WIZARD_FINISHED =
+            "com.google.android.setupwizard.SETUP_WIZARD_FINISHED";
+
     public static String getThemeString(Intent intent) {
         String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
         if (theme == null) {
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 495065023e4..210543ff07f 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -291,23 +291,23 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment
             // Certificates can be installed into SYSTEM_UID or WIFI_UID through CertInstaller.
             final int myUserId = UserHandle.myUserId();
             final int systemUid = UserHandle.getUid(myUserId, Process.SYSTEM_UID);
-            final int wifiUid = UserHandle.getUid(myUserId, Process.WIFI_UID);
-
             try {
                 KeyStore processKeystore = KeyStore.getInstance(KEYSTORE_PROVIDER);
                 processKeystore.load(null);
                 KeyStore wifiKeystore = null;
-                if (myUserId == 0) {
-                    wifiKeystore = KeyStore.getInstance(KEYSTORE_PROVIDER);
-                    wifiKeystore.load(new AndroidKeyStoreLoadStoreParameter(
-                            KeyProperties.NAMESPACE_WIFI));
-                }
 
                 List<Credential> credentials = new ArrayList<>();
                 credentials.addAll(getCredentialsForUid(processKeystore, systemUid).values());
-                if (wifiKeystore != null) {
-                    credentials.addAll(getCredentialsForUid(wifiKeystore, wifiUid).values());
+
+                UserManager userManager = getContext().getSystemService(UserManager.class);
+                if (userManager.isAdminUser()) {
+                    wifiKeystore = KeyStore.getInstance(KEYSTORE_PROVIDER);
+                    wifiKeystore.load(
+                        new AndroidKeyStoreLoadStoreParameter(KeyProperties.NAMESPACE_WIFI));
+                    credentials.addAll(
+                            getCredentialsForUid(wifiKeystore, Process.WIFI_UID).values());
                 }
+
                 return credentials;
             } catch (Exception e) {
                 throw new RuntimeException("Failed to load credentials from Keystore.", e);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a9144ead6b7..c8011ee0fb1 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -131,6 +131,7 @@ import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settingslib.widget.ActionBarShadowController;
 import com.android.settingslib.widget.AdaptiveIcon;
 
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -1180,9 +1181,9 @@ public final class Utils extends com.android.settingslib.Utils {
         try {
             return context.getPackageManager().getApplicationInfo(packageName, 0).enabled;
         } catch (Exception e) {
-            Log.e(TAG, "Error while retrieving application info for package " + packageName, e);
+            // Expected, package is not installed or not enabled.
+            return false;
         }
-        return false;
     }
 
     /** Get {@link Resources} by subscription id if subscription id is valid. */
@@ -1329,8 +1330,7 @@ public final class Utils extends com.android.settingslib.Utils {
      */
     @ColorInt
     public static int getHomepageIconColor(Context context) {
-        return getColorAttrDefaultColor(
-                context, com.android.internal.R.attr.materialColorOnSurface);
+        return context.getColor(com.android.internal.R.color.materialColorOnSurface);
     }
 
     /**
@@ -1516,13 +1516,13 @@ public final class Utils extends com.android.settingslib.Utils {
             final UserManager userManager = context.getSystemService(
                     UserManager.class);
             final int status = biometricManager.canAuthenticate(getEffectiveUserId(
-                    userManager, userId), BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+                    userManager, userId), BiometricManager.Authenticators.IDENTITY_CHECK);
             switch(status) {
                 case BiometricManager.BIOMETRIC_SUCCESS:
                     return BiometricStatus.OK;
                 case BiometricManager.BIOMETRIC_ERROR_LOCKOUT:
                     return BiometricStatus.LOCKOUT;
-                case BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE:
+                case BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE:
                 case BiometricManager.BIOMETRIC_ERROR_NOT_ENABLED_FOR_APPS:
                     return BiometricStatus.NOT_ACTIVE;
                 default:
@@ -1582,7 +1582,7 @@ public final class Utils extends com.android.settingslib.Utils {
         final Intent intent = new Intent();
         if (android.hardware.biometrics.Flags.mandatoryBiometrics()) {
             intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,
-                    BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+                    BiometricManager.Authenticators.IDENTITY_CHECK);
         }
         intent.putExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT,
                 resources.getString(R.string.cancel));
@@ -1600,4 +1600,19 @@ public final class Utils extends com.android.settingslib.Utils {
         pm.setComponentEnabledSetting(componentName,
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
     }
+
+    /**
+     * Returns {@code true} if the supplied package is a protected package. Otherwise, returns
+     * {@code false}.
+     *
+     * @param context the context
+     * @param packageName the package name
+     */
+    public static boolean isProtectedPackage(
+            @NonNull Context context, @NonNull String packageName) {
+        final List<String> protectedPackageNames = Arrays.asList(context.getResources()
+                .getStringArray(com.android.internal.R.array
+                        .config_biometric_protected_package_names));
+        return protectedPackageNames != null && protectedPackageNames.contains(packageName);
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java b/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
index 6eb2112d294..7713e1408b6 100644
--- a/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragment.java
@@ -19,12 +19,18 @@ package com.android.settings.accessibility;
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
 
 /** Settings fragment containing bluetooth audio routing. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class AccessibilityAudioRoutingFragment extends RestrictedDashboardFragment {
     private static final String TAG = "AccessibilityAudioRoutingFragment";
 
@@ -47,6 +53,25 @@ public class AccessibilityAudioRoutingFragment extends RestrictedDashboardFragme
         return TAG;
     }
 
+    @VisibleForTesting
+    static boolean isPageSearchEnabled(Context context) {
+        if (!FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_AUDIO_ROUTING)) {
+            return false;
+        }
+
+        final HearingAidHelper mHelper = new HearingAidHelper(context);
+        return mHelper.isHearingAidSupported();
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_audio_routing_fragment);
+            new BaseSearchIndexProvider(R.xml.accessibility_audio_routing_fragment) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    if (Flags.fixA11ySettingsSearch()) {
+                        return AccessibilityAudioRoutingFragment.isPageSearchEnabled(context);
+                    } else {
+                        return super.isPageSearchEnabled(context);
+                    }
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
index bd46152066a..60c7c877c5d 100644
--- a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
@@ -49,9 +49,14 @@ public class AccessibilityButtonFooterPreferenceController extends
     public void displayPreference(PreferenceScreen screen) {
         // Need to update footerPreference's data before super.displayPreference(), then it will use
         // data to update related property of footerPreference.
-        final int titleResource = AccessibilityUtil.isGestureNavigateEnabled(mContext)
-                ? R.string.accessibility_button_gesture_description
-                : R.string.accessibility_button_description;
+        final int titleResource;
+        if (android.provider.Flags.a11yStandaloneGestureEnabled()) {
+            titleResource = R.string.accessibility_button_description;
+        } else {
+            titleResource = AccessibilityUtil.isGestureNavigateEnabled(mContext)
+                    ? R.string.accessibility_button_gesture_description
+                    : R.string.accessibility_button_description;
+        }
         final CharSequence footerText = Html.fromHtml(
                 MessageFormat.format(mContext.getString(titleResource), 1, 2, 3),
                 Html.FROM_HTML_MODE_COMPACT);
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
index 53d9c55fad9..68a765c9230 100644
--- a/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
@@ -61,7 +61,12 @@ public class AccessibilityButtonPreferenceController extends BasePreferenceContr
     }
 
     private int getPreferenceTitleResource() {
-        return AccessibilityUtil.isGestureNavigateEnabled(mContext)
-                ? R.string.accessibility_button_gesture_title : R.string.accessibility_button_title;
+        if (android.provider.Flags.a11yStandaloneGestureEnabled()) {
+            return R.string.accessibility_button_title;
+        } else {
+            return AccessibilityUtil.isGestureNavigateEnabled(mContext)
+                    ? R.string.accessibility_button_gesture_title
+                    : R.string.accessibility_button_title;
+        }
     }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
index 0f551b0fa1f..09e2d97e48b 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
@@ -26,6 +26,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceCategory;
 
 import com.android.internal.accessibility.AccessibilityShortcutController;
@@ -118,6 +119,21 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe
         return getText(R.string.accessibility_hearing_device_shortcut_title);
     }
 
+    @VisibleForTesting
+    static boolean isPageSearchEnabled(Context context) {
+        final HearingAidHelper mHelper = new HearingAidHelper(context);
+        return mHelper.isHearingAidSupported();
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_hearing_aids);
+            new BaseSearchIndexProvider(R.xml.accessibility_hearing_aids) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    if (Flags.fixA11ySettingsSearch()) {
+                        return AccessibilityHearingAidsFragment.isPageSearchEnabled(context);
+                    } else {
+                        return super.isPageSearchEnabled(context);
+                    }
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
deleted file mode 100644
index 8a3f22d807a..00000000000
--- a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Bundle;
-import android.os.Handler;
-
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnCreate;
-import com.android.settingslib.core.lifecycle.events.OnDestroy;
-import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-
-/** PrimarySwitchPreferenceController that shows quick settings tooltip on first use. */
-public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceController
-        extends TogglePreferenceController
-        implements LifecycleObserver, OnCreate, OnDestroy, OnSaveInstanceState {
-    private static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow";
-    private final Handler mHandler;
-    private PrimarySwitchPreference mPreference;
-    private AccessibilityQuickSettingsTooltipWindow mTooltipWindow;
-    private boolean mNeedsQSTooltipReshow = false;
-
-    /** Returns the accessibility tile component name. */
-    @Nullable
-    abstract ComponentName getTileComponentName();
-
-    /** Returns the accessibility tile tooltip content. */
-    abstract CharSequence getTileTooltipContent();
-
-    public AccessibilityQuickSettingsPrimarySwitchPreferenceController(Context context,
-            String preferenceKey) {
-        super(context, preferenceKey);
-        mHandler = new Handler(context.getMainLooper());
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        // Restore the tooltip.
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) {
-                mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW);
-            }
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        mHandler.removeCallbacksAndMessages(null);
-        final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
-        if (isTooltipWindowShowing) {
-            mTooltipWindow.dismiss();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
-        if (mNeedsQSTooltipReshow || isTooltipWindowShowing) {
-            outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true);
-        }
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-        if (mNeedsQSTooltipReshow) {
-            mHandler.post(this::showQuickSettingsTooltipIfNeeded);
-        }
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        if (isChecked) {
-            showQuickSettingsTooltipIfNeeded();
-        }
-        return isChecked;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return false;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return R.string.menu_key_accessibility;
-    }
-
-    private void showQuickSettingsTooltipIfNeeded() {
-        if (mPreference == null) {
-            // Returns if no preference found by slice highlight menu.
-            return;
-        }
-
-        final ComponentName tileComponentName = getTileComponentName();
-        if (tileComponentName == null) {
-            // Returns if no tile service assigned.
-            return;
-        }
-
-        if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences(
-                mContext, tileComponentName)) {
-            // Returns if quick settings tooltip only show once.
-            return;
-        }
-
-        // TODO (287728819): Move tooltip showing to SystemUI
-        // Since the lifecycle of controller is independent of that of the preference, doing
-        // null check on switch is a temporary solution for the case that switch view
-        // is not ready when we would like to show the tooltip.  If the switch is not ready,
-        // we give up showing the tooltip and also do not reshow it in the future.
-        if (mPreference.getSwitch() != null) {
-            mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext);
-            mTooltipWindow.setup(getTileTooltipContent(),
-                    R.drawable.accessibility_auto_added_qs_tooltip_illustration);
-            mTooltipWindow.showAtTopCenter(mPreference.getSwitch());
-        }
-        AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName);
-        mNeedsQSTooltipReshow = false;
-    }
-}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 7e173690e9b..6f0ef9e70cb 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -30,7 +30,6 @@ import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArrayMap;
-import android.view.InputDevice;
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.NonNull;
@@ -44,7 +43,6 @@ import com.android.internal.content.PackageMonitor;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.RestrictedPreference;
@@ -72,14 +70,12 @@ public class AccessibilitySettings extends DashboardFragment implements
     private static final String CATEGORY_DISPLAY = "display_category";
     @VisibleForTesting
     static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
-    private static final String CATEGORY_KEYBOARD_OPTIONS = "physical_keyboard_options_category";
     @VisibleForTesting
     static final String CATEGORY_INTERACTION_CONTROL = "interaction_control_category";
 
     private static final String[] CATEGORIES = new String[]{
             CATEGORY_SCREEN_READER, CATEGORY_CAPTIONS, CATEGORY_AUDIO, CATEGORY_DISPLAY,
-            CATEGORY_SPEECH, CATEGORY_INTERACTION_CONTROL,
-            CATEGORY_KEYBOARD_OPTIONS, CATEGORY_DOWNLOADED_SERVICES
+            CATEGORY_SPEECH, CATEGORY_INTERACTION_CONTROL, CATEGORY_DOWNLOADED_SERVICES
     };
 
     // Extras passed to sub-fragments.
@@ -181,9 +177,7 @@ public class AccessibilitySettings extends DashboardFragment implements
         // Observe changes from accessibility selection menu
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
-        }
+        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_STICKY_KEYS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SLOW_KEYS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS);
@@ -272,7 +266,7 @@ public class AccessibilitySettings extends DashboardFragment implements
      * @return The service summary
      */
     public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info,
-                                                 boolean serviceEnabled) {
+            boolean serviceEnabled) {
         if (serviceEnabled && info.crashed) {
             return context.getText(R.string.accessibility_summary_state_stopped);
         }
@@ -413,10 +407,8 @@ public class AccessibilitySettings extends DashboardFragment implements
         final List<RestrictedPreference> preferenceList = getInstalledAccessibilityPreferences(
                 getPrefContext(), installedShortcutList, installedServiceList);
 
-        if (Flags.checkPrebundledIsPreinstalled()) {
-            removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
-                    installedShortcutList, installedServiceList);
-        }
+        removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
+                installedShortcutList, installedServiceList);
 
         final PreferenceCategory downloadedServicesCategory =
                 mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);
@@ -458,7 +450,6 @@ public class AccessibilitySettings extends DashboardFragment implements
         // Hide category if it is empty.
         updatePreferenceCategoryVisibility(CATEGORY_SCREEN_READER);
         updatePreferenceCategoryVisibility(CATEGORY_SPEECH);
-        updatePreferenceCategoryVisibility(CATEGORY_KEYBOARD_OPTIONS);
     }
 
     /**
@@ -548,9 +539,7 @@ public class AccessibilitySettings extends DashboardFragment implements
     /**
      * Updates preferences related to system configurations.
      */
-    protected void updateSystemPreferences() {
-        updateKeyboardPreferencesVisibility();
-    }
+    protected void updateSystemPreferences() {}
 
     private void updatePreferencesState() {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
@@ -559,53 +548,6 @@ public class AccessibilitySettings extends DashboardFragment implements
                 findPreference(controller.getPreferenceKey())));
     }
 
-    private void updateKeyboardPreferencesVisibility() {
-        if (!mCategoryToPrefCategoryMap.containsKey(CATEGORY_KEYBOARD_OPTIONS)) {
-            return;
-        }
-        boolean isVisible = isAnyHardKeyboardsExist()
-                && isAnyKeyboardPreferenceAvailable();
-        mCategoryToPrefCategoryMap.get(CATEGORY_KEYBOARD_OPTIONS).setVisible(
-                isVisible);
-        if (isVisible) {
-            //set summary here.
-            findPreference(KeyboardBounceKeyPreferenceController.PREF_KEY).setSummary(
-                    getContext().getString(R.string.bounce_keys_summary,
-                            PhysicalKeyboardFragment.BOUNCE_KEYS_THRESHOLD));
-            findPreference(KeyboardSlowKeyPreferenceController.PREF_KEY).setSummary(
-                    getContext().getString(R.string.slow_keys_summary,
-                            PhysicalKeyboardFragment.SLOW_KEYS_THRESHOLD));
-        }
-    }
-
-    static boolean isAnyHardKeyboardsExist() {
-        for (int deviceId : InputDevice.getDeviceIds()) {
-            final InputDevice device = InputDevice.getDevice(deviceId);
-            if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean isAnyKeyboardPreferenceAvailable() {
-        for (List<AbstractPreferenceController> controllerList : getPreferenceControllers()) {
-            for (AbstractPreferenceController controller : controllerList) {
-                if (controller.getPreferenceKey().equals(
-                        KeyboardBounceKeyPreferenceController.PREF_KEY)
-                        || controller.getPreferenceKey().equals(
-                        KeyboardSlowKeyPreferenceController.PREF_KEY)
-                        || controller.getPreferenceKey().equals(
-                        KeyboardStickyKeyPreferenceController.PREF_KEY)) {
-                    if (controller.isAvailable()) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_settings) {
                 @Override
@@ -663,10 +605,12 @@ public class AccessibilitySettings extends DashboardFragment implements
             };
 
     @Override
-    public void onInputDeviceAdded(int deviceId) {}
+    public void onInputDeviceAdded(int deviceId) {
+    }
 
     @Override
-    public void onInputDeviceRemoved(int deviceId) {}
+    public void onInputDeviceRemoved(int deviceId) {
+    }
 
     @Override
     public void onInputDeviceChanged(int deviceId) {
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index 447e34edd40..11cbd1678b3 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -41,8 +41,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.display.BrightnessLevelPreferenceController;
+import com.android.settings.display.BrightnessLevelPreferenceControllerForSetupWizard;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -168,16 +167,10 @@ public class AccessibilitySettingsForSetupWizard extends DashboardFragment
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        // Requires lifecycle, so added programmatically (normally via resId).
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        BrightnessLevelPreferenceController brightnessLevelPreferenceController =
-                new BrightnessLevelPreferenceController(context, getSettingsLifecycle());
-        brightnessLevelPreferenceController.setInSetupWizard(true);
-        controllers.add(brightnessLevelPreferenceController);
-        String autoBrightnessKey = context.getString(R.string.preference_key_auto_brightness);
-        AutoBrightnessPreferenceController autoBrightnessPreferenceController =
-                new AutoBrightnessPreferenceController(context, autoBrightnessKey);
-        autoBrightnessPreferenceController.setInSetupWizard(true);
-        controllers.add(autoBrightnessPreferenceController);
+        controllers.add(new BrightnessLevelPreferenceControllerForSetupWizard(
+                context, getSettingsLifecycle()));
         return controllers;
     }
 
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index e92c86b32b0..23c3fd4ebb6 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -17,24 +17,21 @@
 package com.android.settings.accessibility;
 
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
 import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
+import static com.android.settings.accessibility.AccessibilityUtil.getShortcutSummaryList;
 import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_GENERAL_CATEGORY;
 import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_QS_TOOLTIP_TYPE;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.icu.text.CaseMap;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,18 +43,16 @@ import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
-import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
-import com.android.settings.utils.LocaleUtils;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Set;
 
 /**
  * Base class for accessibility fragments shortcut functions and dialog management.
@@ -120,9 +115,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
         final List<String> shortcutFeatureKeys = new ArrayList<>();
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
-        }
+        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
         mSettingsContentObserver = new AccessibilitySettingsContentObserver(new Handler());
         mSettingsContentObserver.registerKeysToObserverCallback(shortcutFeatureKeys, key -> {
             updateShortcutPreferenceData();
@@ -241,6 +234,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
         );
     }
 
+    @SuppressLint("MissingPermission")
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
         if (getComponentName() == null) {
@@ -248,13 +242,12 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
         }
 
         final int shortcutTypes = getUserPreferredShortcutTypes();
-        if (preference.isChecked()) {
-            AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
-                    getComponentName());
+        final boolean isChecked = preference.isChecked();
+        getPrefContext().getSystemService(AccessibilityManager.class).enableShortcutsForTargets(
+                isChecked, shortcutTypes,
+                Set.of(getComponentName().flattenToString()), getPrefContext().getUserId());
+        if (isChecked) {
             showDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
-        } else {
-            AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), shortcutTypes,
-                    getComponentName());
         }
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
@@ -340,37 +333,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
         }
 
         final int shortcutTypes = getUserPreferredShortcutTypes();
-
-        // LINT.IfChange(shortcut_type_ui_order)
-        final List<CharSequence> list = new ArrayList<>();
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (hasShortcutType(shortcutTypes, QUICK_SETTINGS)) {
-                final CharSequence qsTitle = context.getText(
-                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
-                list.add(qsTitle);
-            }
-        }
-        if (hasShortcutType(shortcutTypes, SOFTWARE)) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-        if (hasShortcutType(shortcutTypes, HARDWARE)) {
-            final CharSequence hardwareTitle = context.getText(
-                    R.string.accessibility_shortcut_hardware_keyword);
-            list.add(hardwareTitle);
-        }
-        // LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
-
-        // Show software shortcut if first time to use.
-        if (list.isEmpty()) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-
-        return CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(), /* iter= */
-                null, LocaleUtils.getConcatenatedString(list));
-    }
-
-    private boolean hasShortcutType(int value, @UserShortcutType int type) {
-        return (value & type) == type;
+        return getShortcutSummaryList(context, shortcutTypes);
     }
 
     protected void updateShortcutPreferenceData() {
@@ -410,38 +373,13 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
         showQuickSettingsTooltipIfNeeded();
     }
 
+    /**
+     * @deprecated made obsolete by quick settings rollout.
+     *
+     * (TODO 367414968: finish removal.)
+     */
+    @Deprecated
     private void showQuickSettingsTooltipIfNeeded() {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            // Don't show Quick Settings tooltip
-            return;
-        }
-        final ComponentName tileComponentName = getTileComponentName();
-        if (tileComponentName == null) {
-            // Returns if no tile service assigned.
-            return;
-        }
-
-        if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences(
-                getContext(), tileComponentName)) {
-            // Returns if quick settings tooltip only show once.
-            return;
-        }
-
-        final CharSequence content = getTileTooltipContent(mNeedsQSTooltipType);
-        if (TextUtils.isEmpty(content)) {
-            // Returns if no content of tile tooltip assigned.
-            return;
-        }
-
-        final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.drawable.accessibility_qs_tooltip_illustration
-                : R.drawable.accessibility_auto_added_qs_tooltip_illustration;
-        mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext());
-        mTooltipWindow.setup(content, imageResId);
-        mTooltipWindow.showAtTopCenter(getView());
-        AccessibilityQuickSettingUtils.optInValueToSharedPreferences(getContext(),
-                tileComponentName);
-        mNeedsQSTooltipReshow = false;
     }
 
     /**
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
index 8d908acc1b5..03b70e5eead 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
@@ -16,15 +16,19 @@
 
 package com.android.settings.accessibility;
 
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.GESTURE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TRIPLETAP;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
 
+import android.annotation.SuppressLint;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -60,14 +64,14 @@ import androidx.core.widget.TextViewCompat;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.android.server.accessibility.Flags;
+import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
+import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.widget.LottieColorUtils;
 
 import com.airbnb.lottie.LottieAnimationView;
-import com.airbnb.lottie.LottieDrawable;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -330,7 +334,8 @@ public final class AccessibilityShortcutsTutorial {
                 result -> Log.w(TAG, "Invalid image raw resource id: " + imageRawRes,
                         result));
         lottieView.setAnimation(imageRawRes);
-        lottieView.setRepeatCount(LottieDrawable.INFINITE);
+        // Follow the Motion Stoppable requirement by using a finite animation.
+        lottieView.setRepeatCount(0);
         LottieColorUtils.applyDynamicColors(context, lottieView);
         lottieView.playAnimation();
 
@@ -396,95 +401,84 @@ public final class AccessibilityShortcutsTutorial {
         return textView;
     }
 
-    private static TutorialPage createSoftwareTutorialPage(@NonNull Context context) {
-        final int type = SOFTWARE;
-        final CharSequence title = getSoftwareTitle(context);
-        final View image = createSoftwareImage(context);
-        final CharSequence instruction = getSoftwareInstruction(context);
-        final ImageView indicatorIcon =
-                createImageView(context, R.drawable.ic_accessibility_page_indicator);
-        indicatorIcon.setEnabled(false);
-
-        return new TutorialPage(type, title, image, indicatorIcon, instruction);
+    @SuppressLint("SwitchIntDef")
+    private static CharSequence getShortcutTitle(
+            @NonNull Context context, @UserShortcutType int shortcutType, int buttonMode) {
+        return switch (shortcutType) {
+            case HARDWARE -> context.getText(R.string.accessibility_tutorial_dialog_title_volume);
+            case SOFTWARE -> getSoftwareTitle(context, buttonMode);
+            case GESTURE -> context.getText(R.string.accessibility_tutorial_dialog_title_gesture);
+            case TRIPLETAP -> context.getText(R.string.accessibility_tutorial_dialog_title_triple);
+            case TWOFINGER_DOUBLETAP -> context.getString(
+                    R.string.accessibility_tutorial_dialog_title_two_finger_double, 2);
+            case QUICK_SETTINGS -> context.getText(
+                    R.string.accessibility_tutorial_dialog_title_quick_setting);
+            default -> "";
+        };
     }
 
-    private static TutorialPage createHardwareTutorialPage(@NonNull Context context) {
-        final int type = HARDWARE;
-        final CharSequence title =
-                context.getText(R.string.accessibility_tutorial_dialog_title_volume);
-        final View image =
-                createIllustrationView(context, R.drawable.accessibility_shortcut_type_volume_keys);
-        final ImageView indicatorIcon =
-                createImageView(context, R.drawable.ic_accessibility_page_indicator);
-        final CharSequence instruction =
-                context.getText(R.string.accessibility_tutorial_dialog_message_volume);
-        indicatorIcon.setEnabled(false);
-
-        return new TutorialPage(type, title, image, indicatorIcon, instruction);
-    }
-
-    private static TutorialPage createTripleTapTutorialPage(@NonNull Context context) {
-        final int type = TRIPLETAP;
-        final CharSequence title =
-                context.getText(R.string.accessibility_tutorial_dialog_title_triple);
-        final View image =
-                createIllustrationViewWithImageRawResource(context,
-                        R.raw.accessibility_shortcut_type_tripletap);
-        final CharSequence instruction = context.getString(
-                R.string.accessibility_tutorial_dialog_tripletap_instruction, 3);
-        final ImageView indicatorIcon =
-                createImageView(context, R.drawable.ic_accessibility_page_indicator);
-        indicatorIcon.setEnabled(false);
-
-        return new TutorialPage(type, title, image, indicatorIcon, instruction);
-    }
-
-    private static TutorialPage createTwoFingerTripleTapTutorialPage(@NonNull Context context) {
-        final int type = TWOFINGER_DOUBLETAP;
-        final int numFingers = 2;
-        final CharSequence title = context.getString(
-                R.string.accessibility_tutorial_dialog_title_two_finger_double, numFingers);
-        final View image =
-                createIllustrationViewWithImageRawResource(context,
-                        R.raw.accessibility_shortcut_type_2finger_doubletap);
-        final CharSequence instruction = context.getString(
-                R.string.accessibility_tutorial_dialog_twofinger_doubletap_instruction, numFingers);
-        final ImageView indicatorIcon =
-                createImageView(context, R.drawable.ic_accessibility_page_indicator);
-        indicatorIcon.setEnabled(false);
-
-        return new TutorialPage(type, title, image, indicatorIcon, instruction);
-    }
-
-    private static TutorialPage createQuickSettingsTutorialPage(
-            @NonNull Context context, @NonNull CharSequence featureName, boolean inSetupWizard) {
-        final int type = QUICK_SETTINGS;
-        final CharSequence title =
-                context.getText(R.string.accessibility_tutorial_dialog_title_quick_setting);
-        final View image =
-                createIllustrationView(context,
+    @SuppressLint("SwitchIntDef")
+    private static View getShortcutImage(
+            @NonNull Context context, @UserShortcutType int shortcutType, int buttonMode) {
+        return switch (shortcutType) {
+            case HARDWARE -> createIllustrationView(
+                    context, R.drawable.accessibility_shortcut_type_volume_keys);
+            case SOFTWARE -> createSoftwareImage(context, buttonMode);
+            case GESTURE -> createIllustrationView(context,
+                    AccessibilityUtil.isTouchExploreEnabled(context)
+                            ? R.drawable.accessibility_shortcut_type_gesture_touch_explore_on
+                            : R.drawable.accessibility_shortcut_type_gesture);
+            case TRIPLETAP -> createIllustrationViewWithImageRawResource(context,
+                    R.raw.accessibility_shortcut_type_tripletap);
+            case TWOFINGER_DOUBLETAP -> createIllustrationViewWithImageRawResource(context,
+                    R.raw.accessibility_shortcut_type_2finger_doubletap);
+            case QUICK_SETTINGS -> {
+                View v = createIllustrationView(context,
                         R.drawable.accessibility_shortcut_type_quick_settings);
-        // Remove the unneeded background, since the main image already includes a background
-        image.findViewById(R.id.image_background).setVisibility(GONE);
-        final int numFingers = AccessibilityUtil.isTouchExploreEnabled(context) ? 2 : 1;
-        Map<String, Object> arguments = new ArrayMap<>();
-        arguments.put("count", numFingers);
-        arguments.put("featureName", featureName);
-        final CharSequence instruction = StringUtil.getIcuPluralsString(context,
-                arguments,
-                R.string.accessibility_tutorial_dialog_message_quick_setting);
-        final SpannableStringBuilder tutorialText = new SpannableStringBuilder();
-        if (inSetupWizard) {
-            tutorialText.append(context.getText(
-                            R.string.accessibility_tutorial_dialog_shortcut_unavailable_in_suw))
-                    .append("\n\n");
-        }
-        tutorialText.append(instruction);
+                View bg = v.findViewById(R.id.image_background);
+                if (bg != null) {
+                    bg.setVisibility(GONE);
+                }
+                yield v;
+            }
+            default -> new View(context);
+        };
+    }
+
+    private static CharSequence getShortcutInstruction(
+            @NonNull Context context, @UserShortcutType int shortcutType, int buttonMode,
+            @NonNull CharSequence featureName, boolean inSetupWizard) {
+        return switch (shortcutType) {
+            case HARDWARE -> context.getText(R.string.accessibility_tutorial_dialog_message_volume);
+            case SOFTWARE -> getSoftwareInstruction(context, buttonMode);
+            case GESTURE -> StringUtil.getIcuPluralsString(
+                    context,
+                    AccessibilityUtil.isTouchExploreEnabled(context) ? 3 : 2,
+                    R.string.accessibility_tutorial_dialog_gesture_shortcut_instruction);
+            case TRIPLETAP -> context.getString(
+                    R.string.accessibility_tutorial_dialog_tripletap_instruction, 3);
+            case TWOFINGER_DOUBLETAP -> context.getString(
+                    R.string.accessibility_tutorial_dialog_twofinger_doubletap_instruction, 2);
+            case QUICK_SETTINGS -> getQuickSettingsInstruction(context, featureName, inSetupWizard);
+            default -> "";
+        };
+    }
+
+    @SuppressLint("SwitchIntDef")
+    private static TutorialPage createShortcutTutorialPage(
+            @NonNull Context context, @UserShortcutType int shortcutType, int buttonMode,
+            @NonNull CharSequence featureName, boolean inSetupWizard) {
+
         final ImageView indicatorIcon =
                 createImageView(context, R.drawable.ic_accessibility_page_indicator);
         indicatorIcon.setEnabled(false);
 
-        return new TutorialPage(type, title, image, indicatorIcon, tutorialText);
+        return new TutorialPage(shortcutType,
+                getShortcutTitle(context, shortcutType, buttonMode),
+                getShortcutImage(context, shortcutType, buttonMode),
+                createImageView(context, R.drawable.ic_accessibility_page_indicator),
+                getShortcutInstruction(
+                        context, shortcutType, buttonMode, featureName, inSetupWizard));
     }
 
     /**
@@ -495,81 +489,54 @@ public final class AccessibilityShortcutsTutorial {
     static List<TutorialPage> createShortcutTutorialPages(
             @NonNull Context context, int shortcutTypes, @NonNull CharSequence featureName,
             boolean inSetupWizard) {
-        // LINT.IfChange(shortcut_type_ui_order)
         final List<TutorialPage> tutorialPages = new ArrayList<>();
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if ((shortcutTypes & QUICK_SETTINGS)
-                    == QUICK_SETTINGS) {
-                tutorialPages.add(
-                        createQuickSettingsTutorialPage(context, featureName, inSetupWizard));
+        int buttonMode = ShortcutUtils.getButtonMode(context, context.getUserId());
+
+        for (int shortcutType: AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if ((shortcutTypes & shortcutType) == 0) {
+                continue;
             }
+            tutorialPages.add(
+                    createShortcutTutorialPage(
+                            context, shortcutType, buttonMode, featureName, inSetupWizard));
         }
-        if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
-            tutorialPages.add(createSoftwareTutorialPage(context));
-        }
-
-        if ((shortcutTypes & HARDWARE) == HARDWARE) {
-            tutorialPages.add(createHardwareTutorialPage(context));
-        }
-
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if ((shortcutTypes & TWOFINGER_DOUBLETAP)
-                    == TWOFINGER_DOUBLETAP) {
-                tutorialPages.add(createTwoFingerTripleTapTutorialPage(context));
-            }
-        }
-
-        if ((shortcutTypes & TRIPLETAP) == TRIPLETAP) {
-            tutorialPages.add(createTripleTapTutorialPage(context));
-        }
-        // LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
 
         return tutorialPages;
     }
 
-    private static View createSoftwareImage(Context context) {
-        int resId;
-        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
-            return createIllustrationViewWithImageRawResource(
-                    context, R.raw.accessibility_shortcut_type_fab);
-        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.drawable.accessibility_shortcut_type_gesture_touch_explore_on
-                    : R.drawable.accessibility_shortcut_type_gesture;
-        } else {
-            resId = R.drawable.accessibility_shortcut_type_navbar;
-        }
-        return createIllustrationView(context, resId);
+    private static View createSoftwareImage(Context context, int buttonMode) {
+        return switch(buttonMode) {
+            case ACCESSIBILITY_BUTTON_MODE_GESTURE ->
+                    createIllustrationView(context,
+                            AccessibilityUtil.isTouchExploreEnabled(context)
+                                    ? R.drawable
+                                    .accessibility_shortcut_type_gesture_touch_explore_on
+                                    : R.drawable.accessibility_shortcut_type_gesture);
+            case ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU ->
+                createIllustrationViewWithImageRawResource(
+                        context, R.raw.accessibility_shortcut_type_fab);
+            default -> createIllustrationView(
+                    context, R.drawable.accessibility_shortcut_type_navbar);
+        };
     }
 
-    private static CharSequence getSoftwareTitle(Context context) {
-        int resId;
-        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
-            resId = R.string.accessibility_tutorial_dialog_title_button;
-        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = R.string.accessibility_tutorial_dialog_title_gesture;
-        } else {
-            resId = R.string.accessibility_tutorial_dialog_title_button;
-        }
-        return context.getText(resId);
+    private static CharSequence getSoftwareTitle(Context context, int buttonMode) {
+        return context.getText(buttonMode == ACCESSIBILITY_BUTTON_MODE_GESTURE
+                ? R.string.accessibility_tutorial_dialog_title_gesture
+                : R.string.accessibility_tutorial_dialog_title_button);
     }
 
-    private static CharSequence getSoftwareInstruction(Context context) {
-        final SpannableStringBuilder sb = new SpannableStringBuilder();
-        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
-            final int resId = R.string.accessibility_tutorial_dialog_message_floating_button;
-            sb.append(context.getText(resId));
-        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            final int numFingers = AccessibilityUtil.isTouchExploreEnabled(context) ? 3 : 2;
-            sb.append(StringUtil.getIcuPluralsString(
+    private static CharSequence getSoftwareInstruction(Context context, int buttonMode) {
+        return switch(buttonMode) {
+            case ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU -> context.getText(
+                    R.string.accessibility_tutorial_dialog_message_floating_button);
+            case ACCESSIBILITY_BUTTON_MODE_GESTURE -> StringUtil.getIcuPluralsString(
                     context,
-                    numFingers,
-                    R.string.accessibility_tutorial_dialog_gesture_shortcut_instruction));
-        } else {
-            final int resId = R.string.accessibility_tutorial_dialog_message_button;
-            sb.append(getSoftwareInstructionWithIcon(context, context.getText(resId)));
-        }
-        return sb;
+                    AccessibilityUtil.isTouchExploreEnabled(context) ? 3 : 2,
+                    R.string.accessibility_tutorial_dialog_gesture_shortcut_instruction);
+            default -> getSoftwareInstructionWithIcon(context,
+                    context.getText(R.string.accessibility_tutorial_dialog_message_button));
+        };
     }
 
     private static CharSequence getSoftwareInstructionWithIcon(Context context, CharSequence text) {
@@ -590,6 +557,24 @@ public final class AccessibilityShortcutsTutorial {
         return spannableInstruction;
     }
 
+    private static CharSequence getQuickSettingsInstruction(
+            Context context, CharSequence featureName, boolean inSetupWizard) {
+        Map<String, Object> arguments = new ArrayMap<>();
+        arguments.put("count",
+                AccessibilityUtil.isTouchExploreEnabled(context) ? 2 : 1);
+        arguments.put("featureName", featureName);
+        final CharSequence pluralsString = StringUtil.getIcuPluralsString(
+                context, arguments,
+                R.string.accessibility_tutorial_dialog_message_quick_setting);
+        final SpannableStringBuilder tutorialText = new SpannableStringBuilder();
+        if (inSetupWizard) {
+            tutorialText.append(context.getText(R.string
+                            .accessibility_tutorial_dialog_shortcut_unavailable_in_suw))
+                    .append("\n\n");
+        }
+        return tutorialText.append(pluralsString);
+    }
+
     private static class TutorialPage {
         private final int mType;
         private final CharSequence mTitle;
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index 5bf2a3edc2e..772ed96cc10 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -22,10 +22,12 @@ import static android.view.WindowInsets.Type.systemBars;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.GESTURE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TRIPLETAP;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
@@ -33,6 +35,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Insets;
 import android.graphics.Rect;
+import android.icu.text.CaseMap;
 import android.os.Build;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -49,14 +52,27 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.internal.accessibility.util.ShortcutUtils;
+import com.android.settings.R;
+import com.android.settings.utils.LocaleUtils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Set;
-import java.util.StringJoiner;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
 /** Provides utility methods to accessibility settings only. */
 public final class AccessibilityUtil {
+    // LINT.IfChange(shortcut_type_ui_order)
+    static final int[] SHORTCUTS_ORDER_IN_UI = {
+            QUICK_SETTINGS,
+            SOFTWARE, // FAB displays before gesture. Navbar displays without gesture.
+            GESTURE,
+            HARDWARE,
+            TWOFINGER_DOUBLETAP,
+            TRIPLETAP
+    };
+    // LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
 
     private AccessibilityUtil(){}
 
@@ -139,8 +155,8 @@ public final class AccessibilityUtil {
 
     /** Determines if a gesture navigation bar is being used. */
     public static boolean isGestureNavigateEnabled(Context context) {
-        return context.getResources().getInteger(
-                com.android.internal.R.integer.config_navBarInteractionMode)
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, -1)
                 == NAV_BAR_MODE_GESTURAL;
     }
 
@@ -178,153 +194,6 @@ public final class AccessibilityUtil {
                 : AccessibilityServiceFragmentType.TOGGLE;
     }
 
-    /**
-     * Opts in component name into multiple {@code shortcutTypes} colon-separated string in
-     * Settings.
-     *
-     * @param context       The current context.
-     * @param shortcutTypes A combination of {@link UserShortcutType}.
-     * @param componentName The component name that need to be opted in Settings.
-     */
-    static void optInAllValuesToSettings(Context context, int shortcutTypes,
-            @NonNull ComponentName componentName) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ true,
-                        shortcutTypes,
-                        Set.of(componentName.flattenToString()),
-                        UserHandle.myUserId()
-                );
-            }
-
-            return;
-        }
-
-        if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
-            optInValueToSettings(context, SOFTWARE, componentName);
-        }
-        if (((shortcutTypes & HARDWARE) == HARDWARE)) {
-            optInValueToSettings(context, HARDWARE, componentName);
-        }
-    }
-
-    /**
-     * Opts in component name into {@code shortcutType} colon-separated string in Settings.
-     *
-     * @param context       The current context.
-     * @param shortcutType  The preferred shortcut type user selected.
-     * @param componentName The component name that need to be opted in Settings.
-     */
-    @VisibleForTesting
-    static void optInValueToSettings(Context context, @UserShortcutType int shortcutType,
-            @NonNull ComponentName componentName) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ true,
-                        shortcutType,
-                        Set.of(componentName.flattenToString()),
-                        UserHandle.myUserId()
-                );
-            }
-            return;
-        }
-
-        final String targetKey = convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
-
-        if (hasValueInSettings(context, shortcutType, componentName)) {
-            return;
-        }
-
-        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-        if (!TextUtils.isEmpty(targetString)) {
-            joiner.add(targetString);
-        }
-        joiner.add(componentName.flattenToString());
-
-        Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
-    }
-
-    /**
-     * Opts out component name into multiple {@code shortcutTypes} colon-separated string in
-     * Settings.
-     *
-     * @param context       The current context.
-     * @param shortcutTypes A combination of {@link UserShortcutType}.
-     * @param componentName The component name that need to be opted out from Settings.
-     */
-    static void optOutAllValuesFromSettings(Context context, int shortcutTypes,
-            @NonNull ComponentName componentName) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ false,
-                        shortcutTypes,
-                        Set.of(componentName.flattenToString()),
-                        UserHandle.myUserId()
-                );
-            }
-            return;
-        }
-
-        if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
-            optOutValueFromSettings(context, SOFTWARE, componentName);
-        }
-        if (((shortcutTypes & HARDWARE) == HARDWARE)) {
-            optOutValueFromSettings(context, HARDWARE, componentName);
-        }
-    }
-
-    /**
-     * Opts out component name into {@code shortcutType} colon-separated string in Settings.
-     *
-     * @param context       The current context.
-     * @param shortcutType  The preferred shortcut type user selected.
-     * @param componentName The component name that need to be opted out from Settings.
-     */
-    @VisibleForTesting
-    static void optOutValueFromSettings(Context context, @UserShortcutType int shortcutType,
-            @NonNull ComponentName componentName) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ false,
-                        shortcutType,
-                        Set.of(componentName.flattenToString()),
-                        UserHandle.myUserId()
-                );
-            }
-            return;
-        }
-
-        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-        final String targetKey = convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
-
-        if (TextUtils.isEmpty(targetString)) {
-            return;
-        }
-
-        sStringColonSplitter.setString(targetString);
-        while (sStringColonSplitter.hasNext()) {
-            final String name = sStringColonSplitter.next();
-            if (TextUtils.isEmpty(name) || (componentName.flattenToString()).equals(name)) {
-                continue;
-            }
-            joiner.add(name);
-        }
-
-        Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
-    }
-
     /**
      * Returns if component name existed in one of {@code shortcutTypes} string in Settings.
      *
@@ -335,22 +204,18 @@ public final class AccessibilityUtil {
      */
     static boolean hasValuesInSettings(Context context, int shortcutTypes,
             @NonNull ComponentName componentName) {
-        boolean exist = false;
-        if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
-            exist = hasValueInSettings(context, SOFTWARE, componentName);
-        }
-        if (((shortcutTypes & HARDWARE) == HARDWARE)) {
-            exist |= hasValueInSettings(context, HARDWARE, componentName);
-        }
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if ((shortcutTypes & QUICK_SETTINGS)
-                    == QUICK_SETTINGS) {
-                exist |= hasValueInSettings(context, QUICK_SETTINGS,
-                        componentName);
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if (!android.provider.Flags.a11yStandaloneGestureEnabled()) {
+                if ((shortcutType & GESTURE) == GESTURE) {
+                    continue;
+                }
+            }
+            if ((shortcutTypes & shortcutType) == shortcutType
+                    && hasValueInSettings(context, shortcutType, componentName)) {
+                return true;
             }
         }
-
-        return exist;
+        return false;
     }
 
     /**
@@ -360,33 +225,19 @@ public final class AccessibilityUtil {
      * @param shortcutType The preferred shortcut type user selected.
      * @param componentName The component name that need to be checked existed in Settings.
      * @return {@code true} if componentName existed in Settings.
+     *
+     * @deprecated use
+     * {@link ShortcutUtils#isShortcutContained(Context, int, String)} instead.
+     *
+     * (TODO 367414968: finish removal.)
      */
+    @Deprecated
     @VisibleForTesting
     static boolean hasValueInSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            return ShortcutUtils.getShortcutTargetsFromSettings(
-                    context, shortcutType, UserHandle.myUserId()
-            ).contains(componentName.flattenToString());
-        }
-
-        final String targetKey = convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
-
-        if (TextUtils.isEmpty(targetString)) {
-            return false;
-        }
-
-        sStringColonSplitter.setString(targetString);
-
-        while (sStringColonSplitter.hasNext()) {
-            final String name = sStringColonSplitter.next();
-            if ((componentName.flattenToString()).equals(name)) {
-                return true;
-            }
-        }
-        return false;
+        return ShortcutUtils.getShortcutTargetsFromSettings(
+                context, shortcutType, UserHandle.myUserId()
+        ).contains(componentName.flattenToString());
     }
 
     /**
@@ -400,15 +251,14 @@ public final class AccessibilityUtil {
     static int getUserShortcutTypesFromSettings(Context context,
             @NonNull ComponentName componentName) {
         int shortcutTypes = DEFAULT;
-        if (hasValuesInSettings(context, SOFTWARE, componentName)) {
-            shortcutTypes |= SOFTWARE;
-        }
-        if (hasValuesInSettings(context, HARDWARE, componentName)) {
-            shortcutTypes |= HARDWARE;
-        }
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (hasValuesInSettings(context, QUICK_SETTINGS, componentName)) {
-                shortcutTypes |= QUICK_SETTINGS;
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if (!android.provider.Flags.a11yStandaloneGestureEnabled()) {
+                if ((shortcutType & GESTURE) == GESTURE) {
+                    continue;
+                }
+            }
+            if (hasValueInSettings(context, shortcutType, componentName)) {
+                shortcutTypes |= shortcutType;
             }
         }
 
@@ -420,23 +270,15 @@ public final class AccessibilityUtil {
      *
      * @param shortcutType The shortcut type.
      * @return Mapping key in Settings.
+     *
+     * @deprecated use
+     * {@link ShortcutUtils#convertToKey(int)} instead.
+     *
+     * (TODO 367414968: finish removal.)
      */
+    @Deprecated
     static String convertKeyFromSettings(@UserShortcutType int shortcutType) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            return ShortcutUtils.convertToKey(shortcutType);
-        }
-
-        switch (shortcutType) {
-            case SOFTWARE:
-                return Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
-            case HARDWARE:
-                return Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
-            case TRIPLETAP:
-                return Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
-            default:
-                throw new IllegalArgumentException(
-                        "Unsupported userShortcutType " + shortcutType);
-        }
+        return ShortcutUtils.convertToKey(shortcutType);
     }
 
     /**
@@ -505,4 +347,60 @@ public final class AccessibilityUtil {
                 Settings.Secure.SKIP_ACCESSIBILITY_SHORTCUT_DIALOG_TIMEOUT_RESTRICTION, /*
                     true */ 1);
     }
+
+    /**
+     * Assembles a localized string describing the provided shortcut types.
+     */
+    public static CharSequence getShortcutSummaryList(Context context, int shortcutTypes) {
+        final List<CharSequence> list = new ArrayList<>();
+
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if (!android.provider.Flags.a11yStandaloneGestureEnabled()
+                    && (shortcutType & GESTURE) == GESTURE) {
+                continue;
+            }
+            if (!com.android.server.accessibility.Flags
+                    .enableMagnificationMultipleFingerMultipleTapGesture()
+                    && (shortcutType & TWOFINGER_DOUBLETAP) == TWOFINGER_DOUBLETAP) {
+                continue;
+            }
+
+            if ((shortcutTypes & shortcutType) == shortcutType) {
+                list.add(switch (shortcutType) {
+                    case QUICK_SETTINGS -> context.getText(
+                            R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
+                    case SOFTWARE -> getSoftwareShortcutSummary(context);
+                    case GESTURE -> context.getText(
+                            R.string.accessibility_shortcut_edit_summary_software_gesture);
+                    case HARDWARE -> context.getText(
+                            R.string.accessibility_shortcut_hardware_keyword);
+                    case TWOFINGER_DOUBLETAP -> context.getString(
+                            R.string.accessibility_shortcut_two_finger_double_tap_keyword, 2);
+                    case TRIPLETAP -> context.getText(
+                            R.string.accessibility_shortcut_triple_tap_keyword);
+                    default -> "";
+                });
+            }
+        }
+
+        list.sort(CharSequence::compare);
+        return CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(), /* iter= */
+                null, LocaleUtils.getConcatenatedString(list));
+    }
+
+    @VisibleForTesting
+    static CharSequence getSoftwareShortcutSummary(Context context) {
+        if (android.provider.Flags.a11yStandaloneGestureEnabled()) {
+            return context.getText(R.string.accessibility_shortcut_edit_summary_software);
+        }
+        int resId;
+        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
+            resId = R.string.accessibility_shortcut_edit_summary_software;
+        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
+            resId = R.string.accessibility_shortcut_edit_summary_software_gesture;
+        } else {
+            resId = R.string.accessibility_shortcut_edit_summary_software;
+        }
+        return context.getText(resId);
+    }
 }
diff --git a/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java
deleted file mode 100644
index 19db2668df9..00000000000
--- a/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Activity.RESULT_CANCELED;
-
-import android.app.settings.SettingsEnums;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.R;
-import com.android.settings.display.AutoBrightnessSettings;
-import com.android.settingslib.Utils;
-import com.android.settingslib.widget.FooterPreference;
-
-import com.google.android.setupcompat.template.FooterBarMixin;
-import com.google.android.setupdesign.GlifPreferenceLayout;
-
-/**
- * Fragment for adaptive brightness settings in the SetupWizard.
- */
-public class AutoBrightnessPreferenceFragmentForSetupWizard extends AutoBrightnessSettings {
-
-    private static final String FOOTER_PREFERENCE_KEY = "auto_brightness_footer";
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        updateFooterContentDescription();
-
-        if (view instanceof GlifPreferenceLayout) {
-            final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
-            final String title = getContext().getString(
-                    R.string.auto_brightness_title);
-            final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);
-            icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.colorPrimary));
-            AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,
-                    /* description= */ null, icon);
-
-            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
-            AccessibilitySetupWizardUtils.setPrimaryButton(getContext(), mixin, R.string.done,
-                    () -> {
-                        setResult(RESULT_CANCELED);
-                        finish();
-                    });
-        }
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView onCreateRecyclerView(@NonNull LayoutInflater inflater,
-            @NonNull ViewGroup parent, @Nullable Bundle savedInstanceState) {
-        if (parent instanceof GlifPreferenceLayout) {
-            final GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
-            return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
-        }
-        return super.onCreateRecyclerView(inflater, parent, savedInstanceState);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.SUW_ACCESSIBILITY_AUTO_BRIGHTNESS;
-    }
-
-    private void updateFooterContentDescription() {
-        final PreferenceScreen screen = getPreferenceScreen();
-        final FooterPreference footerPreference = screen.findPreference(FOOTER_PREFERENCE_KEY);
-        if (footerPreference != null) {
-            String title = getString(R.string.auto_brightness_content_description_title);
-            final StringBuilder sb = new StringBuilder();
-            sb.append(title).append("\n\n").append(footerPreference.getTitle());
-            footerPreference.setContentDescription(sb);
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/AutoclickUtils.java b/src/com/android/settings/accessibility/AutoclickUtils.java
index 89f2ceb57f9..eec89d616af 100644
--- a/src/com/android/settings/accessibility/AutoclickUtils.java
+++ b/src/com/android/settings/accessibility/AutoclickUtils.java
@@ -16,18 +16,11 @@
 
 package com.android.settings.accessibility;
 
-import static java.lang.annotation.RetentionPolicy.SOURCE;
-
-import android.annotation.IntDef;
-import android.annotation.PluralsRes;
 import android.annotation.StringRes;
 import android.content.Context;
-import android.content.res.Resources;
 
-import com.android.settings.R;
 import com.android.settingslib.utils.StringUtil;
 
-import java.lang.annotation.Retention;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -52,16 +45,6 @@ public final class AutoclickUtils {
      */
     static final int AUTOCLICK_DELAY_STEP = 100;
 
-    @Retention(SOURCE)
-    @IntDef({
-        Quantity.ONE,
-        Quantity.FEW
-    })
-    private @interface Quantity {
-        int ONE = 1;
-        int FEW = 3;
-    }
-
     /**
      * Gets string that should be used for provided autoclick delay.
      *
@@ -73,13 +56,12 @@ public final class AutoclickUtils {
      */
     public static CharSequence getAutoclickDelaySummary(Context context,
                                                         @StringRes int id, int delayMillis) {
-        final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.FEW;
         final float delaySecond =  (float) delayMillis / 1000;
         // Only show integer when delay time is 1.
         final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f";
 
         Map<String, Object> arguments = new HashMap<>();
-        arguments.put("count", quantity);
+        arguments.put("count", delaySecond);
         arguments.put("time", String.format(decimalFormat, delaySecond));
         return StringUtil.getIcuPluralsString(context, arguments, id);
     }
diff --git a/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java b/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java
index c8692a1f28c..6d7846918db 100644
--- a/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java
+++ b/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java
@@ -18,11 +18,14 @@ package com.android.settings.accessibility;
 
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
@@ -32,6 +35,9 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
 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.search.SearchIndexableRaw;
+
+import java.util.List;
 
 /**
  * Controller to update the {@link androidx.preference.PreferenceCategory} for all
@@ -44,6 +50,7 @@ public class AvailableHearingDevicePreferenceController extends
         BluetoothCallback {
 
     private static final String TAG = "AvailableHearingDevicePreferenceController";
+    private static final String SEARCH_DATA_KEY_PREFIX = "a11y_available_hearing_device";
 
     private BluetoothDeviceUpdater mAvailableHearingDeviceUpdater;
     private final LocalBluetoothManager mLocalBluetoothManager;
@@ -56,6 +63,14 @@ public class AvailableHearingDevicePreferenceController extends
                 context);
     }
 
+    @VisibleForTesting
+    void init(AvailableHearingDeviceUpdater availableHearingDeviceUpdater) {
+        if (mAvailableHearingDeviceUpdater != null) {
+            throw new IllegalStateException("Should not call init() more than 1 time.");
+        }
+        mAvailableHearingDeviceUpdater = availableHearingDeviceUpdater;
+    }
+
     /**
      * Initializes objects in this controller. Need to call this before onStart().
      *
@@ -107,4 +122,34 @@ public class AvailableHearingDevicePreferenceController extends
                     getMetricsCategory());
         }
     }
+
+    @Override
+    public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
+        if (Flags.fixA11ySettingsSearch()) {
+            if (mLocalBluetoothManager == null) {
+                Log.d(TAG, "Bluetooth is not supported");
+                return;
+            }
+
+            for (CachedBluetoothDevice cachedDevice :
+                    mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy()) {
+
+                if (!AvailableHearingDeviceUpdater.isAvailableHearingDevice(cachedDevice)) {
+                    continue;
+                }
+
+                SearchIndexableRaw data = new SearchIndexableRaw(mContext);
+                // Include the identity address and add prefix to ensure the key is unique and
+                // distinguish from Bluetooth's connected devices.
+                data.key = SEARCH_DATA_KEY_PREFIX
+                        + cachedDevice.getName() + cachedDevice.getIdentityAddress();
+                data.title = cachedDevice.getName();
+                data.summaryOn = mContext.getString(R.string.accessibility_hearingaid_title);
+                data.screenTitle = mContext.getString(R.string.accessibility_hearingaid_title);
+                rawData.add(data);
+            }
+        } else {
+            super.updateDynamicRawDataToIndex(rawData);
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
index 31d069afaee..b11e328ac4c 100644
--- a/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
+++ b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 
 import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
@@ -34,10 +35,16 @@ public class AvailableHearingDeviceUpdater extends AvailableMediaBluetoothDevice
         super(context, devicePreferenceCallback, metricsCategory);
     }
 
+    static boolean isAvailableHearingDevice(CachedBluetoothDevice cachedDevice) {
+        final BluetoothDevice device = cachedDevice.getDevice();
+        return cachedDevice.isHearingAidDevice()
+                && device.getBondState() == BluetoothDevice.BOND_BONDED
+                && device.isConnected();
+    }
+
     @Override
     public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
-        return cachedDevice.isHearingAidDevice()
-                && isDeviceConnected(cachedDevice)
+        return isAvailableHearingDevice(cachedDevice)
                 && isDeviceInCachedDevicesList(cachedDevice);
     }
 
diff --git a/src/com/android/settings/accessibility/BalanceSeekBar.java b/src/com/android/settings/accessibility/BalanceSeekBar.java
index 8f8f767cebf..5f6fbbe47d1 100644
--- a/src/com/android/settings/accessibility/BalanceSeekBar.java
+++ b/src/com/android/settings/accessibility/BalanceSeekBar.java
@@ -89,7 +89,7 @@ public class BalanceSeekBar extends SeekBar {
                         Settings.System.MASTER_BALANCE, balance, UserHandle.USER_CURRENT);
             }
             final int max = getMax();
-            if (Flags.audioBalanceStateDescription() && max > 0) {
+            if (max > 0) {
                 seekBar.setStateDescription(createStateDescription(mContext,
                         R.string.audio_seek_bar_state_left_first,
                         R.string.audio_seek_bar_state_right_first,
diff --git a/src/com/android/settings/accessibility/BaseCaptioningCustomController.java b/src/com/android/settings/accessibility/BaseCaptioningCustomController.java
new file mode 100644
index 00000000000..68883d55735
--- /dev/null
+++ b/src/com/android/settings/accessibility/BaseCaptioningCustomController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.core.BasePreferenceController;
+
+public class BaseCaptioningCustomController extends BasePreferenceController {
+    protected final CaptionHelper mCaptionHelper;
+
+    public BaseCaptioningCustomController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mCaptionHelper = new CaptionHelper(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mCaptionHelper.getCustomCaptionAvailability();
+    }
+}
diff --git a/src/com/android/settings/accessibility/CaptionHelper.java b/src/com/android/settings/accessibility/CaptionHelper.java
index 36d833c4876..f23b40cbf58 100644
--- a/src/com/android/settings/accessibility/CaptionHelper.java
+++ b/src/com/android/settings/accessibility/CaptionHelper.java
@@ -18,6 +18,8 @@ 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.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -211,4 +213,14 @@ public class CaptionHelper {
     public Locale getLocale() {
         return mCaptioningManager.getLocale();
     }
+
+    /** Returns availability for custom caption preferences, depending on current user style. */
+    public int getCustomCaptionAvailability() {
+        if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+            return (getRawUserStyle() == CaptionStyle.PRESET_CUSTOM)
+                    ? AVAILABLE : AVAILABLE_UNSEARCHABLE;
+        } else {
+            return AVAILABLE;
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
index 686f725e78f..e6958094a77 100644
--- a/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
+++ b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java
@@ -25,23 +25,15 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning background color. */
-public class CaptioningBackgroundColorController extends BasePreferenceController
+public class CaptioningBackgroundColorController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
     private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED;
 
     public CaptioningBackgroundColorController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
index 405f6d9fac9..d13e1cbd07e 100644
--- a/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
+++ b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java
@@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning background opacity. */
-public class CaptioningBackgroundOpacityController extends BasePreferenceController
+public class CaptioningBackgroundOpacityController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningBackgroundOpacityController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningCustomController.java b/src/com/android/settings/accessibility/CaptioningCustomController.java
index 28a99a7d254..e30c90ae968 100644
--- a/src/com/android/settings/accessibility/CaptioningCustomController.java
+++ b/src/com/android/settings/accessibility/CaptioningCustomController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import android.annotation.Nullable;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.os.Handler;
@@ -27,7 +28,6 @@ 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;
@@ -36,11 +36,11 @@ import java.util.Arrays;
 import java.util.List;
 
 /** Preference controller for captioning custom visibility. */
-public class CaptioningCustomController extends BasePreferenceController
+public class CaptioningCustomController extends BaseCaptioningCustomController
         implements LifecycleObserver, OnStart, OnStop {
 
+    @Nullable
     private Preference mCustom;
-    private final CaptionHelper mCaptionHelper;
     private final ContentResolver mContentResolver;
     @VisibleForTesting
     AccessibilitySettingsContentObserver mSettingsContentObserver;
@@ -50,32 +50,31 @@ public class CaptioningCustomController extends BasePreferenceController
     );
 
     public CaptioningCustomController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-        mContentResolver = context.getContentResolver();
-        mSettingsContentObserver = new AccessibilitySettingsContentObserver(
-                new Handler(Looper.getMainLooper()));
-        mSettingsContentObserver.registerKeysToObserverCallback(CAPTIONING_FEATURE_KEYS,
-                key -> refreshShowingCustom());
+        this(context, preferenceKey,
+                new AccessibilitySettingsContentObserver(new Handler(Looper.getMainLooper())));
     }
 
     @VisibleForTesting
-    CaptioningCustomController(Context context, String preferenceKey,
+    CaptioningCustomController(
+            Context context, String preferenceKey,
             AccessibilitySettingsContentObserver contentObserver) {
-        this(context, preferenceKey);
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
         mSettingsContentObserver = contentObserver;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
+        mSettingsContentObserver.registerKeysToObserverCallback(CAPTIONING_FEATURE_KEYS, key -> {
+            if (mCustom != null) {
+                mCustom.setVisible(shouldShowPreference());
+            }
+        });
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mCustom = screen.findPreference(getPreferenceKey());
-        refreshShowingCustom();
+        if (mCustom != null) {
+            mCustom.setVisible(shouldShowPreference());
+        }
     }
 
     @Override
@@ -88,9 +87,7 @@ public class CaptioningCustomController extends BasePreferenceController
         mSettingsContentObserver.unregister(mContentResolver);
     }
 
-    private void refreshShowingCustom() {
-        final boolean isCustomPreset =
-                mCaptionHelper.getRawUserStyle() == CaptioningManager.CaptionStyle.PRESET_CUSTOM;
-        mCustom.setVisible(isCustomPreset);
+    private boolean shouldShowPreference() {
+        return mCaptionHelper.getRawUserStyle() == CaptioningManager.CaptionStyle.PRESET_CUSTOM;
     }
 }
diff --git a/src/com/android/settings/accessibility/CaptioningEdgeColorController.java b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
index 4903ff4deab..bb9ce076a27 100644
--- a/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
+++ b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java
@@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning edge color. */
-public class CaptioningEdgeColorController extends BasePreferenceController
+public class CaptioningEdgeColorController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningEdgeColorController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java
index adb66d34c17..9e2ac205d87 100644
--- a/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java
+++ b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java
@@ -21,22 +21,13 @@ import android.content.Context;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning edge type. */
-public class CaptioningEdgeTypeController extends BasePreferenceController
+public class CaptioningEdgeTypeController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningEdgeTypeController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningForegroundColorController.java b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
index 8e9ec1879ee..4fc9c1bd940 100644
--- a/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
+++ b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java
@@ -24,23 +24,15 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning foreground color. */
-public class CaptioningForegroundColorController extends BasePreferenceController
+public class CaptioningForegroundColorController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
     private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED;
 
     public CaptioningForegroundColorController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
index ab8a84b380f..c295399b5d2 100644
--- a/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
+++ b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java
@@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning foreground opacity. */
-public class CaptioningForegroundOpacityController extends BasePreferenceController
+public class CaptioningForegroundOpacityController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningForegroundOpacityController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningTypefaceController.java b/src/com/android/settings/accessibility/CaptioningTypefaceController.java
index d8222fa0b50..8eb6cd170f3 100644
--- a/src/com/android/settings/accessibility/CaptioningTypefaceController.java
+++ b/src/com/android/settings/accessibility/CaptioningTypefaceController.java
@@ -23,22 +23,12 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.settings.core.BasePreferenceController;
-
 /** Preference controller for captioning type face. */
-public class CaptioningTypefaceController extends BasePreferenceController
+public class CaptioningTypefaceController extends BaseCaptioningCustomController
         implements Preference.OnPreferenceChangeListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningTypefaceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningWindowColorController.java b/src/com/android/settings/accessibility/CaptioningWindowColorController.java
index 238a75a8b6a..ff67420df71 100644
--- a/src/com/android/settings/accessibility/CaptioningWindowColorController.java
+++ b/src/com/android/settings/accessibility/CaptioningWindowColorController.java
@@ -25,23 +25,15 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning window color. */
-public class CaptioningWindowColorController extends BasePreferenceController
+public class CaptioningWindowColorController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
     private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED;
 
     public CaptioningWindowColorController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
index ef288039780..5ad29db8b83 100644
--- a/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
+++ b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java
@@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
-import com.android.settings.core.BasePreferenceController;
 
 /** Preference controller for captioning window opacity. */
-public class CaptioningWindowOpacityController extends BasePreferenceController
+public class CaptioningWindowOpacityController extends BaseCaptioningCustomController
         implements OnValueChangedListener {
 
-    private final CaptionHelper mCaptionHelper;
-
     public CaptioningWindowOpacityController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ColorAndMotionFragment.java b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
index 4ea22260c79..2fde27988fd 100644
--- a/src/com/android/settings/accessibility/ColorAndMotionFragment.java
+++ b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
@@ -17,12 +17,15 @@
 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.os.Handler;
 import android.provider.Settings;
 import android.view.accessibility.Flags;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.TwoStatePreference;
@@ -47,7 +50,6 @@ public class ColorAndMotionFragment extends DashboardFragment {
 
     // Preferences
     private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";
-    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
     private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";
     @VisibleForTesting
     static final String TOGGLE_FORCE_INVERT = "toggle_force_invert";
@@ -74,9 +76,7 @@ public class ColorAndMotionFragment extends DashboardFragment {
         mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
         mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
         mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
-        }
+        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
         if (Flags.forceInvertColor()) {
             mShortcutFeatureKeys.add(ToggleForceInvertPreferenceController.SETTINGS_KEY);
         }
@@ -122,7 +122,7 @@ public class ColorAndMotionFragment extends DashboardFragment {
         mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
 
         // Disable animation.
-        mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
+        mToggleDisableAnimationsPreference = findPreference(RemoveAnimationsPreference.KEY);
 
         // Large pointer icon.
         mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
@@ -148,6 +148,12 @@ public class ColorAndMotionFragment extends DashboardFragment {
         }
     }
 
+    @Nullable
+    @Override
+    public String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return ColorAndMotionScreen.KEY;
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_color_and_motion);
 }
diff --git a/src/com/android/settings/accessibility/ColorAndMotionScreen.kt b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
new file mode 100644
index 00000000000..2d5eb0f8ea1
--- /dev/null
+++ b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.Settings.ColorAndMotionActivity
+import com.android.settings.flags.Flags
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class ColorAndMotionScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_color_and_motion_title
+
+    override val icon: Int
+        get() = R.drawable.ic_color_and_motion
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()
+
+    override fun hasCompleteHierarchy(): Boolean = false
+
+    override fun fragmentClass() = ColorAndMotionFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +RemoveAnimationsPreference()
+        }
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, ColorAndMotionActivity::class.java, metadata?.key)
+
+    companion object {
+        const val KEY = "accessibility_color_and_motion"
+    }
+}
diff --git a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
index 2333ed38f25..d9fd2249c02 100644
--- a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
+++ b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
@@ -37,6 +37,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
 import java.util.Arrays;
 import java.util.List;
 
+// LINT.IfChange
 /** A toggle preference controller for disable animations. */
 public class DisableAnimationsPreferenceController extends TogglePreferenceController implements
         LifecycleObserver, OnStart, OnStop {
@@ -123,3 +124,4 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr
         mContentResolver.unregisterContentObserver(mSettingsContentObserver);
     }
 }
+// LINT.ThenChange(src/com/android/settings/accessibility/RemoveAnimationsPreference.kt)
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/DisplaySizeData.java b/src/com/android/settings/accessibility/DisplaySizeData.java
index 77ae8977085..15aeb6b0d9d 100644
--- a/src/com/android/settings/accessibility/DisplaySizeData.java
+++ b/src/com/android/settings/accessibility/DisplaySizeData.java
@@ -35,7 +35,7 @@ class DisplaySizeData extends PreviewSizeData<Integer> {
         super(context);
 
         mDensity = new DisplayDensityUtils(getContext());
-        final int initialIndex = mDensity.getCurrentIndexForDefaultDisplay();
+        final int initialIndex = mDensity.getCurrentIndex();
         if (initialIndex < 0) {
             // Failed to obtain default density, which means we failed to
             // connect to the window manager service. Just use the current
@@ -46,9 +46,9 @@ class DisplaySizeData extends PreviewSizeData<Integer> {
             setInitialIndex(0);
             setValues(Collections.singletonList(densityDpi));
         } else {
-            setDefaultValue(mDensity.getDefaultDensityForDefaultDisplay());
+            setDefaultValue(mDensity.getDefaultDensity());
             setInitialIndex(initialIndex);
-            setValues(Arrays.stream(mDensity.getDefaultDisplayDensityValues()).boxed()
+            setValues(Arrays.stream(mDensity.getValues()).boxed()
                     .collect(Collectors.toList()));
         }
     }
diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index 9c8560b485b..8b37c8f451a 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -18,8 +18,6 @@ package com.android.settings.accessibility;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 
-import com.android.settingslib.accessibility.AccessibilityUtils;
-
 /**
  * Fragment that does not have toggle bar to turn on service to use.
  *
@@ -37,29 +35,4 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends
         super.onInstallSwitchPreferenceToggleSwitch();
         mToggleServiceSwitchPreference.setVisible(false);
     }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Enables accessibility service only when user had allowed permission. Disables
-     * accessibility service when shortcutPreference is unchecked.
-     */
-    @Override
-    public void onToggleClicked(ShortcutPreference preference) {
-        super.onToggleClicked(preference);
-        boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED)
-                && preference.isChecked();
-        AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Enables accessibility service when user clicks permission allow button.
-     */
-    @Override
-    void onAllowButtonFromShortcutToggleClicked() {
-        super.onAllowButtonFromShortcutToggleClicked();
-        AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, true);
-    }
 }
diff --git a/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java b/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java
deleted file mode 100644
index 840caa6fa6c..00000000000
--- a/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.input.InputSettings;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-
-import java.util.List;
-
-/**
- * A toggle preference controller for keyboard bounce key.
- */
-public class KeyboardBounceKeyPreferenceController extends TogglePreferenceController {
-    private static final String TAG = "BounceKeyPrefController";
-    static final String PREF_KEY = "toggle_keyboard_bounce_keys";
-
-    public KeyboardBounceKeyPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return InputSettings.isAccessibilityBounceKeysFeatureEnabled()
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return InputSettings.isAccessibilityBounceKeysEnabled(mContext);
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilityBounceKeysThreshold(mContext,
-                isChecked ? PhysicalKeyboardFragment.BOUNCE_KEYS_THRESHOLD
-                        : 0);
-        return true;
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return R.string.menu_key_accessibility;
-    }
-
-    @Override
-    public void updateNonIndexableKeys(@NonNull List<String> keys) {
-        super.updateNonIndexableKeys(keys);
-
-        if (Flags.fixA11ySettingsSearch() && !AccessibilitySettings.isAnyHardKeyboardsExist()) {
-            if (keys.contains(getPreferenceKey())) {
-                Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list.");
-                return;
-            }
-            keys.add(getPreferenceKey());
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java b/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java
deleted file mode 100644
index bb9d95049ad..00000000000
--- a/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.input.InputSettings;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-
-import java.util.List;
-
-/**
- * A toggle preference controller for keyboard slow key.
- */
-public class KeyboardSlowKeyPreferenceController extends TogglePreferenceController {
-    private static final String TAG = "SlowKeyPrefController";
-
-    static final String PREF_KEY = "toggle_keyboard_slow_keys";
-
-    public KeyboardSlowKeyPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return InputSettings.isAccessibilitySlowKeysEnabled(mContext);
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilitySlowKeysThreshold(mContext,
-                isChecked ? PhysicalKeyboardFragment.SLOW_KEYS_THRESHOLD
-                        : 0);
-        return true;
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return R.string.menu_key_accessibility;
-    }
-
-    @Override
-    public void updateNonIndexableKeys(@NonNull List<String> keys) {
-        super.updateNonIndexableKeys(keys);
-
-        if (Flags.fixA11ySettingsSearch() && !AccessibilitySettings.isAnyHardKeyboardsExist()) {
-            if (keys.contains(getPreferenceKey())) {
-                Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list.");
-                return;
-            }
-            keys.add(getPreferenceKey());
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java b/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java
deleted file mode 100644
index c896c9c0d27..00000000000
--- a/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.input.InputSettings;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
-
-import java.util.List;
-
-/**
- * A toggle preference controller for keyboard sticky key.
- */
-public class KeyboardStickyKeyPreferenceController extends TogglePreferenceController {
-    private static final String TAG = "StickyKeyPrefController";
-    static final String PREF_KEY = "toggle_keyboard_sticky_keys";
-
-    public KeyboardStickyKeyPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return InputSettings.isAccessibilityStickyKeysFeatureEnabled()
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return InputSettings.isAccessibilityStickyKeysEnabled(mContext);
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilityStickyKeysEnabled(mContext, isChecked);
-        return true;
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return R.string.menu_key_accessibility;
-    }
-
-    @Override
-    public void updateNonIndexableKeys(@NonNull List<String> keys) {
-        super.updateNonIndexableKeys(keys);
-
-        if (Flags.fixA11ySettingsSearch() && !AccessibilitySettings.isAnyHardKeyboardsExist()) {
-            if (keys.contains(getPreferenceKey())) {
-                Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list.");
-                return;
-            }
-            keys.add(getPreferenceKey());
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 80d1ce0cdd0..e49078bbd71 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -67,7 +67,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
         initLaunchPreference();
 
         final View view = super.onCreateView(inflater, container, savedInstanceState);
-        removePreference(KEY_USE_SERVICE_PREFERENCE);
+        removePreference(getUseServicePreferenceKey());
         return view;
     }
 
@@ -81,7 +81,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
         super.onProcessArguments(arguments);
         mComponentName = arguments.getParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME);
         final ActivityInfo info = getAccessibilityShortcutInfo().getActivityInfo();
-        mPackageName = info.loadLabel(getPackageManager()).toString();
+        mFeatureName = info.loadLabel(getPackageManager());
 
         // Settings animated image.
         final int animatedImageRes = arguments.getInt(
diff --git a/src/com/android/settings/accessibility/PaletteListPreference.java b/src/com/android/settings/accessibility/PaletteListPreference.java
index eec8b5a6cde..c29113cd116 100644
--- a/src/com/android/settings/accessibility/PaletteListPreference.java
+++ b/src/com/android/settings/accessibility/PaletteListPreference.java
@@ -24,6 +24,7 @@ import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidt
 import static com.google.common.primitives.Ints.max;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Paint.FontMetrics;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
@@ -39,6 +40,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
+import com.android.settingslib.Utils;
 
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
@@ -128,6 +130,8 @@ public final class PaletteListPreference extends Preference {
         final List<Integer> paletteColors = getPaletteColors(context);
         final List<String> paletteData = getPaletteData(context);
 
+        final ColorStateList textColor =
+                Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);
         final float textPadding =
                 context.getResources().getDimension(R.dimen.accessibility_layout_margin_start_end);
         final String maxLengthData =
@@ -143,6 +147,7 @@ public final class PaletteListPreference extends Preference {
         for (int i = 0; i < paletteData.size(); ++i) {
             final TextView textView = new TextView(context);
             textView.setText(paletteData.get(i));
+            textView.setTextColor(textColor);
             textView.setHeight(paletteItemHeight);
             textView.setPaddingRelative(Math.round(textPadding), 0, 0, 0);
             textView.setGravity(Gravity.CENTER_VERTICAL);
diff --git a/src/com/android/settings/accessibility/PreferredShortcuts.java b/src/com/android/settings/accessibility/PreferredShortcuts.java
index c3e64ab9ab0..526b1fa8b39 100644
--- a/src/com/android/settings/accessibility/PreferredShortcuts.java
+++ b/src/com/android/settings/accessibility/PreferredShortcuts.java
@@ -17,7 +17,6 @@
 package com.android.settings.accessibility;
 
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
 
 import android.content.ComponentName;
@@ -25,12 +24,10 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.util.ArrayMap;
-import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.internal.accessibility.util.ShortcutUtils;
 
@@ -123,12 +120,7 @@ public final class PreferredShortcuts {
     public static void updatePreferredShortcutsFromSettings(
             @NonNull Context context, @NonNull Set<String> components) {
         final Map<Integer, Set<String>> shortcutTypeToTargets = new ArrayMap<>();
-        for (int shortcutType : ShortcutConstants.USER_SHORTCUT_TYPES) {
-            if (!Flags.a11yQsShortcut()
-                    && shortcutType == QUICK_SETTINGS) {
-                // Skip saving quick setting as preferred shortcut option when flag is not enabled
-                continue;
-            }
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
             shortcutTypeToTargets.put(
                     shortcutType,
                     ShortcutUtils.getShortcutTargetsFromSettings(
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
index e7f59f49974..4e70103cfc7 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.internal.accessibility.AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME;
-
-import android.content.ComponentName;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.hardware.display.ColorDisplayManager;
@@ -29,12 +26,12 @@ import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.server.display.feature.flags.Flags;
 import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -42,7 +39,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
 
 /** PreferenceController that shows the Reduce Bright Colors summary */
 public class ReduceBrightColorsPreferenceController
-        extends AccessibilityQuickSettingsPrimarySwitchPreferenceController
+        extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnStop {
     private ContentObserver mSettingsContentObserver;
     private PrimarySwitchPreference mPreference;
@@ -72,7 +69,6 @@ public class ReduceBrightColorsPreferenceController
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        super.setChecked(isChecked);
         return mColorDisplayManager.setReduceBrightColorsActivated(isChecked);
     }
 
@@ -125,20 +121,4 @@ public class ReduceBrightColorsPreferenceController
     public void onStop() {
         mContext.getContentResolver().unregisterContentObserver(mSettingsContentObserver);
     }
-
-    @Nullable
-    @Override
-    protected ComponentName getTileComponentName() {
-        // TODO: When clean up the feature flag, change the parent class from
-        // AccessibilityQuickSettingsPrimarySwitchPreferenceController to
-        // TogglePreferenceController
-        return android.view.accessibility.Flags.a11yQsShortcut()
-                ? null : REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME;
-    }
-
-    @Override
-    CharSequence getTileTooltipContent() {
-        return mContext.getText(
-                R.string.accessibility_reduce_bright_colors_auto_added_qs_tooltip_content);
-    }
 }
diff --git a/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt b/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt
new file mode 100644
index 00000000000..65519e9ce37
--- /dev/null
+++ b/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.DrawableRes
+import android.content.Context
+import android.provider.Settings
+import com.android.settings.R
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.datastore.SettingsGlobalStore
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+
+class RemoveAnimationsPreference :
+    SwitchPreference(
+        KEY,
+        R.string.accessibility_disable_animations,
+        R.string.accessibility_disable_animations_summary,
+    ),
+    PreferenceLifecycleProvider {
+
+    private var mSettingsKeyedObserver: KeyedObserver<String>? = null
+
+    override val icon: Int
+        @DrawableRes get() = R.drawable.ic_accessibility_animation
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        val observer = KeyedObserver<String> { _, _ -> context.notifyPreferenceChange(KEY) }
+        mSettingsKeyedObserver = observer
+        val storage = SettingsGlobalStore.get(context)
+        for (key in getAnimationKeys()) {
+            storage.addObserver(key, observer, HandlerExecutor.main)
+        }
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        mSettingsKeyedObserver?.let {
+            val storage = SettingsGlobalStore.get(context)
+            for (key in getAnimationKeys()) {
+                storage.removeObserver(key, it)
+            }
+            mSettingsKeyedObserver = null
+        }
+    }
+
+    override fun storage(context: Context): KeyValueStore = RemoveAnimationsStorage(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class RemoveAnimationsStorage(private val context: Context) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            when {
+                key == KEY && valueType == Boolean::class.javaObjectType ->
+                    !isAnimationEnabled(context) as T
+                else -> null
+            }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (key == KEY && value is Boolean) {
+                setAnimationEnabled(context, !value)
+            }
+        }
+    }
+
+    companion object {
+        // This KEY must match the key used in accessibility_color_and_motion.xml for this
+        // preference, at least until the entire screen is migrated to Catalyst and that XML
+        // is deleted. Use any key from the set of 3 toggle animation keys.
+        const val KEY = Settings.Global.ANIMATOR_DURATION_SCALE
+
+        const val ANIMATION_ON_VALUE: Float = 1.0f
+        const val ANIMATION_OFF_VALUE: Float = 0.0f
+
+        fun isAnimationEnabled(context: Context): Boolean {
+            val storage = SettingsGlobalStore.get(context)
+            // This pref treats animation as enabled if *any* of the animation types are enabled.
+            for (animationSetting in getAnimationKeys()) {
+                val animationValue: Float? = storage.getFloat(animationSetting)
+                // Animation is enabled by default, so treat null as enabled.
+                if (animationValue == null || animationValue > ANIMATION_OFF_VALUE) {
+                    return true
+                }
+            }
+            return false
+        }
+
+        fun setAnimationEnabled(context: Context, enabled: Boolean) {
+            val storage = SettingsGlobalStore.get(context)
+            val value = if (enabled) ANIMATION_ON_VALUE else ANIMATION_OFF_VALUE
+            for (animationSetting in getAnimationKeys()) {
+                storage.setFloat(animationSetting, value)
+            }
+        }
+
+        fun getAnimationKeys() =
+            listOf(
+                Settings.Global.WINDOW_ANIMATION_SCALE,
+                Settings.Global.TRANSITION_ANIMATION_SCALE,
+                Settings.Global.ANIMATOR_DURATION_SCALE,
+            )
+    }
+}
diff --git a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
index 8cb5bace951..d97895ac85b 100644
--- a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
+++ b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
@@ -78,7 +78,6 @@ public class RestrictedPreferenceHelper {
             final AccessibilityServiceInfo info = installedServices.get(i);
             final ResolveInfo resolveInfo = info.getResolveInfo();
             final String packageName = resolveInfo.serviceInfo.packageName;
-
             final ComponentName componentName = new ComponentName(packageName,
                     resolveInfo.serviceInfo.name);
             final boolean serviceEnabled = enabledServices.contains(componentName);
@@ -102,10 +101,6 @@ public class RestrictedPreferenceHelper {
      */
     public List<AccessibilityActivityPreference> createAccessibilityActivityPreferenceList(
             List<AccessibilityShortcutInfo> installedShortcuts) {
-        final Set<ComponentName> enabledServices =
-                AccessibilityUtils.getEnabledServicesFromSettings(mContext);
-        final List<String> permittedServices = mDpm.getPermittedAccessibilityServices(
-                UserHandle.myUserId());
 
         final int installedShortcutsSize = installedShortcuts.size();
         final List<AccessibilityActivityPreference> preferenceList = new ArrayList<>(
@@ -116,17 +111,12 @@ public class RestrictedPreferenceHelper {
             final ActivityInfo activityInfo = info.getActivityInfo();
             final ComponentName componentName = info.getComponentName();
 
-            final boolean serviceEnabled = enabledServices.contains(componentName);
             AccessibilityActivityPreference preference = new AccessibilityActivityPreference(
                     mContext, componentName.getPackageName(), activityInfo.applicationInfo.uid,
                     info);
-            if (Flags.neverRestrictAccessibilityActivity()) {
-                // Accessibility Activities do not have elevated privileges so restricting
-                // them based on ECM or device admin does not give any value.
-                preference.setEnabled(true);
-            } else {
-                setRestrictedPreferenceEnabled(preference, permittedServices, serviceEnabled);
-            }
+            // Accessibility Activities do not have elevated privileges so restricting
+            // them based on ECM or device admin does not give any value.
+            preference.setEnabled(true);
             preferenceList.add(preference);
         }
         return preferenceList;
diff --git a/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java b/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java
index 20e227c48bf..c6f51412adf 100644
--- a/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java
+++ b/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java
@@ -17,17 +17,26 @@
 package com.android.settings.accessibility;
 
 import android.content.Context;
+import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.search.SearchIndexableRaw;
+
+import java.util.List;
 
 /**
  * Controller to update the {@link androidx.preference.PreferenceCategory} for all
@@ -39,11 +48,23 @@ public class SavedHearingDevicePreferenceController extends
         BaseBluetoothDevicePreferenceController implements LifecycleObserver, OnStart, OnResume,
         OnStop {
 
+    private static final String TAG = "SavedHearingDevicePreferenceController";
+    private static final String SEARCH_DATA_KEY_PREFIX = "a11y_saved_hearing_device";
     private BluetoothDeviceUpdater mSavedHearingDeviceUpdater;
+    private final LocalBluetoothManager mLocalBluetoothManager;
 
     public SavedHearingDevicePreferenceController(Context context,
             String preferenceKey) {
         super(context, preferenceKey);
+        mLocalBluetoothManager = Utils.getLocalBluetoothManager(context);
+    }
+
+    @VisibleForTesting
+    void init(SavedHearingDeviceUpdater savedHearingDeviceUpdater) {
+        if (mSavedHearingDeviceUpdater != null) {
+            throw new IllegalStateException("Should not call init() more than 1 time.");
+        }
+        mSavedHearingDeviceUpdater = savedHearingDeviceUpdater;
     }
 
     /**
@@ -86,4 +107,34 @@ public class SavedHearingDevicePreferenceController extends
             mSavedHearingDeviceUpdater.forceUpdate();
         }
     }
+
+    @Override
+    public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
+        if (Flags.fixA11ySettingsSearch()) {
+            if (mLocalBluetoothManager == null) {
+                Log.d(TAG, "Bluetooth is not supported");
+                return;
+            }
+
+            for (CachedBluetoothDevice cachedDevice :
+                    mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy()) {
+
+                if (!SavedHearingDeviceUpdater.isSavedHearingAidDevice(cachedDevice)) {
+                    continue;
+                }
+
+                SearchIndexableRaw data = new SearchIndexableRaw(mContext);
+                // Include the identity address and add prefix to ensure the key is unique and
+                // distinguish from Bluetooth's connected devices.
+                data.key = SEARCH_DATA_KEY_PREFIX
+                        + cachedDevice.getName() + cachedDevice.getIdentityAddress();
+                data.title = cachedDevice.getName();
+                data.summaryOn = mContext.getString(R.string.accessibility_hearingaid_title);
+                data.screenTitle = mContext.getString(R.string.accessibility_hearingaid_title);
+                rawData.add(data);
+            }
+        } else {
+            super.updateDynamicRawDataToIndex(rawData);
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
index 1de9c727235..2d42fb9942e 100644
--- a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
+++ b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
@@ -36,14 +36,16 @@ public class SavedHearingDeviceUpdater extends SavedBluetoothDeviceUpdater {
         super(context, devicePreferenceCallback, /* showConnectedDevice= */ false, metricsCategory);
     }
 
-    @Override
-    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
+    static boolean isSavedHearingAidDevice(CachedBluetoothDevice cachedDevice) {
         final BluetoothDevice device = cachedDevice.getDevice();
-        final boolean isSavedHearingAidDevice = cachedDevice.isHearingAidDevice()
+        return cachedDevice.isHearingAidDevice()
                 && device.getBondState() == BluetoothDevice.BOND_BONDED
                 && !device.isConnected();
+    }
 
-        return isSavedHearingAidDevice && isDeviceInCachedDevicesList(cachedDevice);
+    @Override
+    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
+        return isSavedHearingAidDevice(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
index a90af2182f7..a972a0dd5fa 100644
--- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -30,6 +30,8 @@ import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
@@ -64,7 +66,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
     static final String RESET_KEY = "reset";
     static final String PREVIEW_KEY = "preview";
     private static final String NEED_RESET_SETTINGS = "need_reset_settings";
-    private static final String LAST_PREVIEW_INDEX = "last_preview_index";
     private static final int UNKNOWN_INDEX = -1;
 
     private FontWeightAdjustmentPreferenceController mFontWeightAdjustmentController;
@@ -109,13 +110,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
             if (savedInstanceState.getBoolean(NEED_RESET_SETTINGS)) {
                 mResetStateListeners.forEach(ResetStateListener::resetState);
             }
-
-            if (savedInstanceState.containsKey(LAST_PREVIEW_INDEX)) {
-                final int lastPreviewIndex = savedInstanceState.getInt(LAST_PREVIEW_INDEX);
-                if (lastPreviewIndex != UNKNOWN_INDEX) {
-                    mPreviewController.setCurrentItem(lastPreviewIndex);
-                }
-            }
         }
     }
 
@@ -250,8 +244,6 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
         if (mNeedResetSettings) {
             outState.putBoolean(NEED_RESET_SETTINGS, true);
         }
-
-        outState.putInt(LAST_PREVIEW_INDEX, mPreviewController.getCurrentItem());
     }
 
     @Override
@@ -313,4 +305,9 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_text_reading_options);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return TextReadingScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
index a9e2dce4241..9161171914a 100644
--- a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
+++ b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java
@@ -17,6 +17,8 @@
 package com.android.settings.accessibility;
 
 import android.content.Context;
+import android.os.Bundle;
+import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -36,6 +38,7 @@ import com.android.settings.widget.DotsPageIndicator;
  * A {@link Preference} that could show the preview related to the text and reading options.
  */
 public class TextReadingPreviewPreference extends Preference {
+    private static final String KEY_LAST_INDEX = "last_preview_index";
     private int mCurrentItem;
     private int mLastLayerIndex;
     private PreviewPagerAdapter mPreviewAdapter;
@@ -98,6 +101,22 @@ public class TextReadingPreviewPreference extends Preference {
         updatePagerAndIndicator(viewPager, pageIndicator);
     }
 
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Bundle state = new Bundle();
+        state.putParcelable(null, super.onSaveInstanceState());
+        state.putInt(KEY_LAST_INDEX, getCurrentItem());
+        return state;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        Bundle bundle = (Bundle) state;
+        super.onRestoreInstanceState(bundle.getParcelable(null));
+        setCurrentItem(bundle.getInt(KEY_LAST_INDEX));
+    }
+
+
     /**
      * Set the minimum preview layout horizontal inner padding.
      */
diff --git a/src/com/android/settings/accessibility/TextReadingScreen.kt b/src/com/android/settings/accessibility/TextReadingScreen.kt
new file mode 100644
index 00000000000..8970d5228db
--- /dev/null
+++ b/src/com/android/settings/accessibility/TextReadingScreen.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class TextReadingScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_text_reading_options_title
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystTextReadingScreen()
+
+    override fun fragmentClass() = TextReadingPreferenceFragment::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "text_reading_screen"
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index e41d857bbdb..a2a8cf3b164 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -20,6 +20,7 @@ import static com.android.settings.accessibility.AccessibilityDialogUtils.Dialog
 import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -53,6 +54,7 @@ import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Fragment for providing toggle bar and basic accessibility service setup. */
@@ -323,6 +325,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
         final int shortcutTypes = getUserPreferredShortcutTypes();
@@ -337,8 +340,10 @@ public class ToggleAccessibilityServicePreferenceFragment extends
                 onAllowButtonFromShortcutToggleClicked();
             }
         } else {
-            AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), shortcutTypes,
-                    mComponentName);
+            getPrefContext().getSystemService(AccessibilityManager.class)
+                            .enableShortcutsForTargets(false, shortcutTypes,
+                                    Set.of(mComponentName.flattenToString()),
+                                    getPrefContext().getUserId());
         }
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
@@ -385,8 +390,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends
         }
 
         // Get Accessibility service name.
-        mPackageName = getAccessibilityServiceInfo().getResolveInfo().loadLabel(
-                getPackageManager());
+        AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+        mFeatureName = info == null ? "" : info.getResolveInfo().loadLabel(getPackageManager());
 
         if (arguments.containsKey(AccessibilitySettings.EXTRA_TILE_SERVICE_COMPONENT_NAME)) {
             final String tileServiceComponentName = arguments.getString(
@@ -452,15 +457,11 @@ public class ToggleAccessibilityServicePreferenceFragment extends
 
     @Override
     protected int getDefaultShortcutTypes() {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-            boolean isAccessibilityTool = info != null && info.isAccessibilityTool();
-            return !isAccessibilityTool || getTileComponentName() == null
-                    ? super.getDefaultShortcutTypes()
-                    : ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
-        }
-
-        return super.getDefaultShortcutTypes();
+        AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+        boolean isAccessibilityTool = info != null && info.isAccessibilityTool();
+        return !isAccessibilityTool || getTileComponentName() == null
+                ? super.getDefaultShortcutTypes()
+                : ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
     }
 
     private void onAllowButtonFromEnableToggleClicked() {
@@ -479,11 +480,14 @@ public class ToggleAccessibilityServicePreferenceFragment extends
         mWarningDialog.dismiss();
     }
 
+    @SuppressLint("MissingPermission")
     void onAllowButtonFromShortcutToggleClicked() {
         mShortcutPreference.setChecked(true);
 
         final int shortcutTypes = getUserPreferredShortcutTypes();
-        AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes, mComponentName);
+        getPrefContext().getSystemService(AccessibilityManager.class)
+                .enableShortcutsForTargets(true, shortcutTypes,
+                        Set.of(mComponentName.flattenToString()), getPrefContext().getUserId());
 
         mIsDialogShown.set(false);
         showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ccba9e7f68a..e28622501ed 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -33,6 +33,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -52,7 +54,10 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
     private static final String TAG = "ToggleColorInversionPreferenceFragment";
     private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
 
-    private static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+    @VisibleForTesting
+    static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+    @VisibleForTesting
+    static final String KEY_SWITCH_PREFERENCE = "color_inversion_switch_preference_key";
 
     @Override
     protected void registerKeysToObserverCallback(
@@ -69,13 +74,13 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mComponentName = COLOR_INVERSION_COMPONENT_NAME;
-        mPackageName = getText(R.string.accessibility_display_inversion_preference_title);
+        mFeatureName = getText(R.string.accessibility_display_inversion_preference_title);
         mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
         mTopIntroTitle = getText(R.string.accessibility_display_inversion_preference_intro_text);
         mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
-            .authority(getPrefContext().getPackageName())
-            .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
-            .build();
+                .authority(getPrefContext().getPackageName())
+                .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
+                .build();
         final View view = super.onCreateView(inflater, container, savedInstanceState);
         updateFooterPreference();
         return view;
@@ -131,6 +136,11 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
         switchPreference.setTitle(R.string.accessibility_display_inversion_switch_title);
     }
 
+    @Override
+    protected String getUseServicePreferenceKey() {
+        return KEY_SWITCH_PREFERENCE;
+    }
+
     @Override
     protected CharSequence getShortcutTitle() {
         return getText(R.string.accessibility_display_inversion_shortcut_title);
@@ -165,7 +175,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
     @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
-            mComponentName);
+                mComponentName);
     }
 
     @Override
@@ -176,8 +186,8 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
     @Override
     CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {
         return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT
-            ? R.string.accessibility_color_inversion_qs_tooltip_content
-            : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
+                ? R.string.accessibility_color_inversion_qs_tooltip_content
+                : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
     }
 
     @Override
@@ -194,12 +204,22 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
                 @Override
                 public List<SearchIndexableRaw> getRawDataToIndex(Context context,
                         boolean enabled) {
-                    final List<SearchIndexableRaw> rawData = new ArrayList<>();
+                    final List<SearchIndexableRaw> rawData =
+                            super.getRawDataToIndex(context, enabled);
+
                     SearchIndexableRaw raw = new SearchIndexableRaw(context);
                     raw.key = KEY_SHORTCUT_PREFERENCE;
                     raw.title = context.getString(
-                        R.string.accessibility_display_inversion_shortcut_title);
+                            R.string.accessibility_display_inversion_shortcut_title);
                     rawData.add(raw);
+
+                    if (Flags.fixA11ySettingsSearch()) {
+                        SearchIndexableRaw mainPreferenceRaw = new SearchIndexableRaw(context);
+                        mainPreferenceRaw.key = KEY_SWITCH_PREFERENCE;
+                        mainPreferenceRaw.title = context.getString(
+                                R.string.accessibility_display_inversion_switch_title);
+                        rawData.add(mainPreferenceRaw);
+                    }
                     return rawData;
                 }
             };
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 86ddd71e262..5b2df5aeb2f 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -25,6 +25,7 @@ import static com.android.settings.accessibility.DaltonizerPreferenceUtil.isSecu
 
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
+import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.view.LayoutInflater;
@@ -38,6 +39,7 @@ import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltip
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,6 +55,11 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
     private static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";
     private static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";
     private static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";
+
+    @VisibleForTesting
+    static final String KEY_SHORTCUT_PREFERENCE = "daltonizer_shortcut_key";
+    @VisibleForTesting
+    static final String KEY_SWITCH_PREFERENCE = "daltonizer_switch_preference_key";
     @VisibleForTesting
     static final String KEY_SATURATION = "daltonizer_saturation";
 
@@ -71,7 +78,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mComponentName = DALTONIZER_COMPONENT_NAME;
-        mPackageName = getText(com.android.settingslib.R
+        mFeatureName = getText(com.android.settingslib.R
                 .string.accessibility_display_daltonizer_preference_title);
         mHtmlDescription = getText(com.android.settingslib.R
                 .string.accessibility_display_daltonizer_preference_subtitle);
@@ -106,7 +113,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
         final List<String> lists = new ArrayList<>();
         lists.add(KEY_TOP_INTRO_PREFERENCE);
         lists.add(KEY_PREVIEW);
-        lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(getUseServicePreferenceKey());
         // Putting saturation level close to the preview so users can see what is changing.
         lists.add(KEY_SATURATION);
         lists.add(KEY_DEUTERANOMALY);
@@ -170,6 +177,11 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
         switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
+    @Override
+    protected String getUseServicePreferenceKey() {
+        return KEY_SWITCH_PREFERENCE;
+    }
+
     @Override
     protected CharSequence getShortcutTitle() {
         return getText(R.string.accessibility_daltonizer_shortcut_title);
@@ -203,5 +215,27 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings);
+            new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings) {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final List<SearchIndexableRaw> rawData =
+                            super.getRawDataToIndex(context, enabled);
+
+                    if (Flags.fixA11ySettingsSearch()) {
+                        SearchIndexableRaw shortcutRaw = new SearchIndexableRaw(context);
+                        shortcutRaw.key = KEY_SHORTCUT_PREFERENCE;
+                        shortcutRaw.title = context.getString(
+                                R.string.accessibility_daltonizer_shortcut_title);
+                        rawData.add(shortcutRaw);
+
+                        SearchIndexableRaw mainSwitchRaw = new SearchIndexableRaw(context);
+                        mainSwitchRaw.key = KEY_SWITCH_PREFERENCE;
+                        mainSwitchRaw.title = context.getString(
+                                R.string.accessibility_daltonizer_primary_switch_title);
+                        rawData.add(mainSwitchRaw);
+                    }
+                    return rawData;
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 9c61e5c3305..65a1cd4b532 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -17,10 +17,9 @@
 package com.android.settings.accessibility;
 
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
-import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
 import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
+import static com.android.settings.accessibility.AccessibilityUtil.getShortcutSummaryList;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -34,7 +33,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
-import android.icu.text.CaseMap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -59,14 +57,12 @@ import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
-import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.flags.Flags;
-import com.android.settings.utils.LocaleUtils;
 import com.android.settings.widget.SettingsMainSwitchBar;
 import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.widget.IllustrationPreference;
@@ -76,7 +72,7 @@ import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Set;
 
 /**
  * Base class for accessibility fragments with toggle, shortcut, some helper functions
@@ -88,7 +84,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
     public static final String KEY_GENERAL_CATEGORY = "general_categories";
     public static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     protected static final String KEY_TOP_INTRO_PREFERENCE = "top_intro";
-    protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";
     protected static final String KEY_HTML_DESCRIPTION_PREFERENCE = "html_description";
     protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow";
     protected static final String KEY_SAVED_QS_TOOLTIP_TYPE = "qs_tooltip_type";
@@ -110,7 +105,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
     protected Intent mSettingsIntent;
     // The mComponentName maybe null, such as Magnify
     protected ComponentName mComponentName;
-    protected CharSequence mPackageName;
+    protected CharSequence mFeatureName;
     protected Uri mImageUri;
     protected CharSequence mHtmlDescription;
     protected CharSequence mTopIntroTitle;
@@ -173,9 +168,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         final List<String> shortcutFeatureKeys = new ArrayList<>();
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
         shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
-        }
+        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
         return shortcutFeatureKeys;
     }
 
@@ -212,12 +205,12 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
                     mDialog = AccessibilityShortcutsTutorial
                             .createAccessibilityTutorialDialogForSetupWizard(
                                     getPrefContext(), getUserPreferredShortcutTypes(),
-                                    this::callOnTutorialDialogButtonClicked, mPackageName);
+                                    this::callOnTutorialDialogButtonClicked, mFeatureName);
                 } else {
                     mDialog = AccessibilityShortcutsTutorial
                             .createAccessibilityTutorialDialog(
                                     getPrefContext(), getUserPreferredShortcutTypes(),
-                                    this::callOnTutorialDialogButtonClicked, mPackageName);
+                                    this::callOnTutorialDialogButtonClicked, mFeatureName);
                 }
                 mDialog.setCanceledOnTouchOutside(false);
                 return mDialog;
@@ -326,12 +319,16 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
 
     protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         final CharSequence title =
-                getString(R.string.accessibility_service_primary_switch_title, mPackageName);
+                getString(R.string.accessibility_service_primary_switch_title, mFeatureName);
         switchPreference.setTitle(title);
     }
 
+    protected String getUseServicePreferenceKey() {
+        return "use_service";
+    }
+
     protected CharSequence getShortcutTitle() {
-        return getString(R.string.accessibility_shortcut_title, mPackageName);
+        return getString(R.string.accessibility_shortcut_title, mFeatureName);
     }
 
     protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
@@ -416,7 +413,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         final List<String> lists = new ArrayList<>();
         lists.add(KEY_TOP_INTRO_PREFERENCE);
         lists.add(KEY_ANIMATED_IMAGE);
-        lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(getUseServicePreferenceKey());
         lists.add(KEY_GENERAL_CATEGORY);
         lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
         return lists;
@@ -481,7 +478,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
 
     private void initToggleServiceSwitchPreference() {
         mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(getPrefContext());
-        mToggleServiceSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+        mToggleServiceSwitchPreference.setKey(getUseServicePreferenceKey());
         if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
             final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
             mToggleServiceSwitchPreference.setChecked(enabled);
@@ -577,7 +574,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         screen.addPreference(mHtmlFooterPreference);
 
         // TODO(b/171272809): Migrate to DashboardFragment.
-        final String title = getString(R.string.accessibility_introduction_title, mPackageName);
+        final String title = getString(R.string.accessibility_introduction_title, mFeatureName);
         mFooterPreferenceController = new AccessibilityFooterPreferenceController(
                 screen.getContext(), mHtmlFooterPreference.getKey());
         mFooterPreferenceController.setIntroductionTitle(title);
@@ -602,7 +599,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
     private void initFooterPreference() {
         if (!TextUtils.isEmpty(mDescription)) {
             createFooterPreference(getPreferenceScreen(), mDescription,
-                    getString(R.string.accessibility_introduction_title, mPackageName));
+                    getString(R.string.accessibility_introduction_title, mFeatureName));
         }
     }
 
@@ -627,10 +624,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         mFooterPreferenceController.displayPreference(screen);
     }
 
-    private boolean hasShortcutType(int value, @UserShortcutType int type) {
-        return (value & type) == type;
-    }
-
     protected CharSequence getShortcutTypeSummary(Context context) {
         if (!mShortcutPreference.isSettingsEditable()) {
             return context.getText(R.string.accessibility_shortcut_edit_dialog_title_hardware);
@@ -640,47 +633,9 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
             return context.getText(R.string.accessibility_shortcut_state_off);
         }
 
-        // LINT.IfChange(shortcut_type_ui_order)
         final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(
                 context, mComponentName.flattenToString(), getDefaultShortcutTypes());
-
-        final List<CharSequence> list = new ArrayList<>();
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (hasShortcutType(shortcutTypes, QUICK_SETTINGS)) {
-                final CharSequence qsTitle = context.getText(
-                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
-                list.add(qsTitle);
-            }
-        }
-        if (hasShortcutType(shortcutTypes, SOFTWARE)) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-        if (hasShortcutType(shortcutTypes, HARDWARE)) {
-            final CharSequence hardwareTitle = context.getText(
-                    R.string.accessibility_shortcut_hardware_keyword);
-            list.add(hardwareTitle);
-        }
-        // LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
-
-        // Show software shortcut if first time to use.
-        if (list.isEmpty()) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-
-        return CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(), /* iter= */
-                null, LocaleUtils.getConcatenatedString(list));
-    }
-
-    private static CharSequence getSoftwareShortcutTypeSummary(Context context) {
-        int resId;
-        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
-            resId = R.string.accessibility_shortcut_edit_summary_software;
-        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = R.string.accessibility_shortcut_edit_summary_software_gesture;
-        } else {
-            resId = R.string.accessibility_shortcut_edit_summary_software;
-        }
-        return context.getText(resId);
+        return getShortcutSummaryList(context, shortcutTypes);
     }
 
     /**
@@ -731,13 +686,12 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         }
 
         final int shortcutTypes = getUserPreferredShortcutTypes();
-        if (preference.isChecked()) {
-            AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
-                    mComponentName);
+        final boolean isChecked = preference.isChecked();
+        getPrefContext().getSystemService(AccessibilityManager.class).enableShortcutsForTargets(
+                isChecked, shortcutTypes,
+                Set.of(mComponentName.flattenToString()), getPrefContext().getUserId());
+        if (isChecked) {
             showDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
-        } else {
-            AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), shortcutTypes,
-                    mComponentName);
         }
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
@@ -794,44 +748,13 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         showQuickSettingsTooltipIfNeeded();
     }
 
+    /**
+     * @deprecated made obsolete by quick settings rollout.
+     *
+     * (TODO 367414968: finish removal.)
+     */
+    @Deprecated
     private void showQuickSettingsTooltipIfNeeded() {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            // Don't show Quick Settings tooltip
-            return;
-        }
-        final ComponentName tileComponentName = getTileComponentName();
-        if (tileComponentName == null) {
-            // Returns if no tile service assigned.
-            return;
-        }
-
-        Activity activity = getActivity();
-        if (activity != null && WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
-            // Don't show QuickSettingsTooltip in Setup Wizard
-            return;
-        }
-
-        if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences(
-                getContext(), tileComponentName)) {
-            // Returns if quick settings tooltip only show once.
-            return;
-        }
-
-        final CharSequence content = getTileTooltipContent(mNeedsQSTooltipType);
-        if (TextUtils.isEmpty(content)) {
-            // Returns if no content of tile tooltip assigned.
-            return;
-        }
-
-        final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.drawable.accessibility_qs_tooltip_illustration
-                : R.drawable.accessibility_auto_added_qs_tooltip_illustration;
-        mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext());
-        mTooltipWindow.setup(content, imageResId);
-        mTooltipWindow.showAtTopCenter(getView());
-        AccessibilityQuickSettingUtils.optInValueToSharedPreferences(getContext(),
-                tileComponentName);
-        mNeedsQSTooltipReshow = false;
     }
 
     /** Returns user visible name of the tile by given {@link ComponentName}. */
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index 2f7005cbc6c..16911f6abb8 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -32,6 +32,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.TwoStatePreference;
 
@@ -41,6 +42,7 @@ import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +54,10 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
     private static final String TAG = "ToggleReduceBrightColorsPreferenceFragment";
     private static final String KEY_INTENSITY = "rbc_intensity";
     private static final String KEY_PERSIST = "rbc_persist";
+    @VisibleForTesting
+    static final String KEY_SHORTCUT = "rbc_shortcut";
+    @VisibleForTesting
+    static final String KEY_SWITCH = "rbc_switch";
     private static final String REDUCE_BRIGHT_COLORS_ACTIVATED_KEY =
             Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED;
 
@@ -78,7 +84,7 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
                 .appendPath(String.valueOf(R.raw.a11y_extra_dim_banner))
                 .build();
         mComponentName = REDUCE_BRIGHT_COLORS_COMPONENT_NAME;
-        mPackageName = getText(R.string.reduce_bright_colors_preference_title);
+        mFeatureName = getText(R.string.reduce_bright_colors_preference_title);
         mHtmlDescription = getText(R.string.reduce_bright_colors_preference_subtitle);
         mTopIntroTitle = getText(R.string.reduce_bright_colors_preference_intro_text);
         mRbcIntensityPreferenceController =
@@ -197,11 +203,43 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
         }
     }
 
+    @Override
+    protected String getUseServicePreferenceKey() {
+        return KEY_SWITCH;
+    }
+
+    @Override
+    protected String getShortcutPreferenceKey() {
+        return KEY_SHORTCUT;
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.reduce_bright_colors_settings) {
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
                     return ColorDisplayManager.isReduceBrightColorsAvailable(context);
                 }
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final List<SearchIndexableRaw> rawData =
+                            super.getRawDataToIndex(context, enabled);
+
+                    if (Flags.fixA11ySettingsSearch()) {
+                        SearchIndexableRaw shortcutRaw = new SearchIndexableRaw(context);
+                        shortcutRaw.key = KEY_SHORTCUT;
+                        shortcutRaw.title = context.getString(
+                                R.string.reduce_bright_colors_shortcut_title);
+                        rawData.add(shortcutRaw);
+
+                        SearchIndexableRaw mainSwitchRaw = new SearchIndexableRaw(context);
+                        mainSwitchRaw.key = KEY_SWITCH;
+                        mainSwitchRaw.title = context.getString(
+                                R.string.reduce_bright_colors_switch_title);
+                        rawData.add(mainSwitchRaw);
+                    }
+                    return rawData;
+                }
             };
 }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index a030a0a9e77..73b31c33d6f 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -19,6 +19,7 @@ package com.android.settings.accessibility;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.GESTURE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
@@ -27,6 +28,7 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh
 import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
 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.getShortcutSummaryList;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -34,7 +36,6 @@ import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.icu.text.CaseMap;
 import android.icu.text.MessageFormat;
 import android.net.Uri;
 import android.os.Bundle;
@@ -53,36 +54,41 @@ import androidx.annotation.StringRes;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.SwitchPreferenceCompat;
-import androidx.preference.TwoStatePreference;
 
 import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
+import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.accessibility.Flags;
 import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
-import com.android.settings.utils.LocaleUtils;
+import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.SearchIndexableRaw;
 import com.android.settingslib.widget.IllustrationPreference;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
-import java.util.StringJoiner;
+import java.util.stream.Stream;
 
 /**
  * Fragment that shows the actual UI for providing basic magnification accessibility service setup
  * and does not have toggle bar to turn on service to use.
  */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ToggleScreenMagnificationPreferenceFragment extends
         ToggleFeaturePreferenceFragment implements
         MagnificationModePreferenceController.DialogHelper {
 
     private static final String TAG = "ToggleScreenMagnificationPreferenceFragment";
+    @VisibleForTesting
+    static final String KEY_MAGNIFICATION_SHORTCUT_PREFERENCE = "magnification_shortcut_preference";
     private static final char COMPONENT_NAME_SEPARATOR = ':';
     private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
             new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
@@ -106,7 +112,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        mPackageName = getString(R.string.accessibility_screen_magnification_title);
+        mFeatureName = getString(R.string.accessibility_screen_magnification_title);
         mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
                 .authority(getPrefContext().getPackageName())
                 .appendPath(String.valueOf(R.raw.a11y_magnification_banner))
@@ -181,38 +187,29 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         }
     }
 
+    private static boolean isWindowMagnificationSupported(Context context) {
+        return context.getResources().getBoolean(
+                com.android.internal.R.bool.config_magnification_area)
+                && context.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_WINDOW_MAGNIFICATION);
+    }
+
     @Override
     protected void initSettingsPreference() {
         // If the device doesn't support window magnification feature, it should hide the
         // settings preference.
-        final boolean supportWindowMagnification =
-                getContext().getResources().getBoolean(
-                        com.android.internal.R.bool.config_magnification_area)
-                        && getContext().getPackageManager().hasSystemFeature(
-                        PackageManager.FEATURE_WINDOW_MAGNIFICATION);
-        if (!supportWindowMagnification) {
+        if (!isWindowMagnificationSupported(getContext())) {
             return;
         }
-        mSettingsPreference = new Preference(getPrefContext());
-        mSettingsPreference.setTitle(R.string.accessibility_magnification_mode_title);
-        mSettingsPreference.setKey(MagnificationModePreferenceController.PREF_KEY);
-        mSettingsPreference.setPersistent(false);
 
         final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
-        generalCategory.addPreference(mSettingsPreference);
-
-        final MagnificationModePreferenceController magnificationModePreferenceController =
-                new MagnificationModePreferenceController(getContext(),
-                        MagnificationModePreferenceController.PREF_KEY);
-        magnificationModePreferenceController.setDialogHelper(this);
-        getSettingsLifecycle().addObserver(magnificationModePreferenceController);
-        magnificationModePreferenceController.displayPreference(getPreferenceScreen());
-        addPreferenceController(magnificationModePreferenceController);
-
+        // LINT.IfChange(preference_list)
+        addMagnificationModeSetting(generalCategory);
         addFollowTypingSetting(generalCategory);
         addOneFingerPanningSetting(generalCategory);
         addAlwaysOnSetting(generalCategory);
         addJoystickSetting(generalCategory);
+        // LINT.ThenChange(search_data)
     }
 
     @Override
@@ -233,22 +230,44 @@ public class ToggleScreenMagnificationPreferenceFragment extends
                 && !Flags.enableMagnificationOneFingerPanningGesture()) {
             String summary = MessageFormat.format(
                     context.getString(R.string.accessibility_screen_magnification_summary),
-                            new Object[]{1, 2, 3, 4, 5});
+                    new Object[]{1, 2, 3, 4, 5});
             arguments.putCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, summary);
         }
 
         super.onProcessArguments(arguments);
     }
 
+    private static Preference createMagnificationModePreference(Context context) {
+        final Preference pref = new Preference(context);
+        pref.setTitle(R.string.accessibility_magnification_mode_title);
+        pref.setKey(MagnificationModePreferenceController.PREF_KEY);
+        pref.setPersistent(false);
+        return pref;
+    }
+
+    private void addMagnificationModeSetting(PreferenceCategory generalCategory) {
+        mSettingsPreference = createMagnificationModePreference(getPrefContext());
+        generalCategory.addPreference(mSettingsPreference);
+
+        final MagnificationModePreferenceController magnificationModePreferenceController =
+                new MagnificationModePreferenceController(getContext(),
+                        MagnificationModePreferenceController.PREF_KEY);
+        magnificationModePreferenceController.setDialogHelper(this);
+        getSettingsLifecycle().addObserver(magnificationModePreferenceController);
+        magnificationModePreferenceController.displayPreference(getPreferenceScreen());
+        addPreferenceController(magnificationModePreferenceController);
+    }
+
+    private static Preference createFollowTypingPreference(Context context) {
+        final Preference pref = new SwitchPreferenceCompat(context);
+        pref.setTitle(R.string.accessibility_screen_magnification_follow_typing_title);
+        pref.setSummary(R.string.accessibility_screen_magnification_follow_typing_summary);
+        pref.setKey(MagnificationFollowTypingPreferenceController.PREF_KEY);
+        return pref;
+    }
+
     private void addFollowTypingSetting(PreferenceCategory generalCategory) {
-        var followingTypingSwitchPreference = new SwitchPreferenceCompat(getPrefContext());
-        followingTypingSwitchPreference.setTitle(
-                R.string.accessibility_screen_magnification_follow_typing_title);
-        followingTypingSwitchPreference.setSummary(
-                R.string.accessibility_screen_magnification_follow_typing_summary);
-        followingTypingSwitchPreference.setKey(
-                MagnificationFollowTypingPreferenceController.PREF_KEY);
-        generalCategory.addPreference(followingTypingSwitchPreference);
+        generalCategory.addPreference(createFollowTypingPreference(getPrefContext()));
 
         var followTypingPreferenceController = new MagnificationFollowTypingPreferenceController(
                 getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY);
@@ -257,8 +276,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         addPreferenceController(followTypingPreferenceController);
     }
 
-    private boolean isAlwaysOnSettingEnabled() {
-        final boolean defaultValue = getContext().getResources().getBoolean(
+    private static boolean isAlwaysOnSupported(Context context) {
+        final boolean defaultValue = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_magnification_always_on_enabled);
 
         return DeviceConfig.getBoolean(
@@ -268,19 +287,21 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         );
     }
 
+    private static Preference createAlwaysOnPreference(Context context) {
+        final Preference pref = new SwitchPreferenceCompat(context);
+        pref.setTitle(R.string.accessibility_screen_magnification_always_on_title);
+        pref.setSummary(R.string.accessibility_screen_magnification_always_on_summary);
+        pref.setKey(MagnificationAlwaysOnPreferenceController.PREF_KEY);
+        return pref;
+    }
+
     private void addAlwaysOnSetting(PreferenceCategory generalCategory) {
-        if (!isAlwaysOnSettingEnabled()) {
+        if (!isAlwaysOnSupported(getContext())) {
             return;
         }
 
-        var alwaysOnPreference = new SwitchPreferenceCompat(getPrefContext());
-        alwaysOnPreference.setTitle(
-                R.string.accessibility_screen_magnification_always_on_title);
-        alwaysOnPreference.setSummary(
-                R.string.accessibility_screen_magnification_always_on_summary);
-        alwaysOnPreference.setKey(
-                MagnificationAlwaysOnPreferenceController.PREF_KEY);
-        generalCategory.addPreference(alwaysOnPreference);
+        final Preference pref = createAlwaysOnPreference(getPrefContext());
+        generalCategory.addPreference(pref);
 
         var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(
                 getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
@@ -290,17 +311,24 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         addPreferenceController(alwaysOnPreferenceController);
     }
 
+    private static Preference createOneFingerPanningPreference(Context context) {
+        final Preference pref = new SwitchPreferenceCompat(context);
+        pref.setTitle(R.string.accessibility_magnification_one_finger_panning_title);
+        pref.setKey(MagnificationOneFingerPanningPreferenceController.PREF_KEY);
+        return pref;
+    }
+
+    private static boolean isOneFingerPanningSupported() {
+        return Flags.enableMagnificationOneFingerPanningGesture();
+    }
+
     private void addOneFingerPanningSetting(PreferenceCategory generalCategory) {
-        if (!Flags.enableMagnificationOneFingerPanningGesture()) {
+        if (!isOneFingerPanningSupported()) {
             return;
         }
 
-        var oneFingerPanningPreference = new SwitchPreferenceCompat(getPrefContext());
-        oneFingerPanningPreference.setTitle(
-                R.string.accessibility_magnification_one_finger_panning_title);
-        oneFingerPanningPreference.setKey(
-                MagnificationOneFingerPanningPreferenceController.PREF_KEY);
-        generalCategory.addPreference(oneFingerPanningPreference);
+        final Preference pref = createOneFingerPanningPreference(getPrefContext());
+        generalCategory.addPreference(pref);
 
         mOneFingerPanningPreferenceController =
                 new MagnificationOneFingerPanningPreferenceController(getContext());
@@ -310,23 +338,28 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         addPreferenceController(mOneFingerPanningPreferenceController);
     }
 
-    private void addJoystickSetting(PreferenceCategory generalCategory) {
-        if (!DeviceConfig.getBoolean(
+    private static Preference createJoystickPreference(Context context) {
+        final Preference pref = new SwitchPreferenceCompat(context);
+        pref.setTitle(R.string.accessibility_screen_magnification_joystick_title);
+        pref.setSummary(R.string.accessibility_screen_magnification_joystick_summary);
+        pref.setKey(MagnificationJoystickPreferenceController.PREF_KEY);
+        return pref;
+    }
+
+    private static boolean isJoystickSupported() {
+        return DeviceConfig.getBoolean(
                 DeviceConfig.NAMESPACE_WINDOW_MANAGER,
                 "MagnificationJoystick__enable_magnification_joystick",
-                false
-        )) {
+                false);
+    }
+
+    private void addJoystickSetting(PreferenceCategory generalCategory) {
+        if (!isJoystickSupported()) {
             return;
         }
 
-        TwoStatePreference joystickPreference = new SwitchPreferenceCompat(getPrefContext());
-        joystickPreference.setTitle(
-                R.string.accessibility_screen_magnification_joystick_title);
-        joystickPreference.setSummary(
-                R.string.accessibility_screen_magnification_joystick_summary);
-        joystickPreference.setKey(
-                MagnificationJoystickPreferenceController.PREF_KEY);
-        generalCategory.addPreference(joystickPreference);
+        final Preference pref = createJoystickPreference(getPrefContext());
+        generalCategory.addPreference(pref);
 
         MagnificationJoystickPreferenceController joystickPreferenceController =
                 new MagnificationJoystickPreferenceController(
@@ -348,31 +381,15 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         mDialogDelegate = delegate;
     }
 
-    private boolean hasShortcutType(int value, @UserShortcutType int type) {
-        return (value & type) == type;
-    }
-
-    private static CharSequence getSoftwareShortcutTypeSummary(Context context) {
-        int resId;
-        if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
-            resId = R.string.accessibility_shortcut_edit_summary_software;
-        } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = R.string.accessibility_shortcut_edit_summary_software_gesture;
-        } else {
-            resId = R.string.accessibility_shortcut_edit_summary_software;
-        }
-        return context.getText(resId);
-    }
-
     @Override
     protected void registerKeysToObserverCallback(
             AccessibilitySettingsContentObserver contentObserver) {
         super.registerKeysToObserverCallback(contentObserver);
 
         var keysToObserve = List.of(
-            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
-            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
-            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED
         );
         contentObserver.registerKeysToObserverCallback(keysToObserve,
                 key -> updatePreferencesState());
@@ -423,47 +440,9 @@ public class ToggleScreenMagnificationPreferenceFragment extends
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
-                MAGNIFICATION_CONTROLLER_NAME);
-
-        // LINT.IfChange(shortcut_type_ui_order)
-        final List<CharSequence> list = new ArrayList<>();
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (hasShortcutType(shortcutTypes, QUICK_SETTINGS)) {
-                final CharSequence qsTitle = context.getText(
-                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
-                list.add(qsTitle);
-            }
-        }
-        if (hasShortcutType(shortcutTypes, SOFTWARE)) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-        if (hasShortcutType(shortcutTypes, HARDWARE)) {
-            final CharSequence hardwareTitle = context.getText(
-                    R.string.accessibility_shortcut_hardware_keyword);
-            list.add(hardwareTitle);
-        }
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (hasShortcutType(shortcutTypes, TWOFINGER_DOUBLETAP)) {
-                final CharSequence twoFingerDoubleTapTitle = context.getString(
-                        R.string.accessibility_shortcut_two_finger_double_tap_keyword, 2);
-                list.add(twoFingerDoubleTapTitle);
-            }
-        }
-        if (hasShortcutType(shortcutTypes, TRIPLETAP)) {
-            final CharSequence tripleTapTitle = context.getText(
-                    R.string.accessibility_shortcut_triple_tap_keyword);
-            list.add(tripleTapTitle);
-        }
-        // LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
-
-        // Show software shortcut if first time to use.
-        if (list.isEmpty()) {
-            list.add(getSoftwareShortcutTypeSummary(context));
-        }
-
-        return CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(), /* iter= */
-                null, LocaleUtils.getConcatenatedString(list));
+        return getShortcutSummaryList(context,
+                PreferredShortcuts.retrieveUserShortcutType(context,
+                        MAGNIFICATION_CONTROLLER_NAME));
     }
 
     @Override
@@ -571,6 +550,11 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         generalCategory.addPreference(mShortcutPreference);
     }
 
+    @Override
+    protected String getShortcutPreferenceKey() {
+        return KEY_MAGNIFICATION_SHORTCUT_PREFERENCE;
+    }
+
     @Override
     protected CharSequence getShortcutTitle() {
         return getText(R.string.accessibility_screen_magnification_shortcut_title);
@@ -595,76 +579,38 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
             optInMagnificationValueToSettings(context, TRIPLETAP);
         }
+        if (((shortcutTypes & GESTURE) == GESTURE)) {
+            optInMagnificationValueToSettings(context, GESTURE);
+        }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
             if (((shortcutTypes & TWOFINGER_DOUBLETAP)
                     == TWOFINGER_DOUBLETAP)) {
                 optInMagnificationValueToSettings(context, TWOFINGER_DOUBLETAP);
             }
         }
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (((shortcutTypes & QUICK_SETTINGS)
-                    == QUICK_SETTINGS)) {
-                optInMagnificationValueToSettings(context, QUICK_SETTINGS);
-            }
+        if (((shortcutTypes & QUICK_SETTINGS)
+                == QUICK_SETTINGS)) {
+            optInMagnificationValueToSettings(context, QUICK_SETTINGS);
         }
     }
 
+    /**
+     * @deprecated use
+     * {@link AccessibilityManager#enableShortcutsForTargets(boolean, int, Set, int)} instead.
+     *
+     * (TODO 367414968: finish removal.)
+     */
+    @Deprecated
     private static void optInMagnificationValueToSettings(
             Context context, @UserShortcutType int shortcutType) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ true,
-                        shortcutType,
-                        Set.of(MAGNIFICATION_CONTROLLER_NAME),
-                        UserHandle.myUserId()
-                );
-            }
-            return;
-        }
-
-        if (shortcutType == TRIPLETAP) {
-            Settings.Secure.putInt(context.getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
-            return;
-        }
-
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (shortcutType == TWOFINGER_DOUBLETAP) {
-                Settings.Secure.putInt(
-                        context.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
-                        ON);
-                return;
-            }
-        }
-
-        if (hasMagnificationValueInSettings(context, shortcutType)) {
-            return;
-        }
-
-        final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
-        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(context.getContentResolver(), targetKey, joiner.toString());
-        // The size setting defaults to unknown. If the user has ever manually changed the size
-        // before, we do not automatically change it.
-        if (shortcutType == SOFTWARE
-                && Settings.Secure.getInt(context.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                FloatingMenuSizePreferenceController.Size.UNKNOWN)
-                == FloatingMenuSizePreferenceController.Size.UNKNOWN) {
-            Settings.Secure.putInt(context.getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                    FloatingMenuSizePreferenceController.Size.LARGE);
+        AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+        if (a11yManager != null) {
+            a11yManager.enableShortcutsForTargets(
+                    /* enable= */ true,
+                    shortcutType,
+                    Set.of(MAGNIFICATION_CONTROLLER_NAME),
+                    UserHandle.myUserId()
+            );
         }
     }
 
@@ -680,94 +626,58 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
             optOutMagnificationValueFromSettings(context, TRIPLETAP);
         }
+        if (((shortcutTypes & GESTURE) == GESTURE)) {
+            optOutMagnificationValueFromSettings(context, GESTURE);
+        }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
             if (((shortcutTypes & TWOFINGER_DOUBLETAP)
                     == TWOFINGER_DOUBLETAP)) {
                 optOutMagnificationValueFromSettings(context, TWOFINGER_DOUBLETAP);
             }
         }
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            if (((shortcutTypes & QUICK_SETTINGS)
+        if (((shortcutTypes & QUICK_SETTINGS)
                     == QUICK_SETTINGS)) {
-                optOutMagnificationValueFromSettings(context, QUICK_SETTINGS);
-            }
+            optOutMagnificationValueFromSettings(context, QUICK_SETTINGS);
         }
     }
 
+    /**
+     * @deprecated use
+     * {@link AccessibilityManager#enableShortcutsForTargets(boolean, int, Set, int)} instead.
+     *
+     * (TODO 367414968: finish removal.)
+     */
+    @Deprecated
     private static void optOutMagnificationValueFromSettings(Context context,
             @UserShortcutType int shortcutType) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(
-                        /* enable= */ false,
-                        shortcutType,
-                        Set.of(MAGNIFICATION_CONTROLLER_NAME),
-                        UserHandle.myUserId()
-                );
-            }
-            return;
+        AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+        if (a11yManager != null) {
+            a11yManager.enableShortcutsForTargets(
+                    /* enable= */ false,
+                    shortcutType,
+                    Set.of(MAGNIFICATION_CONTROLLER_NAME),
+                    UserHandle.myUserId()
+            );
         }
-
-        if (shortcutType == TRIPLETAP) {
-            Settings.Secure.putInt(context.getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
-            return;
-        }
-
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (shortcutType == TWOFINGER_DOUBLETAP) {
-                Settings.Secure.putInt(
-                        context.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
-                        OFF);
-                return;
-            }
-        }
-
-        final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
-
-        if (TextUtils.isEmpty(targetString)) {
-            return;
-        }
-
-        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-
-        sStringColonSplitter.setString(targetString);
-        while (sStringColonSplitter.hasNext()) {
-            final String name = sStringColonSplitter.next();
-            if (TextUtils.isEmpty(name) || MAGNIFICATION_CONTROLLER_NAME.equals(name)) {
-                continue;
-            }
-            joiner.add(name);
-        }
-
-        Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
     }
 
     @VisibleForTesting
     static boolean hasMagnificationValuesInSettings(Context context, int shortcutTypes) {
-        boolean exist = false;
-
-        if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
-            exist = hasMagnificationValueInSettings(context, SOFTWARE);
-        }
-        if (((shortcutTypes & HARDWARE) == HARDWARE)) {
-            exist |= hasMagnificationValueInSettings(context, HARDWARE);
-        }
-        if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
-            exist |= hasMagnificationValueInSettings(context, TRIPLETAP);
-        }
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (((shortcutTypes & TWOFINGER_DOUBLETAP)
-                    == TWOFINGER_DOUBLETAP)) {
-                exist |= hasMagnificationValueInSettings(context,
-                        TWOFINGER_DOUBLETAP);
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if ((shortcutTypes & shortcutType) == 0) {
+                continue;
+            }
+            if (((shortcutType & TWOFINGER_DOUBLETAP)
+                    == TWOFINGER_DOUBLETAP)
+                    && !Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
+                continue;
+            }
+            if (hasMagnificationValueInSettings(context, shortcutType)) {
+                return true;
             }
         }
-        return exist;
+
+        return false;
     }
 
     private static boolean hasMagnificationValueInSettings(Context context,
@@ -776,7 +686,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends
             return Settings.Secure.getInt(context.getContentResolver(),
                     Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
         }
-
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
             if (shortcutType == TWOFINGER_DOUBLETAP) {
                 return Settings.Secure.getInt(context.getContentResolver(),
@@ -803,22 +712,21 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         return false;
     }
 
+    /**
+     * @deprecated use
+     * {@link ShortcutUtils#getEnabledShortcutTypes(Context, String)} instead.
+     *
+     * (TODO 367414968: finish removal.)
+     */
+    @Deprecated
     private static int getUserShortcutTypeFromSettings(Context context) {
         int shortcutTypes = DEFAULT;
-        if (hasMagnificationValuesInSettings(context, SOFTWARE)) {
-            shortcutTypes |= SOFTWARE;
-        }
-        if (hasMagnificationValuesInSettings(context, HARDWARE)) {
-            shortcutTypes |= HARDWARE;
-        }
-        if (hasMagnificationValuesInSettings(context, TRIPLETAP)) {
-            shortcutTypes |= TRIPLETAP;
-        }
-        if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (hasMagnificationValuesInSettings(context, TWOFINGER_DOUBLETAP)) {
-                shortcutTypes |= TWOFINGER_DOUBLETAP;
+        for (int shortcutType : AccessibilityUtil.SHORTCUTS_ORDER_IN_UI) {
+            if (hasMagnificationValueInSettings(context, shortcutType)) {
+                shortcutTypes |= shortcutType;
             }
         }
+
         return shortcutTypes;
     }
 
@@ -832,8 +740,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         final int userShortcutType = getUserShortcutTypeFromSettings(context);
         final CharSequence featureState =
                 (userShortcutType != DEFAULT)
-                ? context.getText(R.string.accessibility_summary_shortcut_enabled)
-                : context.getText(R.string.generic_accessibility_feature_shortcut_off);
+                        ? context.getText(R.string.accessibility_summary_shortcut_enabled)
+                        : context.getText(R.string.generic_accessibility_feature_shortcut_off);
         final CharSequence featureSummary = context.getText(R.string.magnification_feature_summary);
         return context.getString(
                 com.android.settingslib.R.string.preference_summary_default_combination,
@@ -845,4 +753,81 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         return PreferredShortcuts.retrieveUserShortcutType(
                 getPrefContext(), MAGNIFICATION_CONTROLLER_NAME);
     }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                // LINT.IfChange(search_data)
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final List<SearchIndexableRaw> rawData =
+                            super.getRawDataToIndex(context, enabled);
+
+                    if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+                        return rawData;
+                    }
+
+                    rawData.add(createShortcutPreferenceSearchData(context));
+                    Stream.of(
+                                    createMagnificationModePreference(context),
+                                    createFollowTypingPreference(context),
+                                    createOneFingerPanningPreference(context),
+                                    createAlwaysOnPreference(context),
+                                    createJoystickPreference(context)
+                            )
+                            .forEach(pref ->
+                                    rawData.add(createPreferenceSearchData(context, pref)));
+                    return rawData;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> niks = super.getNonIndexableKeys(context);
+
+                    if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+                        return niks;
+                    }
+
+                    if (!isWindowMagnificationSupported(context)) {
+                        niks.add(MagnificationModePreferenceController.PREF_KEY);
+                        niks.add(MagnificationFollowTypingPreferenceController.PREF_KEY);
+                        niks.add(MagnificationOneFingerPanningPreferenceController.PREF_KEY);
+                        niks.add(MagnificationAlwaysOnPreferenceController.PREF_KEY);
+                        niks.add(MagnificationJoystickPreferenceController.PREF_KEY);
+                    } else {
+                        if (!isAlwaysOnSupported(context)
+                                // This preference's title "Keep on while switching apps" does not
+                                // mention magnification so it may confuse users who search a term
+                                // like "Keep on".
+                                // So we hide it if the user has no magnification shortcut enabled.
+                                || getUserShortcutTypeFromSettings(context) == DEFAULT) {
+                            niks.add(MagnificationAlwaysOnPreferenceController.PREF_KEY);
+                        }
+                        if (!isOneFingerPanningSupported()) {
+                            niks.add(MagnificationOneFingerPanningPreferenceController.PREF_KEY);
+                        }
+                        if (!isJoystickSupported()) {
+                            niks.add(MagnificationJoystickPreferenceController.PREF_KEY);
+                        }
+                    }
+                    return niks;
+                }
+                // LINT.ThenChange(preference_list)
+
+                private SearchIndexableRaw createPreferenceSearchData(
+                        Context context, Preference pref) {
+                    final SearchIndexableRaw raw = new SearchIndexableRaw(context);
+                    raw.key = pref.getKey();
+                    raw.title = pref.getTitle().toString();
+                    return raw;
+                }
+
+                private SearchIndexableRaw createShortcutPreferenceSearchData(Context context) {
+                    final SearchIndexableRaw raw = new SearchIndexableRaw(context);
+                    raw.key = KEY_MAGNIFICATION_SHORTCUT_PREFERENCE;
+                    raw.title = context.getString(
+                            R.string.accessibility_screen_magnification_shortcut_title);
+                    return raw;
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/VibrationIntensityScreen.kt b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt
new file mode 100644
index 00000000000..0a372308066
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.fragment.app.Fragment
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+/**
+ * Accessibility settings for vibration intensities.
+ */
+// TODO(b/368360218): investigate if we still need this screen once we finish the migration.
+//  We might be able to consolidate this into VibrationScreen with PreferenceHierarchy choosing
+//  between toggle or slider preferences based on device config, depending on how overlays are done.
+// LINT.IfChange
+@ProvidePreferenceScreen
+class VibrationIntensityScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_vibration_settings_title
+
+    override val keywords: Int
+        get() = R.string.keywords_vibration
+
+    override fun isAvailable(context: Context) =
+        context.isVibratorAvailable() && context.getSupportedVibrationIntensityLevels() > 1
+
+    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass(): Class<out Fragment>? =
+        VibrationIntensitySettingsFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +VibrationMainSwitchPreference()
+    }
+
+    companion object {
+        const val KEY = "vibration_intensity_screen"
+    }
+}
+// LINT.ThenChange(VibrationPreferenceController.java)
diff --git a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
index 1d24ec9e2de..328bed94403 100644
--- a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
+++ b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
@@ -25,6 +25,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -90,4 +92,9 @@ public class VibrationIntensitySettingsFragment extends DashboardFragment {
                     return VibrationIntensitySettingsFragment.isPageSearchEnabled(context);
                 }
             };
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return VibrationIntensityScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt b/src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt
new file mode 100644
index 00000000000..70a0033d57a
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.VibrationAttributes
+import android.os.Vibrator
+import android.provider.Settings
+import android.widget.CompoundButton
+import android.widget.CompoundButton.OnCheckedChangeListener
+import com.android.settings.R
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.MainSwitchPreference
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.preference.MainSwitchPreferenceBinding
+
+/**
+ * Accessibility settings for vibration.
+ */
+// LINT.IfChange
+class VibrationMainSwitchPreference : MainSwitchPreference(
+    key = Settings.System.VIBRATE_ON,
+    title = R.string.accessibility_vibration_primary_switch_title,
+), PreferenceLifecycleProvider, OnCheckedChangeListener {
+    override val keywords: Int
+        get() = R.string.keywords_accessibility_vibration_primary_switch
+
+    lateinit var vibrator: Vibrator
+
+    override fun storage(context: Context): KeyValueStore =
+        VibrationMainSwitchToggleStorage(SettingsSystemStore.get(context))
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun onResume(context: PreferenceLifecycleContext) {
+        vibrator = context.getSystemService(Vibrator::class.java)
+        context.findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
+            ?.addOnSwitchChangeListener(this)
+    }
+
+    override fun onPause(context: PreferenceLifecycleContext) {
+        context.findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
+            ?.removeOnSwitchChangeListener(this)
+    }
+
+    override fun onCheckedChanged(button: CompoundButton, isChecked: Boolean) {
+        if (isChecked) {
+            // Play a haptic as preview for the main toggle only when touch feedback is enabled.
+            VibrationPreferenceConfig.playVibrationPreview(
+                vibrator, VibrationAttributes.USAGE_TOUCH
+            )
+        }
+    }
+
+    /** Provides SettingsStore for vibration main switch with custom default value. */
+    @Suppress("UNCHECKED_CAST")
+    private class VibrationMainSwitchToggleStorage(
+        private val settingsStore: SettingsStore,
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(key)
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            DEFAULT_VALUE as T
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (settingsStore.getBoolean(key) ?: DEFAULT_VALUE) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            settingsStore.setBoolean(key, value as Boolean?)
+        }
+    }
+
+    companion object {
+        const val DEFAULT_VALUE = true
+    }
+}
+// LINT.ThenChange(VibrationMainSwitchPreferenceController.java)
diff --git a/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
index 5b553e3df61..0f2fb77a98a 100644
--- a/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
@@ -41,6 +41,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
  * will disable the entire settings screen once the settings is turned OFF. All device haptics will
  * be disabled by this setting, except the flagged alerts and accessibility touch feedback.
  */
+// LINT.IfChange
 public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchPreferenceController
         implements LifecycleObserver, OnStart, OnStop {
 
@@ -106,3 +107,4 @@ public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchP
         return R.string.menu_key_accessibility;
     }
 }
+// LINT.ThenChange(VibrationMainSwitchPreference.kt)
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceController.java b/src/com/android/settings/accessibility/VibrationPreferenceController.java
index 092ff6945d1..e84543db997 100644
--- a/src/com/android/settings/accessibility/VibrationPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationPreferenceController.java
@@ -31,6 +31,7 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.SubSettingLauncher;
 
 /** Controller for "Vibration & haptics" settings page. */
+// LINT.IfChange
 public class VibrationPreferenceController extends BasePreferenceController {
 
     private final boolean mHasVibrator;
@@ -79,3 +80,7 @@ public class VibrationPreferenceController extends BasePreferenceController {
 
 
 }
+// LINT.ThenChange(
+//     VibrationIntensityScreenTest.kt,
+//     VibrationScreenTest.kt,
+// )
diff --git a/src/com/android/settings/accessibility/VibrationScreen.kt b/src/com/android/settings/accessibility/VibrationScreen.kt
new file mode 100644
index 00000000000..63a7c4492a1
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationScreen.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Vibrator
+import androidx.fragment.app.Fragment
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+/**
+ * Accessibility settings for vibration.
+ */
+// LINT.IfChange
+@ProvidePreferenceScreen
+class VibrationScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_vibration_settings_title
+
+    override val keywords: Int
+        get() = R.string.keywords_vibration
+
+    override fun isAvailable(context: Context) =
+        context.isVibratorAvailable() && context.getSupportedVibrationIntensityLevels() == 1
+
+    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass(): Class<out Fragment>? = VibrationSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +VibrationMainSwitchPreference()
+    }
+
+    companion object {
+        const val KEY = "vibration_screen"
+    }
+}
+
+/** Returns true if the device has a system vibrator, false otherwise. */
+fun Context.isVibratorAvailable(): Boolean =
+    getSystemService(Vibrator::class.java).hasVibrator()
+
+/** Returns the number of vibration intensity levels supported by this device. */
+fun Context.getSupportedVibrationIntensityLevels(): Int =
+    resources.getInteger(R.integer.config_vibration_supported_intensity_levels)
+
+// LINT.ThenChange(VibrationPreferenceController.java)
diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java
index 48393d9394c..11e1ddde5b4 100644
--- a/src/com/android/settings/accessibility/VibrationSettings.java
+++ b/src/com/android/settings/accessibility/VibrationSettings.java
@@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Vibrator;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -35,6 +37,11 @@ public class VibrationSettings extends DashboardFragment {
 
     private static final String TAG = "VibrationSettings";
 
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return VibrationScreen.KEY;
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.ACCESSIBILITY_VIBRATION;
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index 11aa56591a8..b74e5d70bea 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -55,8 +55,8 @@ public class VolumeShortcutToggleAccessibilityServicePreferenceFragment extends
         final boolean isServiceOn =
                 getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-        final boolean hasRequestAccessibilityButtonFlag =
-                (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
+        final boolean hasRequestAccessibilityButtonFlag = info != null
+                && (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
         if (hasRequestAccessibilityButtonFlag && isServiceOn) {
             shortcutTypes |= SOFTWARE;
         } else {
diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index d04b34a4c3f..f05b15710c8 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -61,6 +61,7 @@ import com.android.internal.accessibility.dialog.AccessibilityTargetHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.accessibility.AccessibilitySetupWizardUtils;
+import com.android.settings.accessibility.Flags;
 import com.android.settings.accessibility.PreferredShortcuts;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
@@ -201,9 +202,14 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
         super.onCreatePreferences(savedInstanceState, rootKey);
 
         Activity activity = getActivity();
+        final Preference descriptionPref = findPreference(getString(
+                R.string.accessibility_shortcut_description_pref));
 
         if (!activity.getIntent().getAction().equals(
                 Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS)) {
+            if (Flags.toggleFeatureFragmentCollectionInfo()) {
+                descriptionPref.setVisible(false);
+            }
             return;
         }
 
@@ -219,10 +225,11 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
         );
 
         activity.setTitle(titles.first);
-
-        String screenDescriptionPrefKey = getString(
-                R.string.accessibility_shortcut_description_pref);
-        findPreference(screenDescriptionPrefKey).setSummary(titles.second);
+        if (titles.second != null || !Flags.toggleFeatureFragmentCollectionInfo()) {
+            descriptionPref.setSummary(titles.second);
+        } else {
+            descriptionPref.setVisible(false);
+        }
     }
 
     @NonNull
diff --git a/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java
index eeecd1f3050..892ae1ef30d 100644
--- a/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java
@@ -25,7 +25,6 @@ import android.os.UserHandle;
 import android.service.quicksettings.TileService;
 import android.util.ArraySet;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -82,8 +81,7 @@ public class QuickSettingsShortcutOptionController extends ShortcutOptionPrefere
 
     @Override
     protected boolean isShortcutAvailable() {
-        return Flags.a11yQsShortcut()
-                && TileService.isQuickSettingsSupported()
+        return TileService.isQuickSettingsSupported()
                 && allTargetsHasQsTile()
                 && allTargetsHasValidQsTileUseCase();
     }
diff --git a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
index 26855d55bd3..7b61d935e7d 100644
--- a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
+++ b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
@@ -35,7 +35,6 @@ import com.android.settings.R;
 import com.android.settingslib.widget.LottieColorUtils;
 
 import com.airbnb.lottie.LottieAnimationView;
-import com.airbnb.lottie.LottieDrawable;
 
 /**
  * A preference represents an accessibility shortcut option with a checkbox and a tutorial image
@@ -96,7 +95,8 @@ public class ShortcutOptionPreference extends CheckBoxPreference {
                                                 .getResourceEntryName(mIntroImageRawResId),
                                 result));
                 imageView.setAnimation(mIntroImageRawResId);
-                imageView.setRepeatCount(LottieDrawable.INFINITE);
+                // Follow the Motion Stoppable requirement by using a finite animation.
+                imageView.setRepeatCount(0);
                 LottieColorUtils.applyDynamicColors(imageView.getContext(), imageView);
                 imageView.playAnimation();
             } else {
diff --git a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
index defb256c8f5..afb5acf272c 100644
--- a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
+++ b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
@@ -19,7 +19,6 @@ package com.android.settings.accessibility.shortcuts;
 import android.content.Context;
 import android.os.UserHandle;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -111,36 +110,27 @@ public abstract class ShortcutOptionPreferenceController extends BasePreferenceC
         return !targets.isEmpty() && targets.containsAll(getShortcutTargets());
     }
 
+
     /**
      * Enable or disable the shortcut for the given accessibility features.
+     *
+     * @deprecated use
+     * {@link AccessibilityManager#enableShortcutsForTargets(boolean, int, Set, int)} instead.
+     *
+     * (TODO 367414968: finish removal.)
      */
+    @Deprecated
     protected void enableShortcutForTargets(boolean enable) {
         Set<String> shortcutTargets = getShortcutTargets();
         @ShortcutConstants.UserShortcutType int shortcutType = getShortcutType();
 
-        if (Flags.a11yQsShortcut()) {
-            AccessibilityManager a11yManager = mContext.getSystemService(
-                    AccessibilityManager.class);
-            if (a11yManager != null) {
-                a11yManager.enableShortcutsForTargets(enable, shortcutType, shortcutTargets,
-                        UserHandle.myUserId());
-            }
-            return;
+        AccessibilityManager a11yManager = mContext.getSystemService(
+                AccessibilityManager.class);
+        if (a11yManager != null) {
+            a11yManager.enableShortcutsForTargets(enable, shortcutType, shortcutTargets,
+                    UserHandle.myUserId());
         }
-
-        if (enable) {
-            for (String target : shortcutTargets) {
-                ShortcutUtils.optInValueToSettings(mContext, shortcutType, target);
-            }
-        } else {
-            for (String target : shortcutTargets) {
-                ShortcutUtils.optOutValueFromSettings(mContext, shortcutType, target);
-            }
-        }
-        ShortcutUtils.updateInvisibleToggleAccessibilityServiceEnableState(
-                mContext, shortcutTargets, UserHandle.myUserId());
     }
-
     /**
      * Returns true when the user can associate a shortcut to the targets
      */
diff --git a/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java b/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
index 861bebd83ef..3f35d1cf4b8 100644
--- a/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
+++ b/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
@@ -19,14 +19,11 @@ package com.android.settings.accessibility.shortcuts;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 
 import android.content.Context;
-import android.provider.Settings;
 import android.view.View;
-import android.view.accessibility.Flags;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityButtonFragment;
-import com.android.settings.accessibility.FloatingMenuSizePreferenceController;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.utils.AnnotationSpan;
 
@@ -62,26 +59,4 @@ public abstract class SoftwareShortcutOptionPreferenceController
                         R.string.accessibility_shortcut_edit_dialog_summary_software_floating),
                 linkInfo);
     }
-
-    @Override
-    protected void enableShortcutForTargets(boolean enable) {
-        super.enableShortcutForTargets(enable);
-        if (Flags.a11yQsShortcut()) {
-            return;
-        }
-
-        if (enable) {
-            // Update the A11y FAB size to large when the Magnification shortcut is enabled
-            // and the user hasn't changed the floating button size
-            if (isMagnificationInTargets()
-                    && Settings.Secure.getInt(mContext.getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                    FloatingMenuSizePreferenceController.Size.UNKNOWN)
-                    == FloatingMenuSizePreferenceController.Size.UNKNOWN) {
-                Settings.Secure.putInt(mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                        FloatingMenuSizePreferenceController.Size.LARGE);
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
index bdec9a6f290..3f0d80a5966 100644
--- a/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
@@ -20,7 +20,6 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
 
 import android.content.Context;
 import android.provider.Settings;
-import android.view.accessibility.Flags;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -99,17 +98,4 @@ public class TripleTapShortcutOptionController extends ShortcutOptionPreferenceC
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
                 AccessibilityUtil.State.OFF) == AccessibilityUtil.State.ON;
     }
-
-    @Override
-    protected void enableShortcutForTargets(boolean enable) {
-        if (Flags.a11yQsShortcut()) {
-            super.enableShortcutForTargets(enable);
-            return;
-        }
-
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
-                enable ? AccessibilityUtil.State.ON : AccessibilityUtil.State.OFF);
-    }
 }
diff --git a/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
index 26e8386efbc..c88a1ccb1a2 100644
--- a/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
@@ -86,16 +86,4 @@ public class TwoFingerDoubleTapShortcutOptionController
                 Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
                 AccessibilityUtil.State.OFF) == AccessibilityUtil.State.ON;
     }
-
-    @Override
-    protected void enableShortcutForTargets(boolean enable) {
-        if (android.view.accessibility.Flags.a11yQsShortcut()) {
-            super.enableShortcutForTargets(enable);
-            return;
-        }
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
-                enable ? AccessibilityUtil.State.ON : AccessibilityUtil.State.OFF);
-    }
 }
diff --git a/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
index f3da35b66da..eb7b82d389f 100644
--- a/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
@@ -17,14 +17,12 @@
 package com.android.settings.accessibility.shortcuts;
 
 import android.content.Context;
-import android.view.accessibility.Flags;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil;
 
 /**
  * A controller handles displaying the volume keys shortcut option preference and
@@ -61,16 +59,4 @@ public class VolumeKeysShortcutOptionController extends ShortcutOptionPreference
     protected boolean isShortcutAvailable() {
         return true;
     }
-
-    @Override
-    protected void enableShortcutForTargets(boolean enable) {
-        super.enableShortcutForTargets(enable);
-        if (Flags.a11yQsShortcut()) {
-            return;
-        }
-
-        if (enable) {
-            AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(mContext);
-        }
-    }
 }
diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index 3b254e9b844..71c71346adb 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -20,6 +20,7 @@ package com.android.settings.accounts;
 import android.accounts.Account;
 import android.accounts.AuthenticatorDescription;
 import android.content.ClipData;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -186,9 +187,9 @@ public class AccountTypePreferenceLoader {
                                     prefIntent, mUserHandle);
                             } else {
                                 Log.e(TAG,
-                                    "Refusing to launch authenticator intent because"
-                                        + "it exploits Settings permissions: "
-                                        + prefIntent);
+                                        "Refusing to launch authenticator intent because "
+                                                + "it exploits Settings permissions: "
+                                                + prefIntent);
                             }
                             return true;
                         }
@@ -242,13 +243,19 @@ public class AccountTypePreferenceLoader {
     }
 
     /**
-     * Determines if the supplied Intent is safe. A safe intent is one that is
-     * will launch a exported=true activity or owned by the same uid as the
+     * Determines if the supplied Intent is safe. A safe intent is one that
+     * will launch an exported=true activity or owned by the same uid as the
      * authenticator supplying the intent.
      */
-    private boolean isSafeIntent(PackageManager pm, Intent intent, String acccountType) {
+    @VisibleForTesting
+    boolean isSafeIntent(PackageManager pm, Intent intent, String accountType) {
+        if (TextUtils.equals(intent.getScheme(), ContentResolver.SCHEME_CONTENT)) {
+            Log.e(TAG, "Intent with a content scheme is unsafe.");
+            return false;
+        }
+
         AuthenticatorDescription authDesc =
-            mAuthenticatorHelper.getAccountTypeDescription(acccountType);
+                mAuthenticatorHelper.getAccountTypeDescription(accountType);
         ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mUserHandle.getIdentifier());
         if (resolveInfo == null) {
             return false;
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index b38c42c7208..809b32d8731 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -257,9 +257,10 @@ public class ActivityEmbeddingRulesController {
         final FingerprintEnrollActivityClassProvider fpClassProvider = FeatureFactory
                 .getFeatureFactory()
                 .getFingerprintFeatureProvider()
-                .getEnrollActivityClassProvider();
+                .getEnrollActivityClassProvider(mContext);
         addActivityFilter(activityFilters, fpClassProvider.getDefault());
         addActivityFilter(activityFilters, fpClassProvider.getInternal());
+        addActivityFilter(activityFilters, fpClassProvider.getAddAnother());
         addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);
         addActivityFilter(activityFilters, FaceEnrollIntroductionInternal.class);
         addActivityFilter(activityFilters, FaceEnrollIntroduction.class);
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 851d763ea94..62c5910904a 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.applications;
 
-import static android.webkit.Flags.updateServiceV2;
-
 import android.Manifest;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -173,11 +171,9 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
         }
 
         // Keep WebView default package enabled.
-        if (updateServiceV2()) {
-            String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();
-            if (packageName != null) {
-                keepEnabledPackages.add(packageName);
-            }
+        String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();
+        if (packageName != null) {
+            keepEnabledPackages.add(packageName);
         }
 
         keepEnabledPackages.addAll(getEnabledPackageAllowlist());
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
index 0550a9af426..db239aabffc 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
@@ -36,6 +36,7 @@ import static java.lang.Boolean.FALSE;
 import android.app.AppGlobals;
 import android.app.compat.CompatChanges;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.LauncherApps;
@@ -44,6 +45,7 @@ import android.os.RemoteException;
 import android.os.UserHandle;
 import android.provider.DeviceConfig;
 import android.util.ArrayMap;
+import android.util.Log;
 import android.util.SparseIntArray;
 
 import androidx.annotation.NonNull;
@@ -71,6 +73,7 @@ public class UserAspectRatioManager {
     private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = true;
 
     final boolean mIsUserMinAspectRatioAppDefaultFlagEnabled = Flags.userMinAspectRatioAppDefault();
+    private final boolean mIgnoreActivityOrientationRequest;
 
     private final Context mContext;
     private final IPackageManager mIPm;
@@ -90,6 +93,8 @@ public class UserAspectRatioManager {
         mUserAspectRatioA11yMap = new ArrayMap<>();
         mUserAspectRatioOrder = new SparseIntArray();
         mUserAspectRatioMap = getUserMinAspectRatioMapping();
+        mIgnoreActivityOrientationRequest = getValueFromDeviceConfig(
+                "ignore_activity_orientation_request", false);
     }
 
     /**
@@ -113,6 +118,24 @@ public class UserAspectRatioManager {
                 ? aspectRatio : USER_MIN_ASPECT_RATIO_UNSET;
     }
 
+    // TODO b/374903057 reuse method from ActivityRecord
+    boolean isUniversalResizeable(@NonNull String packageName, int userId) {
+        try {
+            final ApplicationInfo info = mIPm.getApplicationInfo(
+                    packageName, 0 /* flags */, userId);
+            if (info == null || info.category == ApplicationInfo.CATEGORY_GAME) {
+                return false;
+            }
+            final boolean compatEnabled = Flags.universalResizableByDefault()
+                    && info.isChangeEnabled(ActivityInfo.UNIVERSAL_RESIZABLE_BY_DEFAULT);
+            return compatEnabled || mIgnoreActivityOrientationRequest;
+        } catch (RemoteException e) {
+            Log.e("UserAspectRatioManager", "Could not access application info for "
+                    + packageName + ":\n" + e);
+            return false;
+        }
+    }
+
     /**
      * @return corresponding string for {@link PackageManager.UserMinAspectRatio} value
      */
@@ -127,7 +150,7 @@ public class UserAspectRatioManager {
             return appDefault;
         }
 
-        return isCurrentSelectionFromManufacturerOverride(packageName, userId, aspectRatio)
+        return isUnsetAndRequiresFullscreenOverride(packageName, userId, aspectRatio)
                 ? getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_FULLSCREEN, packageName, userId)
                 : mUserAspectRatioMap.getOrDefault(aspectRatio, appDefault);
     }
@@ -139,7 +162,7 @@ public class UserAspectRatioManager {
     public CharSequence getAccessibleEntry(@PackageManager.UserMinAspectRatio int aspectRatio,
             @NonNull String packageName) {
         final int userId = mContext.getUserId();
-        return isCurrentSelectionFromManufacturerOverride(packageName, userId, aspectRatio)
+        return isUnsetAndRequiresFullscreenOverride(packageName, userId, aspectRatio)
                 ? getAccessibleEntry(USER_MIN_ASPECT_RATIO_FULLSCREEN, packageName)
                 : mUserAspectRatioA11yMap.getOrDefault(aspectRatio,
                         getUserMinAspectRatioEntry(aspectRatio, packageName, userId));
@@ -203,7 +226,7 @@ public class UserAspectRatioManager {
             @PackageManager.UserMinAspectRatio int userOverride) {
         return (userOverride != USER_MIN_ASPECT_RATIO_UNSET
                     && userOverride != USER_MIN_ASPECT_RATIO_APP_DEFAULT)
-                || isCurrentSelectionFromManufacturerOverride(app.packageName, getUserId(app.uid),
+                || isUnsetAndRequiresFullscreenOverride(app.packageName, getUserId(app.uid),
                     userOverride);
     }
 
@@ -224,7 +247,7 @@ public class UserAspectRatioManager {
     /**
      * Whether the device manufacturer has overridden app's orientation to
      * {@link android.content.pm.ActivityInfo#SCREEN_ORIENTATION_USER} to force app to fullscreen
-     * and app has not opted-out from the treatment
+     * or app is universal resizeable, and app has not opted-out from the treatment
      */
     boolean isOverrideToFullscreenEnabled(String pkgName, int userId) {
         Boolean appAllowsOrientationOverride = readComponentProperty(mContext.getPackageManager(),
@@ -232,7 +255,8 @@ public class UserAspectRatioManager {
         return mIsUserMinAspectRatioAppDefaultFlagEnabled
                 && hasAspectRatioOption(USER_MIN_ASPECT_RATIO_FULLSCREEN, pkgName)
                 && !FALSE.equals(appAllowsOrientationOverride)
-                && isFullscreenCompatChangeEnabled(pkgName, userId);
+                && (isFullscreenCompatChangeEnabled(pkgName, userId)
+                    || isUniversalResizeable(pkgName, userId));
     }
 
     boolean isFullscreenCompatChangeEnabled(String pkgName, int userId) {
@@ -240,7 +264,11 @@ public class UserAspectRatioManager {
                 OVERRIDE_ANY_ORIENTATION_TO_USER, pkgName, UserHandle.of(userId));
     }
 
-    private boolean isCurrentSelectionFromManufacturerOverride(String pkgName, int userId,
+    /**
+     * Whether the aspect ratio is unset and we desire to interpret it as fullscreen rather than
+     * app default because of manufacturer override or because the app is universal resizeable
+     */
+    private boolean isUnsetAndRequiresFullscreenOverride(String pkgName, int userId,
             @PackageManager.UserMinAspectRatio int aspectRatio) {
         return aspectRatio == USER_MIN_ASPECT_RATIO_UNSET
                 && isOverrideToFullscreenEnabled(pkgName, userId);
diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index 1d80099f5c3..70bf78e879d 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -53,6 +53,7 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -240,13 +241,21 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
             } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
                 if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
                     showDialogInner(ButtonActionDialogFragment.DialogType.DISABLE);
+                } else if (mAppEntry.info.enabled) {
+                    requireAuthAndExecute(() -> {
+                        mMetricsFeatureProvider.action(
+                                mActivity,
+                                SettingsEnums.ACTION_SETTINGS_DISABLE_APP,
+                                getPackageNameForMetric());
+                        AsyncTask.execute(new DisableChangerRunnable(mPm,
+                                mAppEntry.info.packageName,
+                                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));
+                    });
                 } else {
                     mMetricsFeatureProvider.action(
                             mActivity,
-                            mAppEntry.info.enabled
-                                    ? SettingsEnums.ACTION_SETTINGS_DISABLE_APP
-                                    : SettingsEnums.ACTION_SETTINGS_ENABLE_APP,
-                                    getPackageNameForMetric());
+                            SettingsEnums.ACTION_SETTINGS_ENABLE_APP,
+                            getPackageNameForMetric());
                     AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
                             PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));
                 }
@@ -289,17 +298,34 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
         }
     }
 
+    /**
+     * Runs the given action with restricted lock authentication if it is a protected package.
+     *
+     * @param action The action to run.
+     */
+    private void requireAuthAndExecute(Runnable action) {
+        if (Utils.isProtectedPackage(mContext, mAppEntry.info.packageName)) {
+            AppInfoDashboardFragment.showLockScreen(mContext, () -> action.run());
+        } else {
+            action.run();
+        }
+    }
+
     public void handleDialogClick(int id) {
         switch (id) {
             case ButtonActionDialogFragment.DialogType.DISABLE:
-                mMetricsFeatureProvider.action(mActivity,
-                        SettingsEnums.ACTION_SETTINGS_DISABLE_APP,
-                        getPackageNameForMetric());
-                AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
-                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
+                requireAuthAndExecute(() -> {
+                    mMetricsFeatureProvider.action(mActivity,
+                            SettingsEnums.ACTION_SETTINGS_DISABLE_APP,
+                            getPackageNameForMetric());
+                    AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
+                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
+                });
                 break;
             case ButtonActionDialogFragment.DialogType.FORCE_STOP:
-                forceStopPackage(mAppEntry.info.packageName);
+                requireAuthAndExecute(() -> {
+                    forceStopPackage(mAppEntry.info.packageName);
+                });
                 break;
         }
     }
@@ -535,14 +561,16 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
 
     @VisibleForTesting
     void uninstallPkg(String packageName, boolean allUsers) {
-        stopListeningToPackageRemove();
-        // Create new intent to launch Uninstaller activity
-        Uri packageUri = Uri.parse("package:" + packageName);
-        Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
-        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
+        requireAuthAndExecute(() -> {
+            stopListeningToPackageRemove();
+            // Create new intent to launch Uninstaller activity
+            Uri packageUri = Uri.parse("package:" + packageName);
+            Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
+            uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
 
-        mMetricsFeatureProvider.action(mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
-        mFragment.startActivityForResult(uninstallIntent, mRequestUninstall);
+            mMetricsFeatureProvider.action(mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
+            mFragment.startActivityForResult(uninstallIntent, mRequestUninstall);
+        });
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/appinfo/AppsLocalePreferenceController.java b/src/com/android/settings/applications/appinfo/AppsLocalePreferenceController.java
new file mode 100644
index 00000000000..c66ea58bc73
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppsLocalePreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+
+/**
+ * A controller to update current locale information of application
+ * and a entry to launch {@link ManageApplications}.
+ */
+public class AppsLocalePreferenceController extends BasePreferenceController {
+    public AppsLocalePreferenceController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
index 9a41f2519bf..826583df866 100644
--- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
@@ -17,6 +17,8 @@ package com.android.settings.applications.appinfo;
 
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
+import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
 
 import android.app.AppOpsManager;
 import android.app.settings.SettingsEnums;
@@ -34,6 +36,7 @@ import com.android.settings.Settings;
 import com.android.settings.applications.AppInfoWithHeader;
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
@@ -82,15 +85,34 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
     public static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
         final UserHandle userHandle = UserHandle.getUserHandleForUid(entry.info.uid);
         final UserManager um = UserManager.get(context);
-        final int userRestrictionSource = um.getUserRestrictionSource(
-                UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, userHandle)
-                | um.getUserRestrictionSource(
-                        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
-                        userHandle);
-        if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {
-            return context.getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
-        } else if (userRestrictionSource != 0) {
-            return context.getString(com.android.settingslib.R.string.disabled);
+        if (android.security.Flags.aapmFeatureDisableInstallUnknownSources()) {
+            if (um.hasBaseUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES, userHandle)) {
+                return context.getString(com.android.settingslib.R.string.disabled);
+            } else if (um.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES, userHandle)) {
+                return context.getString(
+                        com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
+            } else if (um.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+                    userHandle)) {
+                if (RestrictedLockUtilsInternal.isPolicyEnforcedByAdvancedProtection(context,
+                        DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, userHandle.getIdentifier())) {
+                    return context.getString(com.android.settingslib.widget.restricted
+                            .R.string.disabled_by_advanced_protection);
+                } else {
+                    return context.getString(
+                            com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
+                }
+            }
+        } else {
+            final int userRestrictionSource = um.getUserRestrictionSource(
+                    DISALLOW_INSTALL_UNKNOWN_SOURCES, userHandle)
+                    | um.getUserRestrictionSource(
+                            UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, userHandle);
+            if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {
+                return context.getString(
+                        com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
+            } else if (userRestrictionSource != 0) {
+                return context.getString(com.android.settingslib.R.string.disabled);
+            }
         }
         final InstallAppsState appsState = new AppStateInstallAppsBridge(context, null, null)
                 .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
@@ -110,14 +132,14 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
         if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
             return false;
         }
-        if (mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
+        if (mUserManager.hasBaseUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES,
                 UserHandle.of(UserHandle.myUserId()))) {
             mSwitchPref.setChecked(false);
             mSwitchPref.setSummary(com.android.settingslib.R.string.disabled);
             mSwitchPref.setEnabled(false);
             return true;
         }
-        mSwitchPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        mSwitchPref.checkRestrictionAndSetDisabled(DISALLOW_INSTALL_UNKNOWN_SOURCES);
         if (!mSwitchPref.isDisabledByAdmin()) {
             mSwitchPref.checkRestrictionAndSetDisabled(
                     UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY);
diff --git a/src/com/android/settings/applications/appinfo/NewAppsLocalePreferenceController.java b/src/com/android/settings/applications/appinfo/NewAppsLocalePreferenceController.java
new file mode 100644
index 00000000000..abd7af8c429
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/NewAppsLocalePreferenceController.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+
+/**
+ * A controller to update current locale information of application
+ * and a entry to launch {@link ManageApplications}.
+ */
+public class NewAppsLocalePreferenceController extends BasePreferenceController {
+
+    public NewAppsLocalePreferenceController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // TODO(b/381011808) After feature release, this class may be renamed.
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/applications/contacts/ContactsStoragePreferenceController.java b/src/com/android/settings/applications/contacts/ContactsStoragePreferenceController.java
new file mode 100644
index 00000000000..340a666d88a
--- /dev/null
+++ b/src/com/android/settings/applications/contacts/ContactsStoragePreferenceController.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.contacts;
+
+import static android.provider.ContactsContract.RawContacts.DefaultAccount;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;
+import android.provider.Flags;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+
+/**
+ * A preference controller handling the logic for updating summary of contacts default account.
+ */
+public class ContactsStoragePreferenceController extends BasePreferenceController {
+    private static final String TAG = "ContactsStorageController";
+
+    private final AuthenticatorHelper mAuthenticatorHelper;
+
+    private DefaultAccountAndState mCurrentDefaultAccountAndState;
+
+    public ContactsStoragePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mAuthenticatorHelper = new AuthenticatorHelper(mContext,
+                new UserHandle(UserHandle.myUserId()), null);
+        try {
+            mCurrentDefaultAccountAndState =
+                    DefaultAccount.getDefaultAccountForNewContacts(mContext.getContentResolver());
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "The default account is in an invalid state: " + e);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to look up the default account: " + e);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return (Flags.newDefaultAccountApiEnabled()
+                && mCurrentDefaultAccountAndState != null) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mCurrentDefaultAccountAndState != null) {
+            // Re-fetch account in controller to refresh the latest set default account.
+            mCurrentDefaultAccountAndState =
+                    DefaultAccount.getDefaultAccountForNewContacts(mContext.getContentResolver());
+            int currentDefaultAccountState = mCurrentDefaultAccountAndState.getState();
+            Account currentDefaultAccount = mCurrentDefaultAccountAndState.getAccount();
+            if (currentDefaultAccountState
+                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET) {
+                return mContext.getResources().getString(
+                        R.string.contacts_storage_no_account_set_summary);
+            } else if (currentDefaultAccountState
+                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL) {
+                return mContext.getResources().getString(
+                        R.string.contacts_storage_local_account_summary);
+            } else if (currentDefaultAccountState
+                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM) {
+                return mContext.getResources().getString(
+                        R.string.sim_card_label);
+            } else if (currentDefaultAccountState
+                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD) {
+                String accountTypeLabel = (String) mAuthenticatorHelper.getLabelForType(mContext,
+                        currentDefaultAccount.type);
+                // If there's no account type, or the account type is the same as the
+                // current default account name, just return the account name.
+                if (accountTypeLabel == null || accountTypeLabel.equals(
+                        currentDefaultAccount.name)) {
+                    return currentDefaultAccount.name;
+                }
+                return accountTypeLabel + " | " + currentDefaultAccount.name;
+            }
+        }
+        return "";
+    }
+}
diff --git a/src/com/android/settings/applications/contacts/ContactsStorageSettings.java b/src/com/android/settings/applications/contacts/ContactsStorageSettings.java
new file mode 100644
index 00000000000..4b70d465fb1
--- /dev/null
+++ b/src/com/android/settings/applications/contacts/ContactsStorageSettings.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.contacts;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount;
+import static android.provider.Settings.ACTION_ADD_ACCOUNT;
+import static android.provider.Settings.EXTRA_ACCOUNT_TYPES;
+
+import android.accounts.Account;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceGroup;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.accounts.AddAccountSettings;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Settings page for contacts default account
+ */
+@SearchIndexable
+public class ContactsStorageSettings extends DashboardFragment
+        implements SelectorWithWidgetPreference.OnClickListener, OnPreferenceClickListener,
+        AuthenticatorHelper.OnAccountsUpdateListener {
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.contacts_storage_settings);
+    private static final String TAG = "ContactsStorageSettings";
+    private static final String PREF_KEY_ADD_ACCOUNT = "add_account";
+    private static final String PREF_KEY_DEVICE_ONLY = "device_only_account_preference";
+    private static final String PREF_KEY_ACCOUNT_CATEGORY = "account_category";
+    private final Map<String, DefaultAccountAndState> mAccountMap = new HashMap<>();
+    private AuthenticatorHelper mAuthenticatorHelper;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        mAuthenticatorHelper = new AuthenticatorHelper(context,
+                new UserHandle(UserHandle.myUserId()), this);
+        mAuthenticatorHelper.listenToAccountUpdates();
+        preloadEligibleAccountIcon();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mAuthenticatorHelper.stopListeningToAccountUpdates();
+    }
+
+    @UiThread
+    @Override
+    public void onRadioButtonClicked(@NonNull SelectorWithWidgetPreference selectedPref) {
+        final String selectedPreferenceKey = selectedPref.getKey();
+        // Check if current account is different from the selected account.
+        for (String preferenceKey : mAccountMap.keySet()) {
+            if (selectedPreferenceKey.equals(preferenceKey)) {
+                try {
+                    DefaultAccountAndState currentDefaultAccount = mAccountMap.get(preferenceKey);
+                    DefaultAccount.setDefaultAccountForNewContacts(getContentResolver(),
+                            currentDefaultAccount);
+                    selectedPref.setChecked(true);
+                    if (currentDefaultAccount.getState()
+                            == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD) {
+                        startMoveLocalAndSimContactsActivity();
+                    }
+                } catch (RuntimeException e) {
+                    Log.e(TAG, "Error setting the default account " + e);
+                    Toast.makeText(getContext(),
+                            R.string.contacts_storage_set_default_account_error_message,
+                            Toast.LENGTH_SHORT).show();
+                }
+            } else {
+                SelectorWithWidgetPreference unSelectedPreference =
+                        getPreferenceScreen().findPreference(preferenceKey);
+                if (unSelectedPreference != null) {
+                    unSelectedPreference.setChecked(false);
+                }
+            }
+        }
+    }
+
+    public boolean onPreferenceClick(@NonNull Preference preference) {
+        if (PREF_KEY_ADD_ACCOUNT.equals(preference.getKey())) {
+            String[] accountTypesArray = getEligibleAccountTypes();
+            Intent intent = new Intent(ACTION_ADD_ACCOUNT);
+            intent.setClass(getContext(), AddAccountSettings.class);
+            intent.putExtra(EXTRA_ACCOUNT_TYPES, accountTypesArray);
+            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+            getContext().startActivity(intent);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onAccountsUpdate(UserHandle userHandle) {
+        preloadEligibleAccountIcon();
+        refreshUI();
+    }
+
+    @Override
+    public void onCreatePreferences(@NonNull Bundle savedInstanceState,
+            @NonNull String rootKey) {
+        super.onCreatePreferences(savedInstanceState, rootKey);
+        refreshUI();
+    }
+
+    @UiThread
+    void refreshUI() {
+        // Clear all the accounts stored in the map and later on re-fetch the eligible accounts
+        // when creating eligible account preferences.
+        mAccountMap.clear();
+        final PreferenceGroup preferenceGroup = findPreference(PREF_KEY_ACCOUNT_CATEGORY);
+        preferenceGroup.removeAll();
+        // If the default account is SIM, we should show in the page, otherwise don't show.
+        SelectorWithWidgetPreference simAccountPreference = buildSimAccountPreference();
+        if (simAccountPreference != null) {
+            preferenceGroup.addPreference(simAccountPreference);
+        }
+        List<Account> accounts = DefaultAccount.getEligibleCloudAccounts(getContentResolver());
+        for (int i = 0; i < accounts.size(); i++) {
+            preferenceGroup.addPreference(
+                    buildCloudAccountPreference(accounts.get(i), /*order=*/i));
+        }
+        // If there's no eligible account types, the "Add Account" preference should
+        // not be shown to the users.
+        if (getEligibleAccountTypes().length > 0) {
+            preferenceGroup.addPreference(buildAddAccountPreference(accounts.isEmpty()));
+        }
+        setupDeviceOnlyPreference();
+        setDefaultAccountPreference(preferenceGroup);
+    }
+
+    private void preloadEligibleAccountIcon() {
+        String[] accountTypes = getEligibleAccountTypes();
+        for (String accountType : accountTypes) {
+            // Preload the drawable for the account type to avoid the latency when rendering the
+            // account preference.
+            mAuthenticatorHelper.preloadDrawableForType(getContext(), accountType);
+        }
+    }
+
+    private void setupDeviceOnlyPreference() {
+        SelectorWithWidgetPreference preference = findPreference(PREF_KEY_DEVICE_ONLY);
+        if (preference != null) {
+            preference.setOnClickListener(this);
+            mAccountMap.put(PREF_KEY_DEVICE_ONLY, DefaultAccountAndState.ofLocal());
+        }
+    }
+
+    private void setDefaultAccountPreference(PreferenceGroup preferenceGroup) {
+        DefaultAccountAndState currentDefaultAccountAndState =
+                DefaultAccount.getDefaultAccountForNewContacts(getContentResolver());
+        String preferenceKey = getAccountHashCode(currentDefaultAccountAndState);
+        Account currentDefaultAccount = currentDefaultAccountAndState.getAccount();
+
+        // Set the current default account preference to be checked if found among existing
+        // preferences. If not, then create a new preference for default account.
+        SelectorWithWidgetPreference preference = null;
+        if (mAccountMap.containsKey(preferenceKey)) {
+            preference = getPreferenceScreen().findPreference(preferenceKey);
+        } else if (preferenceKey != null && currentDefaultAccount != null) {
+            preference = buildCloudAccountPreference(currentDefaultAccount, mAccountMap.size());
+            preferenceGroup.addPreference(preference);
+        }
+        if (preference != null) {
+            preference.setChecked(true);
+        }
+    }
+
+    private SelectorWithWidgetPreference buildCloudAccountPreference(Account account, int order) {
+        SelectorWithWidgetPreference preference = new SelectorWithWidgetPreference(
+                getPrefContext());
+        DefaultAccountAndState accountAndState = DefaultAccountAndState.ofCloud(account);
+        String preferenceKey = getAccountHashCode(accountAndState);
+        String accountPreferenceTitle = getString(R.string.contacts_storage_account_title,
+                mAuthenticatorHelper.getLabelForType(getPrefContext(), account.type));
+        preference.setTitle(accountPreferenceTitle);
+        preference.setIcon(mAuthenticatorHelper.getDrawableForType(getPrefContext(), account.type));
+        preference.setSummary(account.name);
+        preference.setKey(preferenceKey);
+        preference.setOnClickListener(this);
+        preference.setOrder(order);
+        mAccountMap.put(preferenceKey, accountAndState);
+        return preference;
+    }
+
+    @Nullable
+    private SelectorWithWidgetPreference buildSimAccountPreference() {
+        DefaultAccountAndState currentDefaultAccountAndState =
+                DefaultAccount.getDefaultAccountForNewContacts(getContentResolver());
+        if (currentDefaultAccountAndState.getState()
+                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM) {
+            String preferenceKey = getAccountHashCode(currentDefaultAccountAndState);
+            SelectorWithWidgetPreference preference = new SelectorWithWidgetPreference(
+                    getPrefContext());
+            preference.setTitle(R.string.sim_card_label);
+            preference.setIcon(R.drawable.ic_sim_card);
+            preference.setSummary(R.string.sim_card_label);
+            preference.setKey(preferenceKey);
+            preference.setOnClickListener(this);
+            mAccountMap.put(preferenceKey, currentDefaultAccountAndState);
+            return preference;
+        }
+        return null;
+    }
+
+    private RestrictedPreference buildAddAccountPreference(boolean noAccountBeenAdded) {
+        RestrictedPreference preference = new RestrictedPreference(getPrefContext());
+        preference.setKey(PREF_KEY_ADD_ACCOUNT);
+        if (noAccountBeenAdded) {
+            preference.setTitle(R.string.contacts_storage_first_time_add_account_message);
+        } else {
+            preference.setTitle(R.string.add_account_label);
+        }
+        preference.setIcon(R.drawable.ic_add_24dp);
+        preference.setOnPreferenceClickListener(this);
+        preference.setOrder(998);
+        return preference;
+    }
+
+    private void startMoveLocalAndSimContactsActivity() {
+        Intent intent = new Intent()
+                .setAction(DefaultAccount.ACTION_MOVE_CONTACTS_TO_DEFAULT_ACCOUNT)
+                .setPackage("com.android.providers.contacts")
+                .addFlags(FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
+
+    @Nullable
+    private String getAccountHashCode(
+            DefaultAccountAndState currentDefaultAccountAndState) {
+        Account currentDefaultAccount = currentDefaultAccountAndState.getAccount();
+        if (currentDefaultAccount != null && (currentDefaultAccountAndState.getState()
+                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD
+                || currentDefaultAccountAndState.getState()
+                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM)) {
+            return String.valueOf(currentDefaultAccount.hashCode());
+        } else if (currentDefaultAccountAndState.getState()
+                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL) {
+            return PREF_KEY_DEVICE_ONLY;
+        } else {
+            // If the account is not set or in error state, it should just return null and won't
+            // set the checked status in radio button.
+            return null;
+        }
+    }
+
+    @VisibleForTesting
+    String[] getEligibleAccountTypes() {
+        return Resources.getSystem().getStringArray(
+                com.android.internal.R.array.config_rawContactsEligibleDefaultAccountTypes);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.contacts_storage_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.CONTACTS_STORAGE;
+    }
+}
diff --git a/src/com/android/settings/backup/UserBackupSettingsActivity.java b/src/com/android/settings/backup/UserBackupSettingsActivity.java
index e6d313c61ca..adeeca505a5 100644
--- a/src/com/android/settings/backup/UserBackupSettingsActivity.java
+++ b/src/com/android/settings/backup/UserBackupSettingsActivity.java
@@ -23,10 +23,10 @@ import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
@@ -46,13 +46,16 @@ import java.util.List;
  * Therefore, as a simple workaround, we use a new class which is enabled by default.
  */
 @SearchIndexable
-public class UserBackupSettingsActivity extends FragmentActivity implements Indexable {
+public class UserBackupSettingsActivity extends SettingsActivity implements Indexable {
     private static final String TAG = "BackupSettingsActivity";
     private FragmentManager mFragmentManager;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (isFinishing()) {
+            return;
+        }
 
         BackupSettingsHelper backupHelper = new BackupSettingsHelper(this);
 
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 3285a9537a6..c4c8dc0f7ed 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -148,8 +148,16 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
-        ThemeHelper.trySetDynamicColor(this);
+
+        if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
+            if (!ThemeHelper.trySetSuwTheme(this)) {
+                setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
+                ThemeHelper.trySetDynamicColor(this);
+            }
+        } else {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            ThemeHelper.trySetDynamicColor(this);
+        }
         mChallenge = getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, -1L);
         mSensorId = getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1);
         // Don't need to retrieve the HAT if it already exists. In some cases, the extras do not
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 1f7b3e512b2..77f11ff6f0f 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -37,6 +37,7 @@ import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.Utils;
+import com.android.settings.flags.Flags;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
@@ -551,8 +552,11 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
     @NonNull
     protected PorterDuffColorFilter getIconColorFilter() {
         if (mIconColorFilter == null) {
+            final int colorType = Flags.biometricsOnboardingEducation()
+                    ? DynamicColorPalette.ColorType.PRIMARY_TEXT
+                    : DynamicColorPalette.ColorType.ACCENT;
             mIconColorFilter = new PorterDuffColorFilter(
-                    DynamicColorPalette.getColor(this, DynamicColorPalette.ColorType.ACCENT),
+                    DynamicColorPalette.getColor(this, colorType),
                     PorterDuff.Mode.SRC_IN);
         }
         return mIconColorFilter;
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index d3f75195305..78e3770810a 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -53,6 +53,7 @@ import com.android.settings.biometrics.BiometricEnrollActivity;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
 import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.biometrics.MultiBiometricEnrollHelper;
+import com.android.settings.flags.Flags;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.SetupSkipDialog;
 import com.android.settings.utils.SensorPrivacyManagerHelper;
@@ -144,6 +145,19 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
         final ImageView iconLooking = findViewById(R.id.icon_looking);
         iconGlasses.getBackground().setColorFilter(getIconColorFilter());
         iconLooking.getBackground().setColorFilter(getIconColorFilter());
+        if (Flags.biometricsOnboardingEducation()) {
+            final ImageView iconSecurityPrivacySafe = findViewById(R.id.icon_security_privacy_safe);
+            final ImageView iconPrivacyTip = findViewById(R.id.icon_privacy_tip);
+            final ImageView iconFamiliarFaceAndZone =
+                    findViewById(R.id.icon_familiar_face_and_zone);
+            final ImageView iconTrashCan = findViewById(R.id.icon_trash_can);
+            final ImageView iconLink = findViewById(R.id.icon_link);
+            iconSecurityPrivacySafe.getBackground().setColorFilter(getIconColorFilter());
+            iconPrivacyTip.getBackground().setColorFilter(getIconColorFilter());
+            iconFamiliarFaceAndZone.getBackground().setColorFilter(getIconColorFilter());
+            iconTrashCan.getBackground().setColorFilter(getIconColorFilter());
+            iconLink.getBackground().setColorFilter(getIconColorFilter());
+        }
 
         // Set text for views with multiple variations.
         final TextView infoMessageGlasses = findViewById(R.id.info_message_glasses);
@@ -156,9 +170,19 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
         infoMessageLooking.setText(getInfoMessageLooking());
         inControlTitle.setText(getInControlTitle());
         howMessage.setText(getHowMessage());
-        inControlMessage.setText(Html.fromHtml(getString(getInControlMessage()),
-                Html.FROM_HTML_MODE_LEGACY));
-        inControlMessage.setMovementMethod(LinkMovementMethod.getInstance());
+        if (Flags.biometricsOnboardingEducation()) {
+            inControlMessage.setText(
+                    R.string.security_settings_face_enroll_introduction_control_message_2);
+            final TextView learnMore = findViewById(R.id.message_learn_more);
+            learnMore.setText(Html.fromHtml(getString(
+                    R.string.security_settings_face_enroll_introduction_learn_more_message),
+                    Html.FROM_HTML_MODE_LEGACY));
+            learnMore.setMovementMethod(LinkMovementMethod.getInstance());
+        } else {
+            inControlMessage.setText(Html.fromHtml(getString(getInControlMessage()),
+                    Html.FROM_HTML_MODE_LEGACY));
+            inControlMessage.setMovementMethod(LinkMovementMethod.getInstance());
+        }
         lessSecure.setText(getLessSecureMessage());
 
         final ScrollView scrollView =
@@ -411,7 +435,11 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
 
     @Override
     protected int getLayoutResource() {
-        return R.layout.face_enroll_introduction;
+        if (Flags.biometricsOnboardingEducation()) {
+            return R.layout.face_enroll_introduction_2;
+        } else {
+            return R.layout.face_enroll_introduction;
+        }
     }
 
     @Override
@@ -594,8 +622,13 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
             setDescriptionText(getString(
                     R.string.private_space_face_enroll_introduction_message));
         } else if (mIsFaceStrong) {
-            setDescriptionText(getString(
-                    R.string.security_settings_face_enroll_introduction_message_class3));
+            final int messageRes;
+            if (Flags.biometricsOnboardingEducation()) {
+                messageRes = R.string.security_settings_face_enroll_introduction_message_class3_2;
+            } else {
+                messageRes = R.string.security_settings_face_enroll_introduction_message_class3;
+            }
+            setDescriptionText(getString(messageRes));
         }
         super.updateDescriptionText();
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnroll.kt b/src/com/android/settings/biometrics/fingerprint/FingerprintEnroll.kt
index 3d782697541..6439fe6922c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnroll.kt
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnroll.kt
@@ -40,6 +40,14 @@ open class FingerprintEnroll: AppCompatActivity() {
         get() = enrollActivityProvider.internal
     }
 
+    /**
+     *  Inner class to request adding of an additional fingerprint
+     */
+    class AddAdditionalFingerprint : FingerprintEnroll() {
+        override val nextActivityClass: Class<*>
+            get() = enrollActivityProvider.addAnother
+    }
+
     /**
      * The class of the next activity to launch. This is open to allow subclasses to provide their
      * own behavior. Defaults to the default activity class provided by the
@@ -49,7 +57,7 @@ open class FingerprintEnroll: AppCompatActivity() {
         get() = enrollActivityProvider.default
 
     protected val enrollActivityProvider: FingerprintEnrollActivityClassProvider
-        get() = featureFactory.fingerprintFeatureProvider.enrollActivityClassProvider
+        get() = featureFactory.fingerprintFeatureProvider.getEnrollActivityClassProvider(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt
index 853a3df01b8..14261e9524a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt
@@ -26,6 +26,8 @@ open class FingerprintEnrollActivityClassProvider {
         get() = SetupFingerprintEnrollIntroduction::class.java
     open val internal: Class<out Activity>
         get() = FingerprintEnrollIntroductionInternal::class.java
+    open val addAnother: Class<out Activity>
+        get() = FingerprintEnrollEnrolling::class.java
 
     companion object {
         @JvmStatic
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index b32ab4f7350..2cbf8d089ff 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -57,6 +57,7 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.IdRes;
@@ -72,6 +73,7 @@ import com.android.settings.biometrics.BiometricsEnrollEnrolling;
 import com.android.settings.biometrics.BiometricsSplitScreenDialog;
 import com.android.settings.biometrics.fingerprint.feature.SfpsEnrollmentFeature;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.flags.Flags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.display.DisplayDensityUtils;
 import com.android.systemui.unfold.compat.ScreenSizeFoldProvider;
@@ -207,10 +209,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
     @VisibleForTesting
     protected boolean shouldShowLottie() {
         DisplayDensityUtils displayDensity = new DisplayDensityUtils(getApplicationContext());
-        int currentDensityIndex = displayDensity.getCurrentIndexForDefaultDisplay();
-        final int currentDensity = displayDensity.getDefaultDisplayDensityValues()
-                [currentDensityIndex];
-        final int defaultDensity = displayDensity.getDefaultDensityForDefaultDisplay();
+        int currentDensityIndex = displayDensity.getCurrentIndex();
+        final int currentDensity = displayDensity.getValues()[currentDensityIndex];
+        final int defaultDensity = displayDensity.getDefaultDensity();
 
         if (getResources().getConfiguration().fontScale > 1) {
             return false;
@@ -244,16 +245,37 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
 
         listenOrientationEvent();
-
         if (mCanAssumeUdfps) {
+            final int rotation = getApplicationContext().getDisplay().getRotation();
+            final boolean isPortrait = (rotation == Surface.ROTATION_0)
+                    || (rotation == Surface.ROTATION_180);
+
             final UdfpsEnrollEnrollingView layout =
                     (UdfpsEnrollEnrollingView) getLayoutInflater().inflate(
-                            R.layout.udfps_enroll_enrolling, null, false);
+                            Flags.enrollLayoutTruncateImprovement()
+                                    ? R.layout.udfps_enroll_enrolling :
+                                    R.layout.udfps_enroll_enrolling_non_scroll, null, false);
             setUdfpsEnrollHelper();
             layout.initView(props.get(0), mUdfpsEnrollHelper, mAccessibilityManager);
-
             setContentView(layout);
             setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
+
+            if (Flags.enrollLayoutTruncateImprovement() && isPortrait) {
+                final UdfpsEnrollEnrollingView layoutView = (UdfpsEnrollEnrollingView) getLayout();
+                if (layoutView != null) {
+                    final ScrollView headerScrollView = layout.findViewById(
+                            R.id.sud_header_scroll_view);
+                    if (headerScrollView != null) {
+                        final long headerScrollDuration = getResources().getInteger(
+                                R.integer.config_biometrics_header_scroll_duration);
+                        layoutView.adjustScrollableHeaderHeight(
+                                headerScrollView, mShouldShowLottie);
+                        layoutView.headerVerticalScrolling(headerScrollView, headerScrollDuration,
+                                mIsAccessibilityEnabled);
+                    }
+                }
+            }
+
         } else if (mCanAssumeSfps) {
             mSfpsEnrollmentFeature = FeatureFactory.getFeatureFactory()
                     .getFingerprintFeatureProvider().getSfpsEnrollmentFeature();
@@ -526,6 +548,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
     }
 
     private void updateTitleAndDescriptionForUdfps() {
+        final UdfpsEnrollEnrollingView layoutView = (UdfpsEnrollEnrollingView) getLayout();
+        final boolean shouldSetFocusOnDescription = Flags.enrollLayoutTruncateImprovement()
+                && mIsAccessibilityEnabled;
         switch (getCurrentStage()) {
             case STAGE_CENTER:
                 setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
@@ -539,6 +564,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                     );
                     configureEnrollmentStage(R.raw.udfps_center_hint_lottie);
                 }
+
+                if (shouldSetFocusOnDescription) {
+                    layoutView.setFocusOnDescription();
+                }
                 break;
 
             case STAGE_GUIDED:
@@ -553,6 +582,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                     // TODO(b/228100413) Could customize guided lottie animation
                     configureEnrollmentStage(R.raw.udfps_center_hint_lottie);
                 }
+
+                if (shouldSetFocusOnDescription) {
+                    layoutView.setFocusOnDescription();
+                }
                 break;
             case STAGE_FINGERTIP:
                 setHeaderText(R.string.security_settings_udfps_enroll_fingertip_title);
@@ -563,6 +596,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                     );
                     configureEnrollmentStage(R.raw.udfps_tip_hint_lottie);
                 }
+
+                if (shouldSetFocusOnDescription) {
+                    layoutView.setFocusOnDescription();
+                }
                 break;
             case STAGE_LEFT_EDGE:
                 setHeaderText(R.string.security_settings_udfps_enroll_left_edge_title);
@@ -580,6 +617,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                         setDescriptionText(R.string.security_settings_udfps_enroll_edge_message);
                     }
                 }
+
+                if (shouldSetFocusOnDescription) {
+                    layoutView.setFocusOnDescription();
+                }
                 break;
             case STAGE_RIGHT_EDGE:
                 setHeaderText(R.string.security_settings_udfps_enroll_right_edge_title);
@@ -598,6 +639,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                         setDescriptionText(R.string.security_settings_udfps_enroll_edge_message);
                     }
                 }
+
+                if (shouldSetFocusOnDescription) {
+                    layoutView.setFocusOnDescription();
+                }
                 break;
 
             case STAGE_UNKNOWN:
@@ -1200,6 +1245,24 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         }
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasWindowFocus) {
+        super.onWindowFocusChanged(hasWindowFocus);
+        if (Flags.enrollLayoutTruncateImprovement()) {
+            adjustEnrollViewIfOverlappedWithFooterBar();
+        }
+    }
+
+    private void adjustEnrollViewIfOverlappedWithFooterBar() {
+        if (mCanAssumeUdfps) {
+            final UdfpsEnrollEnrollingView layoutView = (UdfpsEnrollEnrollingView) getLayout();
+            if (layoutView != null) {
+                layoutView.adjustUdfpsVieWithFooterBar();
+                layoutView.onUdfpsSensorRectUpdated();
+            }
+        }
+    }
+
     public static class IconTouchDialog extends InstrumentedDialogFragment {
 
         @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProvider.java b/src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProvider.java
index baa88b5655a..06f8d74b802 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProvider.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProvider.java
@@ -57,7 +57,7 @@ public interface FingerprintFeatureProvider {
      * @return the provider
      */
     @NonNull
-    default FingerprintEnrollActivityClassProvider getEnrollActivityClassProvider() {
+    default FingerprintEnrollActivityClassProvider getEnrollActivityClassProvider(@NonNull Context context) {
         return FingerprintEnrollActivityClassProvider.getInstance();
     }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index adb6700de9b..d8a14f1e450 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -20,12 +20,14 @@ package com.android.settings.biometrics.fingerprint;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED_EXPLANATION;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE;
 import static android.app.admin.DevicePolicyResources.UNDEFINED;
+import static android.hardware.biometrics.Flags.screenOffUnlockUdfps;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 import static com.android.settings.Utils.isPrivateProfile;
 import static com.android.settings.biometrics.BiometricEnrollBase.BIOMETRIC_AUTH_REQUEST;
 import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY;
 import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_KEY_CHALLENGE;
+import static com.android.settings.flags.Flags.screenOffUnlockPowerOptimization;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -207,6 +209,17 @@ public class FingerprintSettings extends SubSettings {
                                 context,
                                 KEY_REQUIRE_SCREEN_ON_TO_AUTH
                         ));
+            } else if (screenOffUnlockUdfps()) {
+                controllers.add(
+                        new FingerprintUnlockCategoryController(
+                                context,
+                                KEY_FINGERPRINT_UNLOCK_CATEGORY
+                        ));
+                controllers.add(
+                        new FingerprintSettingsScreenOffUnlockUdfpsPreferenceController(
+                                context,
+                                KEY_SCREEN_OFF_FINGERPRINT_UNLOCK
+                        ));
             }
             controllers.add(new FingerprintsEnrolledCategoryPreferenceController(context,
                     KEY_FINGERPRINTS_ENROLLED_CATEGORY));
@@ -233,6 +246,9 @@ public class FingerprintSettings extends SubSettings {
         @VisibleForTesting
         static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
                 "security_settings_require_screen_on_to_auth";
+        @VisibleForTesting
+        static final String KEY_SCREEN_OFF_FINGERPRINT_UNLOCK =
+                "security_settings_screen_off_unlock_udfps";
         private static final String KEY_FINGERPRINTS_ENROLLED_CATEGORY =
                 "security_settings_fingerprints_enrolled";
         private static final String KEY_FINGERPRINT_UNLOCK_CATEGORY =
@@ -263,8 +279,11 @@ public class FingerprintSettings extends SubSettings {
                 mFingerprintUnlockCategoryPreferenceController;
         private FingerprintSettingsRequireScreenOnToAuthPreferenceController
                 mRequireScreenOnToAuthPreferenceController;
+        private FingerprintSettingsScreenOffUnlockUdfpsPreferenceController
+                mScreenOffUnlockUdfpsPreferenceController;
         private Preference mAddFingerprintPreference;
         private RestrictedSwitchPreference mRequireScreenOnToAuthPreference;
+        private RestrictedSwitchPreference mScreenOffUnlockUdfpsPreference;
         private PreferenceCategory mFingerprintsEnrolledCategory;
         private PreferenceCategory mFingerprintUnlockCategory;
         private PreferenceCategory mFingerprintUnlockFooter;
@@ -518,8 +537,9 @@ public class FingerprintSettings extends SubSettings {
                     activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
             final Intent helpIntent = HelpUtils.getHelpIntent(
                     activity, getString(getHelpResource()), activity.getClass().getName());
-            final View.OnClickListener learnMoreClickListener = (v) ->
-                    activity.startActivityForResult(helpIntent, 0);
+            final View.OnClickListener learnMoreClickListener = (v) -> {
+                activity.startActivityForResult(helpIntent, 0);
+            };
 
             mFooterColumns.clear();
             if (admin != null) {
@@ -582,6 +602,24 @@ public class FingerprintSettings extends SubSettings {
             return false;
         }
 
+        private boolean isUltrasnoicUdfps() {
+            // b/368465560 Gate either ultrasonic or optical UDFPS if the power do not optimized
+            if (!screenOffUnlockPowerOptimization()) {
+                return false;
+            }
+
+            mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());
+            if (mFingerprintManager != null) {
+                mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();
+                for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
+                    if (prop.isUltrasonicUdfps()) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         protected void removeFingerprintPreference(int fingerprintId) {
             String name = genKey(fingerprintId);
             Log.e(TAG, "removeFingerprintPreference : " + fingerprintId);
@@ -621,7 +659,7 @@ public class FingerprintSettings extends SubSettings {
             // This needs to be after setting ids, otherwise
             // |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary
             // user instead of the user with |mUserId|.
-            if (isSfps()) {
+            if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) {
                 scrollToPreference(fpPrefKey);
                 addFingerprintUnlockCategory();
             }
@@ -671,33 +709,46 @@ public class FingerprintSettings extends SubSettings {
 
         private void addFingerprintUnlockCategory() {
             mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
-            setupFingerprintUnlockCategoryPreferences();
-            final Preference restToUnlockPreference = FeatureFactory.getFeatureFactory()
-                    .getFingerprintFeatureProvider()
-                    .getSfpsRestToUnlockFeature(getContext())
-                    .getRestToUnlockPreference(getContext());
-            if (restToUnlockPreference != null) {
-                // Use custom featured preference if any.
-                mRequireScreenOnToAuthPreference.setTitle(restToUnlockPreference.getTitle());
-                mRequireScreenOnToAuthPreference.setSummary(restToUnlockPreference.getSummary());
-                mRequireScreenOnToAuthPreference.setChecked(
-                        ((TwoStatePreference) restToUnlockPreference).isChecked());
-                mRequireScreenOnToAuthPreference.setOnPreferenceChangeListener(
-                        restToUnlockPreference.getOnPreferenceChangeListener());
+            if (isSfps()) {
+                // For both SFPS "screen on to auth" and "rest to unlock"
+                final Preference restToUnlockPreference = FeatureFactory.getFeatureFactory()
+                        .getFingerprintFeatureProvider()
+                        .getSfpsRestToUnlockFeature(getContext())
+                        .getRestToUnlockPreference(getContext());
+                if (restToUnlockPreference != null) {
+                    // Use custom featured preference if any.
+                    mRequireScreenOnToAuthPreference.setTitle(restToUnlockPreference.getTitle());
+                    mRequireScreenOnToAuthPreference.setSummary(
+                            restToUnlockPreference.getSummary());
+                    mRequireScreenOnToAuthPreference.setChecked(
+                            ((TwoStatePreference) restToUnlockPreference).isChecked());
+                    mRequireScreenOnToAuthPreference.setOnPreferenceChangeListener(
+                            restToUnlockPreference.getOnPreferenceChangeListener());
+                }
+                setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth();
+            } else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
+                setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock();
             }
             updateFingerprintUnlockCategoryVisibility();
         }
 
         private void updateFingerprintUnlockCategoryVisibility() {
-            final boolean mFingerprintUnlockCategoryAvailable =
+            final boolean fingerprintUnlockCategoryAvailable =
                     mFingerprintUnlockCategoryPreferenceController.isAvailable();
-            if (mFingerprintUnlockCategory.isVisible() != mFingerprintUnlockCategoryAvailable) {
-                mFingerprintUnlockCategory.setVisible(
-                        mFingerprintUnlockCategoryAvailable);
+            if (mFingerprintUnlockCategory.isVisible() != fingerprintUnlockCategoryAvailable) {
+                mFingerprintUnlockCategory.setVisible(fingerprintUnlockCategoryAvailable);
+            }
+            if (mRequireScreenOnToAuthPreferenceController != null) {
+                mRequireScreenOnToAuthPreference.setVisible(
+                        mRequireScreenOnToAuthPreferenceController.isAvailable());
+            }
+            if (mScreenOffUnlockUdfpsPreferenceController != null) {
+                mScreenOffUnlockUdfpsPreference.setVisible(
+                        mScreenOffUnlockUdfpsPreferenceController.isAvailable());
             }
         }
 
-        private void setupFingerprintUnlockCategoryPreferences() {
+        private void setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth() {
             mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
             mRequireScreenOnToAuthPreference.setChecked(
                     mRequireScreenOnToAuthPreferenceController.isChecked());
@@ -709,9 +760,21 @@ public class FingerprintSettings extends SubSettings {
                     });
         }
 
+        private void setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock() {
+            mScreenOffUnlockUdfpsPreference = findPreference(KEY_SCREEN_OFF_FINGERPRINT_UNLOCK);
+            mScreenOffUnlockUdfpsPreference.setChecked(
+                    mScreenOffUnlockUdfpsPreferenceController.isChecked());
+            mScreenOffUnlockUdfpsPreference.setOnPreferenceChangeListener(
+                    (preference, newValue) -> {
+                        final boolean isChecked = ((TwoStatePreference) preference).isChecked();
+                        mScreenOffUnlockUdfpsPreferenceController.setChecked(!isChecked);
+                        return true;
+                    });
+        }
+
         private void updatePreferencesAfterFingerprintRemoved() {
             updateAddPreference();
-            if (isSfps()) {
+            if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) {
                 updateFingerprintUnlockCategoryVisibility();
             }
             updatePreferences();
@@ -848,7 +911,7 @@ public class FingerprintSettings extends SubSettings {
                 mIsEnrolling = true;
                 Intent intent = new Intent();
                 intent.setClassName(SETTINGS_PACKAGE_NAME,
-                        FingerprintEnrollEnrolling.class.getName());
+                    FingerprintEnroll.AddAdditionalFingerprint.class.getName());
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
                 if (mCalibrator != null) {
@@ -954,6 +1017,18 @@ public class FingerprintSettings extends SubSettings {
                                         controller;
                     }
 
+                }
+            } else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
+                for (AbstractPreferenceController controller : controllers) {
+                    if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) {
+                        mFingerprintUnlockCategoryPreferenceController =
+                                (FingerprintUnlockCategoryController) controller;
+                    } else if (controller.getPreferenceKey() == KEY_SCREEN_OFF_FINGERPRINT_UNLOCK) {
+                        mScreenOffUnlockUdfpsPreferenceController =
+                                (FingerprintSettingsScreenOffUnlockUdfpsPreferenceController)
+                                        controller;
+                    }
+
                 }
             }
             return controllers;
@@ -1070,7 +1145,8 @@ public class FingerprintSettings extends SubSettings {
             } else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
                 mBiometricsAuthenticationRequested = false;
                 if (resultCode != RESULT_OK) {
-                    if (resultCode == ConfirmDeviceCredentialActivity.BIOMETRIC_LOCKOUT_ERROR_RESULT) {
+                    if (resultCode
+                            == ConfirmDeviceCredentialActivity.BIOMETRIC_LOCKOUT_ERROR_RESULT) {
                         IdentityCheckBiometricErrorDialog
                                 .showBiometricErrorDialogAndFinishActivityOnDismiss(getActivity(),
                                         Utils.BiometricStatus.LOCKOUT);
@@ -1408,7 +1484,7 @@ public class FingerprintSettings extends SubSettings {
                         getContext().getSystemService(DevicePolicyManager.class);
                 String messageId =
                         isProfileChallengeUser ? WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE
-                        : UNDEFINED;
+                                : UNDEFINED;
                 int defaultMessageId = isProfileChallengeUser
                         ? R.string.fingerprint_last_delete_message_profile_challenge
                         : R.string.fingerprint_last_delete_message;
@@ -1417,7 +1493,7 @@ public class FingerprintSettings extends SubSettings {
                         .setTitle(title)
                         .setMessage(devicePolicyManager.getResources().getString(
                                 messageId,
-                                () ->  message + "\n\n" + getContext().getString(defaultMessageId)))
+                                () -> message + "\n\n" + getContext().getString(defaultMessageId)))
                         .setPositiveButton(
                                 R.string.security_settings_fingerprint_enroll_dialog_delete,
                                 new DialogInterface.OnClickListener() {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceController.java
new file mode 100644
index 00000000000..5c32d90ba7e
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceController.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.hardware.biometrics.Flags.screenOffUnlockUdfps;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.Utils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Preference controller that controls whether show screen off UDFPS unlock toggle for users to
+ * turn this feature ON or OFF
+ */
+@SearchIndexable
+public class FingerprintSettingsScreenOffUnlockUdfpsPreferenceController
+        extends FingerprintSettingsPreferenceController {
+    private static final String TAG =
+            "FingerprintSettingsScreenOffUnlockUdfpsPreferenceController";
+
+    @VisibleForTesting
+    protected FingerprintManager mFingerprintManager;
+
+    public FingerprintSettingsScreenOffUnlockUdfpsPreferenceController(
+            @NonNull Context context, @NonNull String prefKey) {
+        super(context, prefKey);
+        mFingerprintManager = Utils.getFingerprintManagerOrNull(context);
+    }
+
+    @Override
+    public boolean isChecked() {
+        if (!FingerprintSettings.isFingerprintHardwareDetected(mContext)) {
+            return false;
+        } else if (getRestrictingAdmin() != null) {
+            return false;
+        }
+        final boolean defEnabled = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_screen_off_udfps_enabled);
+        final int value = Settings.Secure.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,
+                defEnabled ? 1 : 0 /* config_screen_off_udfps_enabled */,
+                getUserHandle());
+        return value == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Secure.putIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,
+                isChecked ? 1 : 0,
+                getUserHandle());
+        return true;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        if (!FingerprintSettings.isFingerprintHardwareDetected(mContext)) {
+            preference.setEnabled(false);
+        } else if (!mFingerprintManager.hasEnrolledTemplates(getUserId())) {
+            preference.setEnabled(false);
+        } else if (getRestrictingAdmin() != null) {
+            preference.setEnabled(false);
+        } else {
+            preference.setEnabled(true);
+        }
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public int getAvailabilityStatus() {
+        if (mFingerprintManager != null
+                && mFingerprintManager.isHardwareDetected()
+                && screenOffUnlockUdfps()
+                && !mFingerprintManager.isPowerbuttonFps()) {
+            return mFingerprintManager.hasEnrolledTemplates(getUserId())
+                    ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        } else {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+    }
+
+    private int getUserHandle() {
+        return UserHandle.of(getUserId()).getIdentifier();
+    }
+
+    /**
+     * This feature is not directly searchable.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {};
+
+}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintUnlockCategoryController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintUnlockCategoryController.java
index 674a0dfa758..c949d3da4d8 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintUnlockCategoryController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintUnlockCategoryController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.biometrics.fingerprint;
 
+import static android.hardware.biometrics.Flags.screenOffUnlockUdfps;
+
 import android.content.Context;
 import android.hardware.fingerprint.FingerprintManager;
 
@@ -42,7 +44,7 @@ public class FingerprintUnlockCategoryController extends BasePreferenceControlle
     public int getAvailabilityStatus() {
         if (mFingerprintManager != null
                 && mFingerprintManager.isHardwareDetected()
-                && mFingerprintManager.isPowerbuttonFps()) {
+                && (mFingerprintManager.isPowerbuttonFps() || screenOffUnlockUdfps())) {
             return mFingerprintManager.hasEnrolledTemplates(getUserId())
                     ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
         } else {
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
index c28f9e0e761..931974eaf15 100644
--- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
+++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
@@ -16,27 +16,44 @@
 
 package com.android.settings.biometrics.fingerprint;
 
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.Display;
 import android.view.DisplayInfo;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
+import com.android.settings.flags.Flags;
 import com.android.systemui.biometrics.UdfpsUtils;
 import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
 
@@ -50,6 +67,7 @@ import java.util.Locale;
  * View for udfps enrolling.
  */
 public class UdfpsEnrollEnrollingView extends GlifLayout {
+
     private final UdfpsUtils mUdfpsUtils;
     private final Context mContext;
     // We don't need to listen to onConfigurationChanged() for mRotation here because
@@ -57,14 +75,19 @@ public class UdfpsEnrollEnrollingView extends GlifLayout {
     private final int mRotation;
     private final boolean mIsLandscape;
     private final boolean mShouldUseReverseLandscape;
+
+    private WindowManager mWindowManager;
+
     private UdfpsEnrollView mUdfpsEnrollView;
     private View mHeaderView;
     private AccessibilityManager mAccessibilityManager;
 
+    private ObjectAnimator mHeaderScrollAnimator;
 
     public UdfpsEnrollEnrollingView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
+        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
         mRotation = mContext.getDisplay().getRotation();
         mIsLandscape = mRotation == Surface.ROTATION_90 || mRotation == Surface.ROTATION_270;
         final boolean isLayoutRtl = (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault())
@@ -82,6 +105,168 @@ public class UdfpsEnrollEnrollingView extends GlifLayout {
         mUdfpsEnrollView = findViewById(R.id.udfps_animation_view);
     }
 
+    @Override
+    protected View onInflateTemplate(LayoutInflater inflater, @LayoutRes int template) {
+        final Configuration config = inflater.getContext().getResources().getConfiguration();
+        if (Flags.enrollLayoutTruncateImprovement()
+                && config.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            template = R.layout.biometrics_glif_compact;
+        }
+        return super.onInflateTemplate(inflater, template);
+    }
+
+    void setDecreasePadding(int decreasePadding) {
+        if (mUdfpsEnrollView != null) {
+            mUdfpsEnrollView.setDecreasePadding(decreasePadding);
+        }
+    }
+
+    void onUdfpsSensorRectUpdated() {
+        if (mUdfpsEnrollView != null) {
+            mUdfpsEnrollView.setVisibility(VISIBLE);
+        }
+    }
+
+    private int getScrollableGlifHeaderHeight(boolean isShouldShowLottie) {
+        final TypedValue tvRatio = new TypedValue();
+        if (isLargeDisplaySizeOrFontSize() && !isShouldShowLottie) {
+            getResources().getValue(
+                    R.dimen.biometrics_glif_header_height_ratio_large, tvRatio, true);
+        } else {
+            getResources().getValue(R.dimen.biometrics_glif_header_height_ratio, tvRatio, true);
+        }
+        final float newHeaderHeight = (float) getResources().getDisplayMetrics().heightPixels
+                * tvRatio.getFloat();
+
+        return (int) newHeaderHeight;
+    }
+
+    void adjustScrollableHeaderHeight(ScrollView headerScrollView, boolean isShouldShowLottie) {
+        ViewGroup.LayoutParams params = headerScrollView.getLayoutParams();
+        params.height = getScrollableGlifHeaderHeight(isShouldShowLottie);
+        headerScrollView.setLayoutParams(params);
+    }
+
+    private boolean isLargeDisplaySizeOrFontSize() {
+        final Configuration config = getResources().getConfiguration();
+        if (config.fontScale > 1.3f || getLargeDisplayScale() >= 2.8f) {
+            return true;
+        }
+        return false;
+    }
+
+    private float getLargeDisplayScale() {
+        final Display display = mWindowManager.getDefaultDisplay();
+        final DisplayMetrics metrics = new DisplayMetrics();
+        display.getMetrics(metrics);
+        return metrics.scaledDensity;
+    }
+
+    void adjustUdfpsVieWithFooterBar() {
+        final FrameLayout allContent = findViewById(R.id.suc_layout_status);
+        final ImageView udfpsProgressView = findViewById(
+                R.id.udfps_enroll_animation_fp_progress_view);
+
+        final int navigationBarHeight = getNaviBarHeight();
+        final int footerBarHeight = getFooterBarHeight();
+
+        final int udfpsProgressDrawableBottom = getOnScreenPositionTop(udfpsProgressView)
+                + udfpsProgressView.getDrawable().getBounds().height()
+                - udfpsProgressView.getPaddingBottom() + 2 /* reserved for more space */;
+        final int footerBarTop = getOnScreenPositionTop(allContent) + allContent.getHeight()
+                - (footerBarHeight + navigationBarHeight);
+
+        if (udfpsProgressDrawableBottom > footerBarTop) {
+            int adjustPadding = udfpsProgressDrawableBottom - footerBarTop;
+            setDecreasePadding(adjustPadding);
+        }
+    }
+
+    private int getOnScreenPositionTop(View view) {
+        int [] location = new int[2];
+        view.getLocationOnScreen(location);
+        return location[1];
+    }
+
+    private int getNaviBarHeight() {
+        final Insets inset = mWindowManager.getMaximumWindowMetrics().getWindowInsets().getInsets(
+                WindowInsets.Type.navigationBars());
+        return inset.toRect().height();
+    }
+
+    private int getFooterBarHeight() {
+        TypedArray a = mContext.getTheme().obtainStyledAttributes(new int[] {
+                com.google.android.setupcompat.R.attr.sucFooterBarMinHeight});
+        final int footerBarMinHeight = a.getDimensionPixelSize(0, -1);
+        a.recycle();
+        return footerBarMinHeight;
+    }
+
+    void setFocusOnDescription() {
+        final ScrollView headerScrollView = findViewById(R.id.sud_header_scroll_view);
+        final TextView descriptionView = getDescriptionTextView();
+        if (descriptionView != null && !descriptionView.getText().isEmpty()) {
+            descriptionView.post(
+                    () -> {
+                    Rect scrollBounds = new Rect();
+                    headerScrollView.getHitRect(scrollBounds);
+                    boolean isVisible = descriptionView.getLocalVisibleRect(scrollBounds);
+                    if (!isVisible) {
+                        descriptionView.setFocusable(true);
+                        descriptionView.setFocusableInTouchMode(true);
+                        descriptionView.requestFocus();
+                    }
+                });
+        }
+    }
+
+    void headerVerticalScrolling(ScrollView headerScrollView, long duration,
+            boolean isAccessibilityEnabled) {
+        headerScrollView.post(new Runnable() {
+            @Override
+            public void run() {
+                final int maxScroll = headerScrollView.getChildAt(0).getMeasuredHeight()
+                        - headerScrollView.getMeasuredHeight();
+                mHeaderScrollAnimator = ObjectAnimator.ofInt(
+                        headerScrollView, "scrollY", maxScroll);
+                mHeaderScrollAnimator.setDuration(duration);
+                mHeaderScrollAnimator.addListener(new Animator.AnimatorListener() {
+
+                    @Override
+                    public void onAnimationStart(@NonNull Animator animation) {}
+
+                    @Override
+                    public void onAnimationEnd(@NonNull Animator animation) {
+                            headerScrollView.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mHeaderScrollAnimator.removeAllListeners();
+                                    mHeaderScrollAnimator.reverse();
+                                    if (isAccessibilityEnabled) {
+                                        new Handler().postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                if (!mHeaderScrollAnimator.isRunning()) {
+                                                    setFocusOnDescription();
+                                                }
+                                            }
+                                        }, duration + 200);
+                                    }
+                                }
+                            });
+                    }
+
+                    @Override
+                    public void onAnimationCancel(@NonNull Animator animation) {}
+
+                    @Override
+                    public void onAnimationRepeat(@NonNull Animator animation) {}
+                });
+                mHeaderScrollAnimator.start();
+            }
+        });
+    }
+
     void initView(FingerprintSensorPropertiesInternal udfpsProps,
             UdfpsEnrollHelper udfpsEnrollHelper,
             AccessibilityManager accessibilityManager) {
@@ -93,7 +278,7 @@ public class UdfpsEnrollEnrollingView extends GlifLayout {
         } else if (mShouldUseReverseLandscape) {
             swapHeaderAndContent();
         }
-        mUdfpsEnrollView.setVisibility(View.VISIBLE);
+        mUdfpsEnrollView.setVisibility(View.INVISIBLE);
         setOnHoverListener();
     }
 
@@ -170,13 +355,15 @@ public class UdfpsEnrollEnrollingView extends GlifLayout {
         // TODO(b/260970216) Instead of hiding the description text view, we should
         //  make the header view scrollable if the text is too long.
         // If description text view has overlap with udfps progress view, hide it.
-        final View descView = getDescriptionTextView();
-        getViewTreeObserver().addOnDrawListener(() -> {
-            if (descView.getVisibility() == View.VISIBLE
-                    && hasOverlap(descView, mUdfpsEnrollView)) {
-                descView.setVisibility(View.GONE);
-            }
-        });
+        if (!Flags.enrollLayoutTruncateImprovement()) {
+            final View descView = getDescriptionTextView();
+            getViewTreeObserver().addOnDrawListener(() -> {
+                if (descView.getVisibility() == View.VISIBLE
+                        && hasOverlap(descView, mUdfpsEnrollView)) {
+                    descView.setVisibility(View.GONE);
+                }
+            });
+        }
     }
 
     private void setOnHoverListener() {
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
index 4a2a243d2d8..0c80b483661 100644
--- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
+++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
@@ -133,6 +133,15 @@ public class UdfpsEnrollView extends FrameLayout implements UdfpsEnrollHelper.Li
         enrollHelper.setListener(this);
     }
 
+    /**
+     * Adjust progress bar radius only for decreasing.
+     * @param decreasePadding the decrease padding
+     */
+    void setDecreasePadding(int decreasePadding) {
+        mProgressBarRadius -= decreasePadding;
+        onSensorRectUpdated();
+    }
+
     private void onSensorRectUpdated() {
         updateDimensions();
 
diff --git a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
index e3233ed22b1..790b14af743 100644
--- a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
@@ -45,6 +45,8 @@ import com.android.settings.biometrics.fingerprint2.domain.interactor.EnrollFing
 import com.android.settings.biometrics.fingerprint2.domain.interactor.EnrollStageInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.EnrollStageInteractorImpl
 import com.android.settings.biometrics.fingerprint2.domain.interactor.EnrolledFingerprintsInteractorImpl
+import com.android.settings.biometrics.fingerprint2.domain.interactor.FingerprintEnrollStageCountInteractor
+import com.android.settings.biometrics.fingerprint2.domain.interactor.FingerprintEnrollStageThresholdInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.FingerprintSensorInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.FingerprintSensorInteractorImpl
 import com.android.settings.biometrics.fingerprint2.domain.interactor.FoldStateInteractor
@@ -58,6 +60,7 @@ import com.android.settings.biometrics.fingerprint2.domain.interactor.SensorInte
 import com.android.settings.biometrics.fingerprint2.domain.interactor.TouchEventInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.UdfpsEnrollInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.UdfpsEnrollInteractorImpl
+import com.android.settings.biometrics.fingerprint2.domain.interactor.UserInteractorImpl
 import com.android.settings.biometrics.fingerprint2.domain.interactor.VibrationInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.VibrationInteractorImpl
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.AuthenitcateInteractor
@@ -67,6 +70,7 @@ import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.Genera
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.RemoveFingerprintInteractor
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.RenameFingerprintInteractor
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.SensorInteractor
+import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.UserInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.Settings
 import java.util.concurrent.Executors
 import kotlinx.coroutines.MainScope
@@ -97,11 +101,11 @@ class BiometricsEnvironment(
         com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser
       )
     )
-  private val fingerprintEnrollmentRepository =
-    FingerprintEnrollmentRepositoryImpl(fingerprintManager, userRepo, fingerprintSettingsRepository,
-      backgroundDispatcher, applicationScope)
   private val fingerprintSensorRepository: FingerprintSensorRepository =
     FingerprintSensorRepositoryImpl(fingerprintManager, backgroundDispatcher, applicationScope)
+  private val fingerprintEnrollmentRepository =
+    FingerprintEnrollmentRepositoryImpl(fingerprintManager, userRepo, fingerprintSettingsRepository,
+      backgroundDispatcher, applicationScope, fingerprintSensorRepository)
   private val debuggingRepository: DebuggingRepository = DebuggingRepositoryImpl()
   private val udfpsDebugRepo = UdfpsEnrollDebugRepositoryImpl()
 
@@ -111,29 +115,34 @@ class BiometricsEnvironment(
   fun createCanEnrollFingerprintsInteractor(): CanEnrollFingerprintsInteractor =
     CanEnrollFingerprintsInteractorImpl(fingerprintEnrollmentRepository)
 
+  fun createFingerprintEnrollStageCountInteractor(): FingerprintEnrollStageCountInteractor =
+    FingerprintEnrollStageCountInteractor(fingerprintEnrollmentRepository)
+
+  fun createFingerprintEnrollStageThresholdInteractor(): FingerprintEnrollStageThresholdInteractor =
+    FingerprintEnrollStageThresholdInteractor(fingerprintEnrollmentRepository)
+
   fun createGenerateChallengeInteractor(): GenerateChallengeInteractor =
-    GenerateChallengeInteractorImpl(fingerprintManager, context.userId, gateKeeperPasswordProvider)
+    GenerateChallengeInteractorImpl(fingerprintManager, userRepo, gateKeeperPasswordProvider)
 
   fun createFingerprintEnrollInteractor(): EnrollFingerprintInteractor =
-    EnrollFingerprintInteractorImpl(context.userId, fingerprintManager, Settings)
+    EnrollFingerprintInteractorImpl(userRepo, fingerprintManager, Settings)
 
   fun createFingerprintsEnrolledInteractor(): EnrolledFingerprintsInteractorImpl =
-    EnrolledFingerprintsInteractorImpl(fingerprintManager, context.userId)
+    EnrolledFingerprintsInteractorImpl(fingerprintEnrollmentRepository)
 
   fun createAuthenticateInteractor(): AuthenitcateInteractor =
-    AuthenticateInteractorImpl(fingerprintManager, context.userId)
+    AuthenticateInteractorImpl(fingerprintManager, userRepo)
+
+  fun createUserInteractor(): UserInteractor = UserInteractorImpl(userRepo)
 
   fun createRemoveFingerprintInteractor(): RemoveFingerprintInteractor =
-    RemoveFingerprintsInteractorImpl(fingerprintManager, context.userId)
+    RemoveFingerprintsInteractorImpl(fingerprintManager, userRepo)
 
   fun createRenameFingerprintInteractor(): RenameFingerprintInteractor =
-    RenameFingerprintsInteractorImpl(fingerprintManager, context.userId, backgroundDispatcher)
+    RenameFingerprintsInteractorImpl(fingerprintManager, userRepo, backgroundDispatcher)
 
-  val accessibilityInteractor: AccessibilityInteractor by lazy {
-    AccessibilityInteractorImpl(
-      context.getSystemService(AccessibilityManager::class.java)!!,
-      applicationScope,
-    )
+  fun createAccessibilityInteractor(): AccessibilityInteractor {
+    return AccessibilityInteractorImpl(context.getSystemService(AccessibilityManager::class.java)!!)
   }
 
   val foldStateInteractor: FoldStateInteractor by lazy { FoldStateInteractorImpl(context) }
@@ -153,7 +162,7 @@ class BiometricsEnvironment(
   val enrollStageInteractor: EnrollStageInteractor by lazy { EnrollStageInteractorImpl() }
 
   val udfpsEnrollInteractor: UdfpsEnrollInteractor by lazy {
-    UdfpsEnrollInteractorImpl(context, accessibilityInteractor)
+    UdfpsEnrollInteractorImpl(context, createAccessibilityInteractor())
   }
 
   val sensorInteractor: FingerprintSensorInteractor by lazy {
diff --git a/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt b/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
index 0ef1d256808..27465c29c24 100644
--- a/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
@@ -67,6 +67,7 @@ object Util {
     return FingerEnrollState.EnrollError(
       errTitle,
       errString,
+      this,
       this == FINGERPRINT_ERROR_UNABLE_TO_PROCESS,
       this == FINGERPRINT_ERROR_CANCELED,
     )
diff --git a/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintEnrollmentRepo.kt b/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintEnrollmentRepo.kt
index 22904e9d2ac..d01a49c3a6f 100644
--- a/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintEnrollmentRepo.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintEnrollmentRepo.kt
@@ -23,14 +23,16 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 
 /** Repository that contains information about fingerprint enrollments. */
@@ -38,20 +40,41 @@ interface FingerprintEnrollmentRepository {
   /** The current enrollments of the user */
   val currentEnrollments: Flow<List<FingerprintData>?>
 
+  /** Indicates the maximum fingerprints that are enrollable * */
+  val maxFingerprintsEnrollable: Flow<Int>
+
   /** Indicates if a user can enroll another fingerprint */
   val canEnrollUser: Flow<Boolean>
 
-  fun maxFingerprintsEnrollable(): Int
+  val enrollStageCount: Int
+
+  /**
+   * Returns the threshold for the given stage of fingerprint enrollment.
+   *
+   * @param index The index of the enrollment stage.
+   * @return The threshold for the enrollment stage.
+   */
+  fun getEnrollStageThreshold(index: Int): Float
+
+  /**
+   * Indicates if we should use the default settings for maximum enrollments or the sensor props
+   * from the fingerprint sensor
+   */
+  fun setShouldUseSettingsMaxFingerprints(useSettings: Boolean)
 }
 
 class FingerprintEnrollmentRepositoryImpl(
-  fingerprintManager: FingerprintManager,
+  private val fingerprintManager: FingerprintManager,
   userRepo: UserRepo,
-  private val settingsRepository: FingerprintSettingsRepository,
+  settingsRepository: FingerprintSettingsRepository,
   backgroundDispatcher: CoroutineDispatcher,
   applicationScope: CoroutineScope,
+  sensorRepo: FingerprintSensorRepository,
 ) : FingerprintEnrollmentRepository {
 
+  private val _shouldUseSettingsMaxFingerprints = MutableStateFlow(false)
+  val shouldUseSettingsMaxFingerprints = _shouldUseSettingsMaxFingerprints.asStateFlow()
+
   private val enrollmentChangedFlow: Flow<Int?> =
     callbackFlow {
         val callback =
@@ -72,27 +95,40 @@ class FingerprintEnrollmentRepositoryImpl(
   override val currentEnrollments: Flow<List<FingerprintData>> =
     userRepo.currentUser
       .distinctUntilChanged()
-      .flatMapLatest { currentUser ->
-        enrollmentChangedFlow.map { enrollmentChanged ->
-          if (enrollmentChanged == null || enrollmentChanged == currentUser) {
-            fingerprintManager
-              .getEnrolledFingerprints(currentUser)
-              ?.map { (FingerprintData(it.name.toString(), it.biometricId, it.deviceId)) }
-              ?.toList()
-          } else {
-            null
-          }
-        }
-      }
+      .combine(enrollmentChangedFlow) { currentUser, _ -> getFingerprintsForUser(currentUser) }
       .filterNotNull()
       .flowOn(backgroundDispatcher)
 
-  override val canEnrollUser: Flow<Boolean> =
-    currentEnrollments.map {
-      it?.size?.let { it < settingsRepository.maxEnrollableFingerprints() } ?: false
+  override val maxFingerprintsEnrollable: Flow<Int> =
+    shouldUseSettingsMaxFingerprints.combine(sensorRepo.fingerprintSensor) {
+      shouldUseSettings,
+      sensor ->
+      if (shouldUseSettings) {
+        settingsRepository.maxEnrollableFingerprints()
+      } else {
+        sensor.maxEnrollmentsPerUser
+      }
     }
 
-  override fun maxFingerprintsEnrollable(): Int {
-    return settingsRepository.maxEnrollableFingerprints()
+  override val canEnrollUser: Flow<Boolean> =
+    currentEnrollments.combine(maxFingerprintsEnrollable) { enrollments, maxFingerprints ->
+      enrollments.size < maxFingerprints
+    }
+
+  override fun setShouldUseSettingsMaxFingerprints(useSettings: Boolean) {
+    _shouldUseSettingsMaxFingerprints.update { useSettings }
   }
+
+  private fun getFingerprintsForUser(userId: Int): List<FingerprintData>? {
+    return fingerprintManager
+      .getEnrolledFingerprints(userId)
+      ?.map { (FingerprintData(it.name.toString(), it.biometricId, it.deviceId)) }
+      ?.toList()
+  }
+
+  override val enrollStageCount: Int
+    get() = fingerprintManager.enrollStageCount
+
+  override fun getEnrollStageThreshold(index: Int): Float =
+    fingerprintManager.getEnrollStageThreshold(index)
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepository.kt b/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepository.kt
index 1cca532c6ac..8476f3b0e3b 100644
--- a/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepository.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepository.kt
@@ -16,6 +16,7 @@
 
 package com.android.settings.biometrics.fingerprint2.data.repository
 
+import android.annotation.SuppressLint
 import android.hardware.biometrics.ComponentInfoInternal
 import android.hardware.biometrics.SensorLocationInternal
 import android.hardware.biometrics.SensorProperties
@@ -23,18 +24,24 @@ import android.hardware.fingerprint.FingerprintManager
 import android.hardware.fingerprint.FingerprintSensorProperties
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
 import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback
+import android.util.Log
 import com.android.systemui.biometrics.shared.model.FingerprintSensor
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 /**
@@ -56,17 +63,24 @@ class FingerprintSensorRepositoryImpl(
   activityScope: CoroutineScope,
 ) : FingerprintSensorRepository {
 
-  private val fingerprintPropsInternal: Flow<FingerprintSensorPropertiesInternal> =
-    callbackFlow {
+  private val _fingerprintSensor = MutableSharedFlow<FingerprintSensor>(replay = 1)
+  override val fingerprintSensor: Flow<FingerprintSensor>
+    get() = _fingerprintSensor.asSharedFlow()
+
+  init {
+    activityScope.launch {
+      callbackFlow{
         val callback =
           object : IFingerprintAuthenticatorsRegisteredCallback.Stub() {
+            @SuppressLint("LongLogTag")
             override fun onAllAuthenticatorsRegistered(
               sensors: List<FingerprintSensorPropertiesInternal>
             ) {
               if (sensors.isEmpty()) {
-                trySend(DEFAULT_PROPS)
+                Log.e(TAG, "empty sensors from onAllAuthenticatorsRegistered")
               } else {
                 trySend(sensors[0])
+                channel.close()
               }
             }
           }
@@ -74,27 +88,16 @@ class FingerprintSensorRepositoryImpl(
           fingerprintManager.addAuthenticatorsRegisteredCallback(callback)
         }
         awaitClose {}
+      }.collect {
+        _fingerprintSensor.emit(it.toFingerprintSensor())
       }
-      .stateIn(activityScope, started = SharingStarted.Eagerly, initialValue = DEFAULT_PROPS)
-
-  override val fingerprintSensor: Flow<FingerprintSensor> =
-    fingerprintPropsInternal.transform { emit(it.toFingerprintSensor()) }
+    }
+  }
 
   override val hasSideFps: Flow<Boolean> =
     fingerprintSensor.flatMapLatest { flow { emit(fingerprintManager.isPowerbuttonFps()) } }
 
-  companion object {
-
-    private val DEFAULT_PROPS =
-      FingerprintSensorPropertiesInternal(
-        -1 /* sensorId */,
-        SensorProperties.STRENGTH_CONVENIENCE,
-        0 /* maxEnrollmentsPerUser */,
-        listOf<ComponentInfoInternal>(),
-        FingerprintSensorProperties.TYPE_UNKNOWN,
-        false /* halControlsIllumination */,
-        true /* resetLockoutRequiresHardwareAuthToken */,
-        listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
-      )
+  private companion object {
+    const val TAG = "FingerprintSensorRepository"
   }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/data/repository/UserRepo.kt b/src/com/android/settings/biometrics/fingerprint2/data/repository/UserRepo.kt
index 720e7787d12..91260431bc5 100644
--- a/src/com/android/settings/biometrics/fingerprint2/data/repository/UserRepo.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/data/repository/UserRepo.kt
@@ -17,7 +17,10 @@
 package com.android.settings.biometrics.fingerprint2.data.repository
 
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.update
 
 /**
  * A repository responsible for indicating the current user.
@@ -27,8 +30,18 @@ interface UserRepo {
      * This flow indicates the current user.
      */
     val currentUser: Flow<Int>
+
+    /**
+     * Updates the current user.
+     */
+    fun updateUser(user: Int)
 }
 
-class UserRepoImpl(val currUser: Int): UserRepo {
-    override val currentUser: Flow<Int> = flowOf(currUser)
+class UserRepoImpl(currUser: Int): UserRepo {
+    private val _currentUser = MutableStateFlow(currUser)
+    override val currentUser = _currentUser.asStateFlow()
+
+    override fun updateUser(user: Int) {
+        _currentUser.update { user }
+    }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
index e1a08e6cda2..bf0084d14a8 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
@@ -16,6 +16,9 @@
 
 package com.android.settings.biometrics.fingerprint2.domain.interactor
 
+import android.util.Log
+import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT
 import android.view.accessibility.AccessibilityManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
@@ -27,15 +30,19 @@ import kotlinx.coroutines.flow.stateIn
 /** Represents all of the information on accessibility state. */
 interface AccessibilityInteractor {
   /** A flow that contains whether or not accessibility is enabled */
-  val isAccessibilityEnabled: Flow<Boolean>
+  fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean>
+
+  val isEnabled: Boolean
+
+  fun announce(clazz: Class<*>, announcement: CharSequence?)
+
+  fun interrupt()
 }
 
-class AccessibilityInteractorImpl(
-  accessibilityManager: AccessibilityManager,
-  applicationScope: CoroutineScope,
-) : AccessibilityInteractor {
+class AccessibilityInteractorImpl(private val accessibilityManager: AccessibilityManager) :
+  AccessibilityInteractor {
   /** A flow that contains whether or not accessibility is enabled */
-  override val isAccessibilityEnabled: Flow<Boolean> =
+  override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> =
     callbackFlow {
         val listener =
           AccessibilityManager.AccessibilityStateChangeListener { enabled -> trySend(enabled) }
@@ -45,8 +52,32 @@ class AccessibilityInteractorImpl(
         awaitClose { accessibilityManager.removeAccessibilityStateChangeListener(listener) }
       }
       .stateIn(
-        applicationScope, // This is going to tied to the activity scope
+        scope,
         SharingStarted.WhileSubscribed(), // When no longer subscribed, we removeTheListener
         false,
       )
+
+  override val isEnabled: Boolean
+    get() = accessibilityManager.isEnabled
+
+  override fun announce(clazz: Class<*>, announcement: CharSequence?) {
+    val event = AccessibilityEvent(TYPE_ANNOUNCEMENT)
+    event.className = clazz.javaClass.name
+    event.packageName = clazz.packageName
+    event.text.add(announcement)
+    accessibilityManager.sendAccessibilityEvent(event)
+  }
+
+  /** Interrupts the current accessibility manager from announcing a phrase. */
+  override fun interrupt() {
+    try {
+      accessibilityManager.interrupt()
+    } catch (e: IllegalStateException) {
+      Log.e(TAG, "Error trying to interrupt when accessibility isn't enabled $e")
+    }
+  }
+
+  companion object {
+    const val TAG = "AccessibilityInteractor"
+  }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AuthenticateInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AuthenticateInteractorImpl.kt
index df93092619f..8640177f0e2 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AuthenticateInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AuthenticateInteractorImpl.kt
@@ -19,19 +19,22 @@ package com.android.settings.biometrics.fingerprint2.domain.interactor
 import android.hardware.fingerprint.FingerprintManager
 import android.os.CancellationSignal
 import android.util.Log
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.AuthenitcateInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintAuthAttemptModel
 import kotlin.coroutines.resume
 import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.suspendCancellableCoroutine
 
 class AuthenticateInteractorImpl(
   private val fingerprintManager: FingerprintManager,
-  private val userId: Int,
+  private val userRepo: UserRepo,
 ) : AuthenitcateInteractor {
 
-  override suspend fun authenticate(): FingerprintAuthAttemptModel =
-    suspendCancellableCoroutine { c: CancellableContinuation<FingerprintAuthAttemptModel> ->
+  override suspend fun authenticate(): FingerprintAuthAttemptModel {
+    val userId = userRepo.currentUser.first()
+    return suspendCancellableCoroutine { c: CancellableContinuation<FingerprintAuthAttemptModel> ->
       val authenticationCallback =
         object : FingerprintManager.AuthenticationCallback() {
 
@@ -64,6 +67,7 @@ class AuthenticateInteractorImpl(
         userId,
       )
     }
+  }
 
   companion object {
     private const val TAG = "AuthenticateInteractor"
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/CanEnrollFingerprintsInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/CanEnrollFingerprintsInteractorImpl.kt
index caeea4e4586..cfdfbe23081 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/CanEnrollFingerprintsInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/CanEnrollFingerprintsInteractorImpl.kt
@@ -21,11 +21,14 @@ import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.CanEnr
 import kotlinx.coroutines.flow.Flow
 
 class CanEnrollFingerprintsInteractorImpl(
-  val fingerprintEnrollmentRepository: FingerprintEnrollmentRepository
+  private val fingerprintEnrollmentRepository: FingerprintEnrollmentRepository
 ) : CanEnrollFingerprintsInteractor {
   override val canEnrollFingerprints: Flow<Boolean> = fingerprintEnrollmentRepository.canEnrollUser
   /** Indicates the maximum fingerprints enrollable for a given user */
-  override fun maxFingerprintsEnrollable(): Int {
-    return fingerprintEnrollmentRepository.maxFingerprintsEnrollable()
+  override val maxFingerprintsEnrollable: Flow<Int> =
+    fingerprintEnrollmentRepository.maxFingerprintsEnrollable
+
+  override fun setShouldUseSettingsMaxFingerprints(useSettings: Boolean) {
+    fingerprintEnrollmentRepository.setShouldUseSettingsMaxFingerprints(useSettings)
   }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
index 6dfb4c290d6..00e85b1f8f2 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
@@ -42,7 +42,7 @@ interface DisplayDensityInteractor {
   val fontScale: Flow<Float>
 
   /** A flow that propagates displayDensity. */
-  val displayDensity: Flow<Int>
+  val displayDensity: Flow<Int?>
 
   /** A flow that propagates the default display density. */
   val defaultDisplayDensity: Flow<Int>
@@ -67,16 +67,14 @@ class DisplayDensityInteractorImpl(context: Context, scope: CoroutineScope) :
 
   private val _fontScale = MutableStateFlow(context.resources.configuration.fontScale)
   private val _displayDensity =
-    MutableStateFlow(
-      displayDensityUtils.defaultDisplayDensityValues[
-          displayDensityUtils.currentIndexForDefaultDisplay]
-    )
+    MutableStateFlow(displayDensityUtils.values?.let{
+      it[displayDensityUtils.currentIndex]
+    })
 
   override val fontScale: Flow<Float> = _fontScale.asStateFlow()
 
-  override val displayDensity: Flow<Int> = _displayDensity.asStateFlow()
+  override val displayDensity: Flow<Int?> = _displayDensity.asStateFlow()
 
   override val defaultDisplayDensity: Flow<Int> =
-    flowOf(displayDensityUtils.defaultDensityForDefaultDisplay)
-      .shareIn(scope, SharingStarted.Eagerly, 1)
+    flowOf(displayDensityUtils.defaultDensity).shareIn(scope, SharingStarted.Eagerly, 1)
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrollFingerprintInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrollFingerprintInteractorImpl.kt
index 3e14a640278..2c1cacab992 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrollFingerprintInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrollFingerprintInteractorImpl.kt
@@ -22,6 +22,7 @@ import android.os.CancellationSignal
 import android.util.Log
 import com.android.settings.biometrics.fingerprint2.conversion.Util.toEnrollError
 import com.android.settings.biometrics.fingerprint2.conversion.Util.toOriginalReason
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.EnrollFingerprintInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.EnrollReason
 import com.android.settings.biometrics.fingerprint2.lib.model.FingerEnrollState
@@ -33,10 +34,11 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
 
 class EnrollFingerprintInteractorImpl(
-  private val userId: Int,
+  private val userRepo: UserRepo,
   private val fingerprintManager: FingerprintManager,
   private val fingerprintFlow: FingerprintFlow,
 ) : EnrollFingerprintInteractor {
@@ -47,6 +49,7 @@ class EnrollFingerprintInteractorImpl(
     enrollReason: EnrollReason,
     fingerprintEnrollOptions: FingerprintEnrollOptions,
   ): Flow<FingerEnrollState> = callbackFlow {
+    val userId = userRepo.currentUser.first()
     // TODO (b/308456120) Improve this logic
     if (enrollRequestOutstanding.value) {
       Log.d(TAG, "Outstanding enroll request, waiting 150ms")
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrolledFingerprintsInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrolledFingerprintsInteractorImpl.kt
index 83b532ecd98..f8bcaf7d634 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrolledFingerprintsInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/EnrolledFingerprintsInteractorImpl.kt
@@ -16,22 +16,14 @@
 
 package com.android.settings.biometrics.fingerprint2.domain.interactor
 
-import android.hardware.fingerprint.FingerprintManager
+import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintEnrollmentRepository
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.EnrolledFingerprintsInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 
 class EnrolledFingerprintsInteractorImpl(
-  private val fingerprintManager: FingerprintManager,
-  userId: Int,
+  private val fingerprintEnrollmentRepository: FingerprintEnrollmentRepository
 ) : EnrolledFingerprintsInteractor {
-  override val enrolledFingerprints: Flow<List<FingerprintData>?> = flow {
-    emit(
-      fingerprintManager
-        .getEnrolledFingerprints(userId)
-        ?.map { (FingerprintData(it.name.toString(), it.biometricId, it.deviceId)) }
-        ?.toList()
-    )
-  }
+  override val enrolledFingerprints: Flow<List<FingerprintData>?> =
+    fingerprintEnrollmentRepository.currentEnrollments
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageCountInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageCountInteractor.kt
new file mode 100644
index 00000000000..614815805f5
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageCountInteractor.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fingerprint2.domain.interactor
+
+import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintEnrollmentRepository
+
+/**
+ * Interactor class for retrieving the total number of enrollment stages.
+ *
+ * This class interacts with the `FingerprintsRepository` to obtain the count
+ * of stages involved in the fingerprint enrollment process.
+ */
+class FingerprintEnrollStageCountInteractor (
+    fingerprintEnrollmentRepository: FingerprintEnrollmentRepository
+) {
+    /** The total number of enrollment stages. */
+    val count: Int = fingerprintEnrollmentRepository.enrollStageCount
+}
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageThresholdInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageThresholdInteractor.kt
new file mode 100644
index 00000000000..a96e4efac04
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintEnrollStageThresholdInteractor.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fingerprint2.domain.interactor
+
+import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintEnrollmentRepository
+
+/**
+ * Interactor class for retrieving the enrollment stage threshold.
+ *
+ * This class interacts with the `fingerprintEnrollmentRepository` to fetch the threshold value
+ * for a specific enrollment stage.
+ */
+class FingerprintEnrollStageThresholdInteractor(
+    private val fingerprintEnrollmentRepository: FingerprintEnrollmentRepository,
+) {
+    /**
+     * Retrieves the enrollment stage threshold for the given index.
+     *
+     * @param index The index of the enrollment stage.
+     * @return The threshold value for the specified stage.
+     */
+    fun getThreshold(index: Int): Float = fingerprintEnrollmentRepository.getEnrollStageThreshold(index)
+}
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/GenerateChallengeInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/GenerateChallengeInteractorImpl.kt
index a2080fbb74f..365e644afdf 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/GenerateChallengeInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/GenerateChallengeInteractorImpl.kt
@@ -19,19 +19,22 @@ package com.android.settings.biometrics.fingerprint2.domain.interactor
 import android.content.Intent
 import android.hardware.fingerprint.FingerprintManager
 import com.android.settings.biometrics.GatekeeperPasswordProvider
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.GenerateChallengeInteractor
 import com.android.settings.password.ChooseLockSettingsHelper
+import kotlinx.coroutines.flow.first
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class GenerateChallengeInteractorImpl(
   private val fingerprintManager: FingerprintManager,
-  private val userId: Int,
+  private val userRepo: UserRepo,
   private val gatekeeperPasswordProvider: GatekeeperPasswordProvider,
 ) : GenerateChallengeInteractor {
 
-  override suspend fun generateChallenge(gateKeeperPasswordHandle: Long): Pair<Long, ByteArray> =
-    suspendCoroutine {
+  override suspend fun generateChallenge(gateKeeperPasswordHandle: Long): Pair<Long, ByteArray> {
+    val userId = userRepo.currentUser.first()
+    return suspendCoroutine {
       val callback =
         FingerprintManager.GenerateChallengeCallback { _, userId, challenge ->
           val intent = Intent()
@@ -45,4 +48,5 @@ class GenerateChallengeInteractorImpl(
         }
       fingerprintManager.generateChallenge(userId, callback)
     }
+  }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/OrientationInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/OrientationInteractor.kt
index e55d6b899ca..e273bb76c8f 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/OrientationInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/OrientationInteractor.kt
@@ -19,10 +19,13 @@ package com.android.settings.biometrics.fingerprint2.domain.interactor
 import android.content.Context
 import android.view.OrientationEventListener
 import com.android.internal.R
+import com.android.settings.biometrics.fingerprint2.lib.model.Orientation
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.transform
 
 /** Interactor which provides information about orientation */
@@ -45,6 +48,9 @@ interface OrientationInteractor {
    * [R.bool.config_reverseDefaultConfigRotation]
    */
   fun getRotationFromDefault(rotation: Int): Int
+
+  /** Indicates an orientation changed event has occurred */
+  val orientationChanged: Flow<Orientation>
 }
 
 class OrientationInteractorImpl(private val context: Context) : OrientationInteractor {
@@ -60,7 +66,10 @@ class OrientationInteractorImpl(private val context: Context) : OrientationInter
     awaitClose { orientationEventListener.disable() }
   }
 
-  override val rotation: Flow<Int> = orientation.transform { emit(context.display.rotation) }
+  override val rotation: Flow<Int> =
+    orientation
+      .transform { emit(context.display.rotation) }
+      .onStart { emit(context.display.rotation) }
 
   override val rotationFromDefault: Flow<Int> = rotation.map { getRotationFromDefault(it) }
 
@@ -73,4 +82,24 @@ class OrientationInteractorImpl(private val context: Context) : OrientationInter
       rotation
     }
   }
+
+  override val orientationChanged: Flow<Orientation> =
+    rotationFromDefault
+      .map {
+        when (it) {
+          1 -> {
+            Orientation.Portrait
+          }
+          2 -> {
+            Orientation.ReverseLandscape
+          }
+          3 -> {
+            Orientation.UpsideDownPortrait
+          }
+          else -> {
+            Orientation.Landscape
+          }
+        }
+      }
+      .distinctUntilChanged()
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RemoveFingerprintsInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RemoveFingerprintsInteractorImpl.kt
index 4232963ad55..cb33ff412aa 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RemoveFingerprintsInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RemoveFingerprintsInteractorImpl.kt
@@ -18,38 +18,43 @@ package com.android.settings.biometrics.fingerprint2.domain.interactor
 
 import android.hardware.fingerprint.FingerprintManager
 import android.hardware.fingerprint.FingerprintManager.RemovalCallback
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.RemoveFingerprintInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
+import kotlinx.coroutines.flow.first
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class RemoveFingerprintsInteractorImpl(
   private val fingerprintManager: FingerprintManager,
-  private val userId: Int,
+  private val userRepo: UserRepo,
 ) : RemoveFingerprintInteractor {
 
-  override suspend fun removeFingerprint(fp: FingerprintData): Boolean = suspendCoroutine {
-    val callback =
-      object : RemovalCallback() {
-        override fun onRemovalError(
-          fp: android.hardware.fingerprint.Fingerprint,
-          errMsgId: Int,
-          errString: CharSequence,
-        ) {
-          it.resume(false)
-        }
+  override suspend fun removeFingerprint(fp: FingerprintData): Boolean {
+    val userId = userRepo.currentUser.first()
+    return suspendCoroutine {
+      val callback =
+        object : RemovalCallback() {
+          override fun onRemovalError(
+            fp: android.hardware.fingerprint.Fingerprint,
+            errMsgId: Int,
+            errString: CharSequence,
+          ) {
+            it.resume(false)
+          }
 
-        override fun onRemovalSucceeded(
-          fp: android.hardware.fingerprint.Fingerprint?,
-          remaining: Int,
-        ) {
-          it.resume(true)
+          override fun onRemovalSucceeded(
+            fp: android.hardware.fingerprint.Fingerprint?,
+            remaining: Int,
+          ) {
+            it.resume(true)
+          }
         }
-      }
-    fingerprintManager.remove(
-      android.hardware.fingerprint.Fingerprint(fp.name, fp.fingerId, fp.deviceId),
-      userId,
-      callback,
-    )
+      fingerprintManager.remove(
+        android.hardware.fingerprint.Fingerprint(fp.name, fp.fingerId, fp.deviceId),
+        userId,
+        callback,
+      )
+    }
   }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RenameFingerprintsInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RenameFingerprintsInteractorImpl.kt
index f238e7c4f2e..5ab702afb9a 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RenameFingerprintsInteractorImpl.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/RenameFingerprintsInteractorImpl.kt
@@ -17,18 +17,21 @@
 package com.android.settings.biometrics.fingerprint2.domain.interactor
 
 import android.hardware.fingerprint.FingerprintManager
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
 import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.RenameFingerprintInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.FingerprintData
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 
 class RenameFingerprintsInteractorImpl(
   private val fingerprintManager: FingerprintManager,
-  private val userId: Int,
+  private val userRepo: UserRepo,
   private val backgroundDispatcher: CoroutineDispatcher,
 ) : RenameFingerprintInteractor {
 
   override suspend fun renameFingerprint(fp: FingerprintData, newName: String) {
+    val userId = userRepo.currentUser.first()
     withContext(backgroundDispatcher) { fingerprintManager.rename(fp.fingerId, userId, newName) }
   }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
index 006060a54b9..62c51aeb527 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
@@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint2.domain.interactor
 import android.content.Context
 import android.graphics.PointF
 import android.util.TypedValue
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
@@ -87,7 +88,7 @@ class UdfpsEnrollInteractorImpl(
   override val guidedEnrollmentOffset: Flow<PointF> =
     combine(
       _guidedEnrollment,
-      accessibilityInteractor.isAccessibilityEnabled,
+      accessibilityInteractor.isEnabledFlow(MainScope()),
       isGuidedEnrollment,
     ) { point, accessibilityEnabled, guidedEnrollmentEnabled ->
       if (accessibilityEnabled || !guidedEnrollmentEnabled) {
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UserInteractorImpl.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UserInteractorImpl.kt
new file mode 100644
index 00000000000..506006e8903
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UserInteractorImpl.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fingerprint2.domain.interactor
+
+import com.android.settings.biometrics.fingerprint2.data.repository.UserRepo
+import com.android.settings.biometrics.fingerprint2.lib.domain.interactor.UserInteractor
+import kotlinx.coroutines.flow.Flow
+
+class UserInteractorImpl(private val userRepo: UserRepo) : UserInteractor {
+  override val currentUser: Flow<Int> = userRepo.currentUser
+
+  override fun updateUser(user: Int) = userRepo.updateUser(user)
+}
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/CanEnrollFingerprintsInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/CanEnrollFingerprintsInteractor.kt
index 11a9258ed88..a5277a5e8a5 100644
--- a/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/CanEnrollFingerprintsInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/CanEnrollFingerprintsInteractor.kt
@@ -23,5 +23,17 @@ interface CanEnrollFingerprintsInteractor {
   /** Returns true if a user can enroll a fingerprint false otherwise. */
   val canEnrollFingerprints: Flow<Boolean>
   /** Indicates the maximum fingerprints enrollable for a given user */
-  fun maxFingerprintsEnrollable(): Int
+  val maxFingerprintsEnrollable: Flow<Int>
+
+  /**
+   * Indicates if we should use the default settings for maximum enrollments or the sensor props
+   * from the fingerprint sensor. This can be useful if you are supporting HIDL & AIDL enrollment
+   * types from one code base. Prior to AIDL there was no way to determine how many
+   * fingerprints were enrollable, Settings relied on
+   * com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser.
+   *
+   * Typically Fingerprints with AIDL HAL's should not use this
+   * (setShouldUseSettingsMaxFingerprints(false))
+   */
+  fun setShouldUseSettingsMaxFingerprints(useSettings: Boolean)
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/UserInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/UserInteractor.kt
new file mode 100644
index 00000000000..17b147a2f31
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/domain/interactor/UserInteractor.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fingerprint2.lib.domain.interactor
+
+import kotlinx.coroutines.flow.Flow
+
+interface UserInteractor {
+    /**
+     * This flow indicates the current user.
+     */
+    val currentUser: Flow<Int>
+
+    /**
+     * Updates the current user.
+     */
+    fun updateUser(user: Int)
+}
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt b/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
index e087304d4f0..1d368c0996c 100644
--- a/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
@@ -35,10 +35,13 @@ sealed class FingerEnrollState {
   data class EnrollHelp(@StringRes val helpMsgId: Int, val helpString: String) :
     FingerEnrollState()
 
-  /** Represents that an unrecoverable error has been encountered and the operation is complete. */
+  /** Represents that an unrecoverable error has been encountered and the operation is complete.
+   * Note that errorId is the raw error id from [FingerprintManager]
+   */
   data class EnrollError(
     @StringRes val errTitle: Int,
     @StringRes val errString: Int,
+    val errorId: Int,
     val shouldRetryEnrollment: Boolean,
     val isCancelled: Boolean,
   ) : FingerEnrollState()
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/model/Orientation.kt b/src/com/android/settings/biometrics/fingerprint2/lib/model/Orientation.kt
new file mode 100644
index 00000000000..c88067772b8
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/model/Orientation.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fingerprint2.lib.model
+
+/** The orientation events correspond to androids internal orientation events. */
+sealed class Orientation {
+  /** Indicates the device is in landscape orientation */
+  data object Landscape : Orientation()
+
+  /** Indicates the device is in reverse landscape orientation */
+  data object ReverseLandscape : Orientation()
+
+  /** Indicates the device is in portrait orientation */
+  data object Portrait : Orientation()
+
+  /** Indicates the device is in the upside down portrait orientation */
+  data object UpsideDownPortrait : Orientation()
+}
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
index 77d070e5026..dc89c93eb6c 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
@@ -149,11 +149,11 @@ class FingerprintEnrollmentV2Activity : FragmentActivity() {
     super.onConfigurationChanged(newConfig)
     foldStateInteractor.onConfigurationChange(newConfig)
     val displayDensityUtils = DisplayDensityUtils(applicationContext)
-    val currIndex = displayDensityUtils.currentIndexForDefaultDisplay
+    val currIndex = displayDensityUtils.currentIndex
     displayDensityInteractor.updateFontScale(resources.configuration.fontScale)
-    displayDensityInteractor.updateDisplayDensity(
-      displayDensityUtils.defaultDisplayDensityValues[currIndex]
-    )
+    displayDensityUtils.values?.let {
+      displayDensityInteractor.updateDisplayDensity(it[currIndex])
+    }
   }
 
   private fun onConfirmDevice(resultCode: Int, data: Intent?) {
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
index 658c6c747c2..df46aa4c8a5 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
@@ -179,7 +179,7 @@ class UdfpsViewModel(
 
   /** Indicates if accessibility is enabled */
   val accessibilityEnabled =
-    accessibilityInteractor.isAccessibilityEnabled.shareIn(
+    accessibilityInteractor.isEnabledFlow(viewModelScope).shareIn(
       this.viewModelScope,
       SharingStarted.Eagerly,
       replay = 1,
@@ -425,7 +425,7 @@ class UdfpsViewModel(
           biometricEnvironment.enrollStageInteractor,
           biometricEnvironment.orientationInteractor,
           biometricEnvironment.udfpsEnrollInteractor,
-          biometricEnvironment.accessibilityInteractor,
+          biometricEnvironment.createAccessibilityInteractor(),
           biometricEnvironment.sensorInteractor,
           biometricEnvironment.touchEventInteractor,
           biometricEnvironment.createSensorPropertiesInteractor(),
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
index 9b2cdde7cef..b27cfdd2eea 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
@@ -84,7 +84,7 @@ class FingerprintEnrollFindSensorViewModel(
 
   /** Represents the stream of showing udfps lottie and whether accessibility is enabled. */
   val udfpsLottieInfo: Flow<Boolean> =
-    _showUdfpsLottie.combine(accessibilityInteractor.isAccessibilityEnabled) {
+    _showUdfpsLottie.combine(accessibilityInteractor.isEnabledFlow(viewModelScope)) {
       _,
       isAccessibilityEnabled ->
       isAccessibilityEnabled
@@ -213,7 +213,7 @@ class FingerprintEnrollFindSensorViewModel(
           provider[FingerprintGatekeeperViewModel::class],
           provider[BackgroundViewModel::class],
           provider[FingerprintFlowViewModel::class],
-          biometricEnvironment.accessibilityInteractor,
+          biometricEnvironment.createAccessibilityInteractor(),
           biometricEnvironment.foldStateInteractor,
           biometricEnvironment.orientationInteractor,
           biometricEnvironment.createSensorPropertiesInteractor(),
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/settings/viewmodel/FingerprintSettingsViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/settings/viewmodel/FingerprintSettingsViewModel.kt
index c306c7870b9..7aad16dce75 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/settings/viewmodel/FingerprintSettingsViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/settings/viewmodel/FingerprintSettingsViewModel.kt
@@ -43,7 +43,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.sample
-import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -72,10 +71,12 @@ class FingerprintSettingsViewModel(
 
   /** Represents the stream of the information of "Add Fingerprint" preference. */
   val addFingerprintPrefInfo: Flow<Pair<Boolean, Int>> =
-    _enrolledFingerprints.filterOnlyWhenSettingsIsShown().combine(
-      canEnrollFingerprintsInteractor.canEnrollFingerprints
-    ) { _, canEnrollFingerprints ->
-      Pair(canEnrollFingerprints, canEnrollFingerprintsInteractor.maxFingerprintsEnrollable())
+    combine(
+      _enrolledFingerprints.filterOnlyWhenSettingsIsShown(),
+      canEnrollFingerprintsInteractor.canEnrollFingerprints,
+      canEnrollFingerprintsInteractor.maxFingerprintsEnrollable,
+    ) { _, canEnrollFingerprints, maxFingerprints ->
+      Pair(canEnrollFingerprints, maxFingerprints)
     }
 
   /** Represents the stream of visibility of sfps preference. */
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 22a39c8686a..14f55b81264 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -77,9 +77,9 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
             // It would show in Available Devices group if the audio sharing flag is disabled or
             // the device is not in the audio sharing session.
             if (cachedDevice.isConnectedLeAudioDevice()) {
-                if (BluetoothUtils.isAudioSharingEnabled()
+                if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                         && BluetoothUtils.hasConnectedBroadcastSource(
-                                cachedDevice, mLocalBtManager)) {
+                        cachedDevice, mLocalBtManager)) {
                     Log.d(
                             TAG,
                             "Filter out device : "
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java b/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
index d62543bb64f..e7c4c19a3f0 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
@@ -38,6 +38,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.flags.Flags;
 import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LeAudioProfile;
@@ -134,6 +135,9 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
     @Override
     protected void init(PreferenceScreen screen) {
         mProfilesContainer = screen.findPreference(getPreferenceKey());
+        if (Flags.enableBluetoothDeviceDetailsPolish()) {
+            mProfilesContainer.setLayoutResource(R.layout.preference_category_bluetooth_no_padding);
+        }
         refresh();
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
index 93e1ff54574..b741f0833f0 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
@@ -87,6 +87,12 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
         mProfilesContainer.setLayoutResource(R.layout.preference_companion_app);
     }
 
+    @Override
+    public boolean isAvailable() {
+        // Do not show this preference for now. More details in b/191992001#comment7
+        return false;
+    }
+
     private List<AssociationInfo> getAssociations(String address) {
         return filter(
                 mCompanionDeviceManager.getAllAssociations(),
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index e42c6549f7d..f782c6b2a6a 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -18,6 +18,7 @@ package com.android.settings.bluetooth;
 
 import static android.bluetooth.BluetoothDevice.METADATA_MODEL_NAME;
 
+import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
@@ -26,7 +27,6 @@ import android.sysprop.BluetoothProperties;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -83,6 +83,8 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
     private static final boolean LE_AUDIO_TOGGLE_VISIBLE_DEFAULT_VALUE = true;
     private static final String LE_AUDIO_TOGGLE_VISIBLE_PROPERTY =
             "persist.bluetooth.leaudio.toggle_visible";
+    private static final String BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY =
+            "persist.bluetooth.leaudio.bypass_allow_list";
 
     private Set<String> mInvisibleProfiles = Collections.emptySet();
     private final AtomicReference<Set<String>> mAdditionalInvisibleProfiles =
@@ -96,6 +98,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
             new HashMap<String, List<CachedBluetoothDevice>>();
     private boolean mIsLeAudioToggleEnabled = false;
     private boolean mIsLeAudioOnlyDevice = false;
+    private boolean mHasExtraSpace;
 
     @VisibleForTesting
     PreferenceCategory mProfilesContainer;
@@ -105,21 +108,33 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
             PreferenceFragmentCompat fragment,
             LocalBluetoothManager manager,
             CachedBluetoothDevice device,
-            Lifecycle lifecycle,
-            @Nullable List<String> invisibleProfiles) {
+            Lifecycle lifecycle) {
         super(context, fragment, device, lifecycle);
         mManager = manager;
         mProfileManager = mManager.getProfileManager();
         mCachedDevice = device;
         mCachedDeviceGroup = Utils.findAllCachedBluetoothDevicesByGroupId(mManager, mCachedDevice);
+    }
+
+    /** Sets the profiles to be hidden. */
+    public void setInvisibleProfiles(List<String> invisibleProfiles) {
         if (invisibleProfiles != null) {
             mInvisibleProfiles = Set.copyOf(invisibleProfiles);
         }
     }
 
+    /** Sets whether it should show an extra padding on top of the preference. */
+    public void setHasExtraSpace(boolean hasExtraSpace) {
+        if (hasExtraSpace) {
+            mProfilesContainer.setLayoutResource(R.layout.preference_bluetooth_profile_category);
+        } else {
+            mProfilesContainer.setLayoutResource(R.layout.preference_category_bluetooth_no_padding);
+        }
+    }
+
     @Override
     protected void init(PreferenceScreen screen) {
-        mProfilesContainer = (PreferenceCategory)screen.findPreference(getPreferenceKey());
+        mProfilesContainer = (PreferenceCategory) screen.findPreference(getPreferenceKey());
         mProfilesContainer.setLayoutResource(R.layout.preference_bluetooth_profile_category);
         // Call refresh here even though it will get called later in onResume, to avoid the
         // list of switches appearing to "pop" into the page.
@@ -371,6 +386,16 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
         return result;
     }
 
+    private boolean isCurrentDeviceInOrByPassAllowList() {
+        if (!SystemProperties.getBoolean(LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY, true)) {
+            return false;
+        }
+        return SystemProperties.getBoolean(BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY, false)
+                || isModelNameInAllowList(
+                BluetoothUtils.getStringMetaData(
+                        mCachedDevice.getDevice(), METADATA_MODEL_NAME));
+    }
+
     /**
      * Disable the Le Audio profile for each of the Le Audio devices.
      *
@@ -382,6 +407,11 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
             return;
         }
 
+        mMetricsFeatureProvider.action(
+                mContext,
+                SettingsEnums.ACTION_BLUETOOTH_PROFILE_LE_AUDIO_OFF,
+                isCurrentDeviceInOrByPassAllowList());
+
         LocalBluetoothProfile asha = mProfileManager.getHearingAidProfile();
         LocalBluetoothProfile broadcastAssistant =
                 mProfileManager.getLeAudioBroadcastAssistantProfile();
@@ -420,6 +450,11 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
             return;
         }
 
+        mMetricsFeatureProvider.action(
+                mContext,
+                SettingsEnums.ACTION_BLUETOOTH_PROFILE_LE_AUDIO_ON,
+                isCurrentDeviceInOrByPassAllowList());
+
         if (!SystemProperties.getBoolean(ENABLE_DUAL_MODE_AUDIO, false)) {
             Log.i(TAG, "Disabling classic audio profiles because dual mode is disabled");
             disableProfileBeforeUserEnablesLeAudio(mProfileManager.getA2dpProfile());
@@ -609,7 +644,11 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
         Preference preference = mProfilesContainer.findPreference(KEY_BOTTOM_PREFERENCE);
         if (preference == null) {
             preference = new Preference(mContext);
-            preference.setLayoutResource(R.layout.preference_bluetooth_profile_category);
+            if (mHasExtraSpace) {
+                preference.setLayoutResource(R.layout.preference_bluetooth_profile_category);
+            } else {
+                preference.setLayoutResource(R.layout.preference_category_bluetooth_no_padding);
+            }
             preference.setEnabled(false);
             preference.setKey(KEY_BOTTOM_PREFERENCE);
             preference.setOrder(ORDINAL);
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
index 398edb6b991..b878612fa9f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
@@ -150,6 +150,9 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
     @Override
     protected void init(PreferenceScreen screen) {
         mProfilesContainer = screen.findPreference(getPreferenceKey());
+        if (com.android.settings.flags.Flags.enableBluetoothDeviceDetailsPolish()) {
+            mProfilesContainer.setLayoutResource(R.layout.preference_category_bluetooth_no_padding);
+        }
         refresh();
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 0e51d178fe8..403a82429cc 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -61,7 +61,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
 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 java.util.ArrayList;
 import java.util.List;
@@ -123,6 +122,14 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
                         }
                     }
                 }
+
+                @Override
+                public void onDeviceBondStateChanged(
+                        @NonNull CachedBluetoothDevice cachedDevice, int bondState) {
+                    if (cachedDevice.equals(mCachedDevice)) {
+                        finishFragmentIfNecessary();
+                    }
+                }
             };
 
     private final BluetoothAdapter.OnMetadataChangedListener mExtraControlMetadataListener =
@@ -281,9 +288,12 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
         getController(
                 SlicePreferenceController.class,
                 controller -> {
-                    controller.setSliceUri(finalControlUri);
-                    controller.onStart();
-                    controller.displayPreference(getPreferenceScreen());
+                    if (getPreferenceScreen().findPreference(controller.getPreferenceKey())
+                            != null) {
+                        controller.setSliceUri(finalControlUri);
+                        controller.onStart();
+                        controller.displayPreference(getPreferenceScreen());
+                    }
                 });
 
         // Temporarily fix the issue that the page will be automatically scrolled to a wrong
@@ -339,13 +349,28 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
         if (view != null) {
             view.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
         }
+        getListView().setItemViewCacheSize(100);
         return view;
     }
 
     @Override
-    public void onCreatePreferences(@NonNull Bundle savedInstanceState, @NonNull String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         if (Flags.enableBluetoothDeviceDetailsPolish()) {
+            if (mFormatter == null) {
+                List<AbstractPreferenceController> controllers = getPreferenceControllers().stream()
+                        .flatMap(List::stream)
+                        .toList();
+                mFormatter =
+                        FeatureFactory.getFeatureFactory()
+                                .getBluetoothFeatureProvider()
+                                .getDeviceDetailsFragmentFormatter(
+                                        requireContext(),
+                                        this,
+                                        mBluetoothAdapter,
+                                        mCachedDevice,
+                                        controllers);
+            }
             mFormatter.updateLayout(FragmentTypeModel.DeviceDetailsMainFragment.INSTANCE);
         }
     }
@@ -400,36 +425,8 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
         return super.onOptionsItemSelected(menuItem);
     }
 
-    @Override
-    protected void addPreferenceController(AbstractPreferenceController controller) {
-        if (Flags.enableBluetoothDeviceDetailsPolish()) {
-            List<String> keys =
-                    mFormatter.getVisiblePreferenceKeys(
-                            FragmentTypeModel.DeviceDetailsMainFragment.INSTANCE);
-            Lifecycle lifecycle = getSettingsLifecycle();
-            if (keys == null || keys.contains(controller.getPreferenceKey())) {
-                super.addPreferenceController(controller);
-            } else if (controller instanceof LifecycleObserver) {
-                lifecycle.removeObserver((LifecycleObserver) controller);
-            }
-        } else {
-            super.addPreferenceController(controller);
-        }
-    }
-
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        List<String> invisibleProfiles = List.of();
-        if (Flags.enableBluetoothDeviceDetailsPolish()) {
-            mFormatter =
-                    FeatureFactory.getFeatureFactory()
-                            .getBluetoothFeatureProvider()
-                            .getDeviceDetailsFragmentFormatter(
-                                    requireContext(), this, mBluetoothAdapter, mCachedDevice);
-            invisibleProfiles =
-                    mFormatter.getInvisibleBluetoothProfiles(
-                            FragmentTypeModel.DeviceDetailsMainFragment.INSTANCE);
-        }
         ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
 
         if (mCachedDevice != null) {
@@ -448,7 +445,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
             controllers.add(new BluetoothDetailsSpatialAudioController(context, this, mCachedDevice,
                     lifecycle));
             controllers.add(new BluetoothDetailsProfilesController(context, this, mManager,
-                    mCachedDevice, lifecycle, invisibleProfiles));
+                    mCachedDevice, lifecycle));
             controllers.add(new BluetoothDetailsMacAddressController(context, this, mCachedDevice,
                     lifecycle));
             controllers.add(new StylusDevicesController(context, mInputDevice, mCachedDevice,
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java b/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
index f1e12a4a6fe..36a14aa54fc 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
@@ -31,15 +31,12 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -71,8 +68,9 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
     private volatile BluetoothDevice mJustBonded = null;
     private final Handler mHandler = new Handler(Looper.getMainLooper());
     private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    @VisibleForTesting
     @Nullable
-    private AlertDialog mProgressDialog = null;
+    ProgressDialogFragment mProgressDialog = null;
     @VisibleForTesting
     boolean mShouldTriggerAudioSharingShareThenPairFlow = false;
     private CopyOnWriteArrayList<BluetoothDevice> mDevicesWithMetadataChangedListener =
@@ -230,19 +228,19 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
             final BluetoothDevice device = cachedDevice.getDevice();
             if (device != null
                     && mSelectedList.contains(device)) {
-                if (!BluetoothUtils.isAudioSharingEnabled()) {
+                if (BluetoothUtils.isAudioSharingUIAvailable(getContext())) {
+                    if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+                            && state == BluetoothAdapter.STATE_CONNECTED
+                            && device.equals(mJustBonded)
+                            && mShouldTriggerAudioSharingShareThenPairFlow) {
+                        Log.d(getLogTag(),
+                                "onProfileConnectionStateChanged, assistant profile connected");
+                        dismissConnectingDialog();
+                        mHandler.removeMessages(AUTO_DISMISS_MESSAGE_ID);
+                        finishFragmentWithResultForAudioSharing(device);
+                    }
+                } else {
                     finish();
-                    return;
-                }
-                if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
-                        && state == BluetoothAdapter.STATE_CONNECTED
-                        && device.equals(mJustBonded)
-                        && mShouldTriggerAudioSharingShareThenPairFlow) {
-                    Log.d(getLogTag(),
-                            "onProfileConnectionStateChanged, assistant profile connected");
-                    dismissConnectingDialog();
-                    mHandler.removeMessages(AUTO_DISMISS_MESSAGE_ID);
-                    finishFragmentWithResultForAudioSharing(device);
                 }
             } else {
                 onDeviceDeleted(cachedDevice);
@@ -311,15 +309,17 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
 
     @VisibleForTesting
     boolean shouldTriggerAudioSharingShareThenPairFlow() {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return false;
-        Activity activity = getActivity();
-        Intent intent = activity == null ? null : activity.getIntent();
-        Bundle args =
-                intent == null ? null :
-                        intent.getBundleExtra(
-                                SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
-        return args != null
-                && args.getBoolean(EXTRA_PAIR_AND_JOIN_SHARING, false);
+        if (BluetoothUtils.isAudioSharingUIAvailable(getContext())) {
+            Activity activity = getActivity();
+            Intent intent = activity == null ? null : activity.getIntent();
+            Bundle args =
+                    intent == null ? null :
+                            intent.getBundleExtra(
+                                    SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+            return args != null
+                    && args.getBoolean(EXTRA_PAIR_AND_JOIN_SHARING, false);
+        }
+        return false;
     }
 
     private void addOnMetadataChangedListener(@Nullable BluetoothDevice device) {
@@ -359,7 +359,7 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
             String aliasName = device.getAlias();
             String deviceName = TextUtils.isEmpty(aliasName) ? device.getAddress()
                     : aliasName;
-            showConnectingDialog("Connecting to " + deviceName + "...");
+            showConnectingDialog(deviceName);
             // Wait for AUTO_DISMISS_TIME_THRESHOLD_MS and check if the paired device supports audio
             // sharing.
             if (!mHandler.hasMessages(AUTO_DISMISS_MESSAGE_ID)) {
@@ -384,41 +384,24 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
         finish();
     }
 
-    // TODO: use DialogFragment
-    private void showConnectingDialog(@NonNull String message) {
+    private void showConnectingDialog(@NonNull String deviceName) {
         postOnMainThread(() -> {
+            String message = getContext().getString(R.string.progress_dialog_connect_device_content,
+                    deviceName);
+            if (mProgressDialog == null) {
+                mProgressDialog = ProgressDialogFragment.newInstance(this);
+            }
             if (mProgressDialog != null) {
-                Log.d(getLogTag(), "showConnectingDialog, is already showing");
-                TextView textView = mProgressDialog.findViewById(R.id.message);
-                if (textView != null && !message.equals(textView.getText().toString())) {
-                    Log.d(getLogTag(), "showConnectingDialog, update message");
-                    // TODO: use string res once finalized
-                    textView.setText(message);
-                }
-                return;
+                mProgressDialog.show(message);
             }
-            Log.d(getLogTag(), "showConnectingDialog, show dialog");
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            LayoutInflater inflater = LayoutInflater.from(builder.getContext());
-            View customView = inflater.inflate(
-                    R.layout.dialog_audio_sharing_progress, /* root= */
-                    null);
-            TextView textView = customView.findViewById(R.id.message);
-            if (textView != null) {
-                // TODO: use string res once finalized
-                textView.setText(message);
-            }
-            AlertDialog dialog = builder.setView(customView).setCancelable(false).create();
-            dialog.setCanceledOnTouchOutside(false);
-            mProgressDialog = dialog;
-            dialog.show();
         });
     }
 
     private void dismissConnectingDialog() {
         postOnMainThread(() -> {
             if (mProgressDialog != null) {
-                mProgressDialog.dismiss();
+                Log.d(getLogTag(), "Dismiss connecting dialog.");
+                mProgressDialog.dismissAllowingStateLoss();
             }
         });
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
index be0f6f36b6c..dae7bb09bd4 100644
--- a/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
@@ -20,26 +20,24 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ComponentName;
 import android.content.Context;
-import android.media.AudioManager;
 import android.media.Spatializer;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LifecycleCoroutineScope;
 import androidx.preference.Preference;
 
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractor;
 import com.android.settings.bluetooth.ui.view.DeviceDetailsFragmentFormatter;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.devicesettings.data.repository.DeviceSettingRepository;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import kotlinx.coroutines.CoroutineScope;
 
 import java.util.List;
 import java.util.Set;
 
-/**
- * Provider for bluetooth related features.
- */
+/** Provider for bluetooth related features. */
 public interface BluetoothFeatureProvider {
 
     /**
@@ -86,32 +84,25 @@ public interface BluetoothFeatureProvider {
     /**
      * Gets the bluetooth profile preference keys which should be hidden in the device details page.
      *
-     * @param context         Context
+     * @param context Context
      * @param bluetoothDevice the bluetooth device
      * @return the profiles which should be hidden
      */
-    Set<String> getInvisibleProfilePreferenceKeys(
-            Context context, BluetoothDevice bluetoothDevice);
+    Set<String> getInvisibleProfilePreferenceKeys(Context context, BluetoothDevice bluetoothDevice);
 
     /** Gets DeviceSettingRepository. */
     @NonNull
     DeviceSettingRepository getDeviceSettingRepository(
             @NonNull Context context,
             @NonNull BluetoothAdapter bluetoothAdapter,
-            @NonNull LifecycleCoroutineScope scope);
-
-    /** Gets spatial audio interactor. */
-    @NonNull
-    SpatialAudioInteractor getSpatialAudioInteractor(
-            @NonNull Context context,
-            @NonNull AudioManager audioManager,
-            @NonNull LifecycleCoroutineScope scope);
+            @NonNull CoroutineScope scope);
 
     /** Gets device details fragment layout formatter. */
     @NonNull
     DeviceDetailsFragmentFormatter getDeviceDetailsFragmentFormatter(
             @NonNull Context context,
-            @NonNull SettingsPreferenceFragment fragment,
+            @NonNull DashboardFragment fragment,
             @NonNull BluetoothAdapter bluetoothAdapter,
-            @NonNull CachedBluetoothDevice cachedDevice);
+            @NonNull CachedBluetoothDevice cachedDevice,
+            @NonNull List<AbstractPreferenceController> controllers);
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.kt b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.kt
index 25c586e06bc..4807899ba49 100644
--- a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.kt
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.kt
@@ -22,21 +22,18 @@ import android.content.Context
 import android.media.AudioManager
 import android.media.Spatializer
 import android.net.Uri
-import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.preference.Preference
-import com.android.settings.SettingsPreferenceFragment
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractor
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractorImpl
 import com.android.settings.bluetooth.ui.view.DeviceDetailsFragmentFormatter
 import com.android.settings.bluetooth.ui.view.DeviceDetailsFragmentFormatterImpl
+import com.android.settings.dashboard.DashboardFragment
 import com.android.settingslib.bluetooth.BluetoothUtils
 import com.android.settingslib.bluetooth.CachedBluetoothDevice
 import com.android.settingslib.bluetooth.devicesettings.data.repository.DeviceSettingRepository
 import com.android.settingslib.bluetooth.devicesettings.data.repository.DeviceSettingRepositoryImpl
-import com.android.settingslib.media.data.repository.SpatializerRepositoryImpl
-import com.android.settingslib.media.domain.interactor.SpatializerInteractor
+import com.android.settingslib.core.AbstractPreferenceController
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableSet
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 
 /** Impl of [BluetoothFeatureProvider] */
@@ -76,34 +73,21 @@ open class BluetoothFeatureProviderImpl : BluetoothFeatureProvider {
     override fun getDeviceSettingRepository(
         context: Context,
         bluetoothAdapter: BluetoothAdapter,
-        scope: LifecycleCoroutineScope
+        scope: CoroutineScope
     ): DeviceSettingRepository =
         DeviceSettingRepositoryImpl(context, bluetoothAdapter, scope, Dispatchers.IO)
 
-    override fun getSpatialAudioInteractor(
-        context: Context,
-        audioManager: AudioManager,
-        scope: LifecycleCoroutineScope
-    ): SpatialAudioInteractor {
-        return SpatialAudioInteractorImpl(
-            context, audioManager,
-            SpatializerInteractor(
-                SpatializerRepositoryImpl(
-                    getSpatializer(context),
-                    Dispatchers.IO
-                )
-            ), scope, Dispatchers.IO)
-    }
-
     override fun getDeviceDetailsFragmentFormatter(
         context: Context,
-        fragment: SettingsPreferenceFragment,
+        fragment: DashboardFragment,
         bluetoothAdapter: BluetoothAdapter,
-        cachedDevice: CachedBluetoothDevice
+        cachedDevice: CachedBluetoothDevice,
+        controllers: List<AbstractPreferenceController>,
     ): DeviceDetailsFragmentFormatter {
         return DeviceDetailsFragmentFormatterImpl(
             context,
             fragment,
+            controllers,
             bluetoothAdapter,
             cachedDevice,
             Dispatchers.IO
diff --git a/src/com/android/settings/bluetooth/ProgressDialogFragment.java b/src/com/android/settings/bluetooth/ProgressDialogFragment.java
new file mode 100644
index 00000000000..15d53299e42
--- /dev/null
+++ b/src/com/android/settings/bluetooth/ProgressDialogFragment.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+import com.google.common.base.Strings;
+
+public class ProgressDialogFragment extends InstrumentedDialogFragment {
+    private static final String TAG = "BTProgressDialog";
+
+    private static final String BUNDLE_KEY_MESSAGE = "bundle_key_message";
+
+    @Nullable private static FragmentManager sManager;
+    @Nullable private static Lifecycle sLifecycle;
+    private String mMessage = "";
+    @Nullable private AlertDialog mAlertDialog;
+
+    @Override
+    public int getMetricsCategory() {
+        // TODO: add metrics
+        return 0;
+    }
+
+    /**
+     * Returns a new instance of {@link ProgressDialogFragment} dialog.
+     *
+     * @param host The Fragment this dialog will be hosted.
+     */
+    @Nullable
+    public static ProgressDialogFragment newInstance(@Nullable Fragment host) {
+        if (host == null) return null;
+        try {
+            sManager = host.getChildFragmentManager();
+            sLifecycle = host.getLifecycle();
+        } catch (IllegalStateException e) {
+            Log.d(TAG, "Fail to create new instance: " + e.getMessage());
+            return null;
+        }
+        return new ProgressDialogFragment();
+    }
+
+    /**
+     * Display {@link ProgressDialogFragment} dialog.
+     *
+     * @param message The message to be shown on the dialog
+     */
+    public void show(@NonNull String message) {
+        if (sManager == null) return;
+        Lifecycle.State currentState = sLifecycle == null ? null : sLifecycle.getCurrentState();
+        if (currentState == null || !currentState.isAtLeast(Lifecycle.State.STARTED)) {
+            Log.d(TAG, "Fail to show dialog with state: " + currentState);
+            return;
+        }
+        if (mAlertDialog != null && mAlertDialog.isShowing()) {
+            if (!mMessage.equals(message)) {
+                Log.d(TAG, "Update dialog message.");
+                TextView messageView = mAlertDialog.findViewById(R.id.message);
+                if (messageView != null) {
+                    messageView.setText(message);
+                }
+                mMessage = message;
+            }
+            Log.d(TAG, "Dialog is showing, return.");
+            return;
+        }
+        mMessage = message;
+        Log.d(TAG, "Show up the progress dialog.");
+        Bundle args = new Bundle();
+        args.putString(BUNDLE_KEY_MESSAGE, message);
+        setArguments(args);
+        show(sManager, TAG);
+    }
+
+    /** Returns the current message on the dialog. */
+    @VisibleForTesting
+    @NonNull
+    public String getMessage() {
+        return mMessage;
+    }
+
+    private ProgressDialogFragment() {
+    }
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        Bundle args = requireArguments();
+        String message = args.getString(BUNDLE_KEY_MESSAGE, "");
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        LayoutInflater inflater = LayoutInflater.from(builder.getContext());
+        View customView = inflater.inflate(
+                R.layout.dialog_audio_sharing_progress, /* root= */ null);
+        TextView textView = customView.findViewById(R.id.message);
+        if (textView != null && !Strings.isNullOrEmpty(message)) {
+            textView.setText(message);
+        }
+        AlertDialog dialog = builder.setView(customView).setCancelable(false).create();
+        dialog.setCanceledOnTouchOutside(false);
+        mAlertDialog = dialog;
+        return dialog;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractor.kt b/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractor.kt
deleted file mode 100644
index 6b72b53aa3f..00000000000
--- a/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractor.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth.domain.interactor
-
-import android.content.Context
-import android.media.AudioManager
-import android.util.Log
-import com.android.settings.R
-import com.android.settingslib.bluetooth.BluetoothUtils
-import com.android.settingslib.bluetooth.CachedBluetoothDevice
-import com.android.settingslib.bluetooth.devicesettings.DeviceSettingId
-import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
-import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingModel
-import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingStateModel
-import com.android.settingslib.bluetooth.devicesettings.shared.model.ToggleModel
-import com.android.settingslib.media.domain.interactor.SpatializerInteractor
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-
-/** Provides device setting for spatial audio. */
-interface SpatialAudioInteractor {
-    /** Gets device setting for spatial audio */
-    fun getDeviceSetting(
-        cachedDevice: CachedBluetoothDevice,
-    ): Flow<DeviceSettingModel?>
-}
-
-class SpatialAudioInteractorImpl(
-    private val context: Context,
-    private val audioManager: AudioManager,
-    private val spatializerInteractor: SpatializerInteractor,
-    private val coroutineScope: CoroutineScope,
-    private val backgroundCoroutineContext: CoroutineContext,
-) : SpatialAudioInteractor {
-    private val spatialAudioOffToggle =
-        ToggleModel(
-            context.getString(R.string.spatial_audio_multi_toggle_off),
-            DeviceSettingIcon.ResourceIcon(R.drawable.ic_spatial_audio_off))
-    private val spatialAudioOnToggle =
-        ToggleModel(
-            context.getString(R.string.spatial_audio_multi_toggle_on),
-            DeviceSettingIcon.ResourceIcon(R.drawable.ic_spatial_audio))
-    private val headTrackingOnToggle =
-        ToggleModel(
-            context.getString(R.string.spatial_audio_multi_toggle_head_tracking_on),
-            DeviceSettingIcon.ResourceIcon(R.drawable.ic_head_tracking))
-    private val changes = MutableSharedFlow<Unit>()
-
-    override fun getDeviceSetting(
-        cachedDevice: CachedBluetoothDevice,
-    ): Flow<DeviceSettingModel?> =
-        changes
-            .onStart { emit(Unit) }
-            .map { getSpatialAudioDeviceSettingModel(cachedDevice) }
-            .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), initialValue = null)
-
-    private suspend fun getSpatialAudioDeviceSettingModel(
-        cachedDevice: CachedBluetoothDevice,
-    ): DeviceSettingModel? {
-        // TODO(b/343317785): use audio repository instead of calling AudioManager directly.
-        Log.i(TAG, "CachedDevice: $cachedDevice profiles: ${cachedDevice.profiles}")
-        val attributes =
-            BluetoothUtils.getAudioDeviceAttributesForSpatialAudio(
-                cachedDevice, audioManager.getBluetoothAudioDeviceCategory(cachedDevice.address))
-                ?: run {
-                    Log.i(TAG, "No audio profiles in cachedDevice: ${cachedDevice.address}.")
-                    return null
-                }
-
-        Log.i(TAG, "Audio device attributes for ${cachedDevice.address}: $attributes.")
-        val spatialAudioAvailable = spatializerInteractor.isSpatialAudioAvailable(attributes)
-        if (!spatialAudioAvailable) {
-            Log.i(TAG, "Spatial audio is not available for ${cachedDevice.address}")
-            return null
-        }
-        val headTrackingAvailable =
-            spatialAudioAvailable && spatializerInteractor.isHeadTrackingAvailable(attributes)
-        val toggles =
-            if (headTrackingAvailable) {
-                listOf(spatialAudioOffToggle, spatialAudioOnToggle, headTrackingOnToggle)
-            } else {
-                listOf(spatialAudioOffToggle, spatialAudioOnToggle)
-            }
-        val spatialAudioEnabled = spatializerInteractor.isSpatialAudioEnabled(attributes)
-        val headTrackingEnabled =
-            spatialAudioEnabled && spatializerInteractor.isHeadTrackingEnabled(attributes)
-
-        val activeIndex =
-            when {
-                headTrackingEnabled -> INDEX_HEAD_TRACKING_ENABLED
-                spatialAudioEnabled -> INDEX_SPATIAL_AUDIO_ON
-                else -> INDEX_SPATIAL_AUDIO_OFF
-            }
-        Log.i(
-            TAG,
-            "Head tracking available: $headTrackingAvailable, " +
-                "spatial audio enabled: $spatialAudioEnabled, " +
-                "head tracking enabled: $headTrackingEnabled")
-        return DeviceSettingModel.MultiTogglePreference(
-            cachedDevice = cachedDevice,
-            id = DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE,
-            title = context.getString(R.string.spatial_audio_multi_toggle_title),
-            toggles = toggles,
-            isActive = spatialAudioEnabled,
-            state = DeviceSettingStateModel.MultiTogglePreferenceState(activeIndex),
-            isAllowedChangingState = true,
-            updateState = { newState ->
-                coroutineScope.launch(backgroundCoroutineContext) {
-                    Log.i(TAG, "Update spatial audio state: $newState")
-                    when (newState.selectedIndex) {
-                        INDEX_SPATIAL_AUDIO_OFF -> {
-                            spatializerInteractor.setSpatialAudioEnabled(attributes, false)
-                        }
-                        INDEX_SPATIAL_AUDIO_ON -> {
-                            spatializerInteractor.setSpatialAudioEnabled(attributes, true)
-                            spatializerInteractor.setHeadTrackingEnabled(attributes, false)
-                        }
-                        INDEX_HEAD_TRACKING_ENABLED -> {
-                            spatializerInteractor.setSpatialAudioEnabled(attributes, true)
-                            spatializerInteractor.setHeadTrackingEnabled(attributes, true)
-                        }
-                    }
-                    changes.emit(Unit)
-                }
-            })
-    }
-
-    companion object {
-        private const val TAG = "SpatialAudioInteractorImpl"
-        private const val INDEX_SPATIAL_AUDIO_OFF = 0
-        private const val INDEX_SPATIAL_AUDIO_ON = 1
-        private const val INDEX_HEAD_TRACKING_ENABLED = 2
-    }
-}
diff --git a/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreference.kt b/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreference.kt
new file mode 100644
index 00000000000..5a9b6722a99
--- /dev/null
+++ b/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreference.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth.ui.composable
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.selected
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.android.settings.bluetooth.ui.composable.Icon as DeviceSettingComposeIcon
+import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
+
+@Composable
+fun MultiTogglePreference(pref: DeviceSettingPreferenceModel.MultiTogglePreference) {
+    Column(modifier = Modifier.padding(24.dp).fillMaxWidth()) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceEvenly,
+        ) {
+            for ((idx, toggle) in pref.toggles.withIndex()) {
+                val selected = idx == pref.selectedIndex
+                Column(
+                    modifier =
+                        Modifier.weight(1f)
+                            .padding(start = if (idx == 0) 0.dp else 1.dp)
+                            .height(56.dp)
+                            .background(Color.Transparent, shape = RoundedCornerShape(12.dp)),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    val startCornerRadius = if (idx == 0) 12.dp else 0.dp
+                    val endCornerRadius = if (idx == pref.toggles.size - 1) 12.dp else 0.dp
+                    Button(
+                        onClick = { pref.onSelectedChange(idx) },
+                        modifier =
+                            Modifier.fillMaxSize().semantics {
+                                this.role = Role.RadioButton
+                                this.selected = selected
+                                this.contentDescription = toggle.label
+                            },
+                        enabled = pref.isAllowedChangingState,
+                        colors = getButtonColors(selected),
+                        shape =
+                            RoundedCornerShape(
+                                startCornerRadius,
+                                endCornerRadius,
+                                endCornerRadius,
+                                startCornerRadius,
+                            ),
+                    ) {
+                        DeviceSettingComposeIcon(toggle.icon, modifier = Modifier.size(24.dp))
+                    }
+                }
+            }
+        }
+        Spacer(modifier = Modifier.height(12.dp))
+        Row(
+            modifier = Modifier.fillMaxWidth().defaultMinSize(32.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceEvenly,
+        ) {
+            for (toggle in pref.toggles) {
+                Text(
+                    text = toggle.label,
+                    fontSize = 12.sp,
+                    textAlign = TextAlign.Center,
+                    overflow = TextOverflow.Visible,
+                    modifier =
+                        Modifier.weight(1f).padding(horizontal = 8.dp).clearAndSetSemantics {},
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun getButtonColors(isActive: Boolean) =
+    if (isActive) {
+        ButtonDefaults.buttonColors(
+            containerColor = MaterialTheme.colorScheme.primary,
+            contentColor = MaterialTheme.colorScheme.onPrimary,
+        )
+    } else {
+        ButtonDefaults.buttonColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+            contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+        )
+    }
diff --git a/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreferenceGroup.kt b/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreferenceGroup.kt
deleted file mode 100644
index 9743737f515..00000000000
--- a/src/com/android/settings/bluetooth/ui/composable/MultiTogglePreferenceGroup.kt
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth.ui.composable
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.BasicAlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.boundsInParent
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.role
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.toggleableState
-import androidx.compose.ui.state.ToggleableState
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.DialogProperties
-import com.android.settings.R
-import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
-import com.android.settings.bluetooth.ui.composable.Icon as DeviceSettingComposeIcon
-import com.android.settingslib.spa.framework.theme.SettingsDimension
-import com.android.settingslib.spa.widget.dialog.getDialogWidth
-
-@Composable
-fun MultiTogglePreferenceGroup(
-    preferenceModels: List<DeviceSettingPreferenceModel.MultiTogglePreference>,
-) {
-    var settingIdForPopUp by remember { mutableStateOf<Int?>(null) }
-
-    settingIdForPopUp?.let { id ->
-        preferenceModels.find { it.id == id && it.isAllowedChangingState }?.let {
-            dialog(it) { settingIdForPopUp = null }
-        } ?: run {
-            settingIdForPopUp = null
-        }
-    }
-
-    Row(
-        modifier = Modifier.padding(SettingsDimension.itemPadding),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(24.dp),
-    ) {
-        preferenceModels.forEach { preferenceModel ->
-            Column(
-                modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.Top,
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Row {
-                    Surface(
-                        modifier = Modifier.height(64.dp),
-                        shape = RoundedCornerShape(28.dp),
-                        color = MaterialTheme.colorScheme.surface) {
-                            Button(
-                                modifier =
-                                    Modifier.fillMaxSize().padding(8.dp).semantics {
-                                        role = Role.Switch
-                                        toggleableState =
-                                            if (!preferenceModel.isAllowedChangingState) {
-                                                ToggleableState.Indeterminate
-                                            } else if (preferenceModel.isActive) {
-                                                ToggleableState.On
-                                            } else {
-                                                ToggleableState.Off
-                                            }
-                                        contentDescription = preferenceModel.title
-                                    },
-                                onClick = { settingIdForPopUp = preferenceModel.id },
-                                enabled = preferenceModel.isAllowedChangingState,
-                                shape = RoundedCornerShape(20.dp),
-                                colors = getButtonColors(preferenceModel.isActive),
-                                contentPadding = PaddingValues(0.dp)) {
-                                    DeviceSettingComposeIcon(
-                                        preferenceModel.toggles[preferenceModel.selectedIndex]
-                                            .icon,
-                                        modifier = Modifier.size(24.dp))
-                                }
-                        }
-                }
-                Row { Text(text = preferenceModel.title, fontSize = 12.sp) }
-            }
-        }
-    }
-}
-
-@Composable
-private fun getButtonColors(isActive: Boolean) =
-    if (isActive) {
-        ButtonDefaults.buttonColors(
-            containerColor = MaterialTheme.colorScheme.tertiaryContainer,
-            contentColor = MaterialTheme.colorScheme.onTertiaryContainer,
-        )
-    } else {
-        ButtonDefaults.buttonColors(
-            containerColor = Color.Transparent,
-            contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun dialog(
-    multiTogglePreference: DeviceSettingPreferenceModel.MultiTogglePreference,
-    onDismiss: () -> Unit
-) {
-    BasicAlertDialog(
-        onDismissRequest = { onDismiss() },
-        modifier = Modifier.width(getDialogWidth()),
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-        content = {
-            Card(
-                shape = RoundedCornerShape(28.dp),
-                modifier = Modifier.fillMaxWidth().height(192.dp),
-                content = {
-                    Box {
-                        Button(
-                            onClick = { onDismiss() },
-                            modifier = Modifier.padding(8.dp).align(Alignment.TopEnd).size(48.dp),
-                            contentPadding = PaddingValues(12.dp),
-                            colors =
-                                ButtonDefaults.buttonColors(containerColor = Color.Transparent),
-                        ) {
-                            Icon(
-                                painterResource(id = R.drawable.ic_close),
-                                null,
-                                tint = MaterialTheme.colorScheme.inverseSurface)
-                        }
-                        Box(modifier = Modifier.padding(horizontal = 8.dp, vertical = 20.dp)) {
-                            dialogContent(multiTogglePreference)
-                        }
-                    }
-                },
-            )
-        })
-}
-
-@Composable
-private fun dialogContent(multiTogglePreference: DeviceSettingPreferenceModel.MultiTogglePreference) {
-    Column {
-        Row(
-            modifier = Modifier.fillMaxWidth().height(24.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceEvenly,
-        ) {
-            Text(text = multiTogglePreference.title, fontSize = 16.sp)
-        }
-        Spacer(modifier = Modifier.height(20.dp))
-        var selectedRect by remember { mutableStateOf<Rect?>(null) }
-        val offset =
-            selectedRect?.let { rect ->
-                animateFloatAsState(targetValue = rect.left, finishedListener = {}).value
-            }
-
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .height(64.dp)
-                    .background(
-                        MaterialTheme.colorScheme.surface, shape = RoundedCornerShape(28.dp)),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceEvenly,
-        ) {
-            Box {
-                offset?.let { offset ->
-                    with(LocalDensity.current) {
-                        Box(
-                            modifier =
-                                Modifier.offset(offset.toDp(), 0.dp)
-                                    .height(selectedRect!!.height.toDp())
-                                    .width(selectedRect!!.width.toDp())
-                                    .background(
-                                        MaterialTheme.colorScheme.tertiaryContainer,
-                                        shape = RoundedCornerShape(20.dp)))
-                    }
-                }
-                Row {
-                    for ((idx, toggle) in multiTogglePreference.toggles.withIndex()) {
-                        val selected = idx == multiTogglePreference.selectedIndex
-                        Column(
-                            modifier =
-                                Modifier.weight(1f)
-                                    .padding(horizontal = 8.dp)
-                                    .height(48.dp)
-                                    .background(
-                                        Color.Transparent, shape = RoundedCornerShape(28.dp))
-                                    .onGloballyPositioned { layoutCoordinates ->
-                                        if (selected) {
-                                            selectedRect = layoutCoordinates.boundsInParent()
-                                        }
-                                    },
-                            verticalArrangement = Arrangement.Center,
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                        ) {
-                            Button(
-                                onClick = {
-                                    multiTogglePreference.onSelectedChange(idx)
-                                },
-                                modifier = Modifier.fillMaxSize(),
-                                colors =
-                                    ButtonDefaults.buttonColors(
-                                        containerColor = Color.Transparent,
-                                        contentColor = LocalContentColor.current),
-                            ) {
-                                DeviceSettingComposeIcon(
-                                    toggle.icon, modifier = Modifier.size(24.dp))
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Spacer(modifier = Modifier.height(12.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth().defaultMinSize(32.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceEvenly,
-        ) {
-            for (toggle in multiTogglePreference.toggles) {
-                Text(
-                    text = toggle.label,
-                    fontSize = 12.sp,
-                    textAlign = TextAlign.Center,
-                    overflow = TextOverflow.Visible,
-                    modifier = Modifier.weight(1f).padding(horizontal = 8.dp))
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt b/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
index f6e6f168144..f4992dafc5e 100644
--- a/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
+++ b/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
@@ -16,7 +16,9 @@
 
 package com.android.settings.bluetooth.ui.model
 
+import android.content.Intent
 import com.android.settingslib.bluetooth.devicesettings.DeviceSettingId
+import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingActionModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
 import com.android.settingslib.bluetooth.devicesettings.shared.model.ToggleModel
 
@@ -31,7 +33,7 @@ sealed interface DeviceSettingPreferenceModel {
         val title: String,
         val summary: String? = null,
         val icon: DeviceSettingIcon? = null,
-        val onClick: (() -> Unit)? = null,
+        val action: DeviceSettingActionModel? = null,
     ) : DeviceSettingPreferenceModel
 
     /** Models a switch preference. */
@@ -42,7 +44,8 @@ sealed interface DeviceSettingPreferenceModel {
         val icon: DeviceSettingIcon? = null,
         val checked: Boolean,
         val onCheckedChange: ((Boolean) -> Unit),
-        val onPrimaryClick: (() -> Unit)? = null,
+        val disabled: Boolean = false,
+        val action: DeviceSettingActionModel? = null,
     ) : DeviceSettingPreferenceModel
 
     /** Models a multi-toggle preference. */
@@ -71,6 +74,6 @@ sealed interface DeviceSettingPreferenceModel {
     data class HelpPreference(
         @DeviceSettingId override val id: Int,
         val icon: DeviceSettingIcon,
-        val onClick: (() -> Unit),
+        val intent: Intent,
     ) : DeviceSettingPreferenceModel
 }
diff --git a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
index a5997e7bc83..2acabff4be9 100644
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
@@ -16,15 +16,19 @@
 
 package com.android.settings.bluetooth.ui.view
 
+import android.app.ActivityOptions
+import android.app.settings.SettingsEnums
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
-import android.media.AudioManager
+import android.content.Intent
 import android.os.Bundle
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -32,7 +36,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -42,20 +45,28 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.android.settings.R
-import com.android.settings.SettingsPreferenceFragment
+import com.android.settings.bluetooth.BlockingPrefWithSliceController
+import com.android.settings.bluetooth.BluetoothDetailsProfilesController
 import com.android.settings.bluetooth.ui.composable.Icon
-import com.android.settings.bluetooth.ui.composable.MultiTogglePreferenceGroup
+import com.android.settings.bluetooth.ui.composable.MultiTogglePreference
 import com.android.settings.bluetooth.ui.layout.DeviceSettingLayout
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
 import com.android.settings.bluetooth.ui.model.FragmentTypeModel
 import com.android.settings.bluetooth.ui.view.DeviceDetailsMoreSettingsFragment.Companion.KEY_DEVICE_ADDRESS
 import com.android.settings.bluetooth.ui.viewmodel.BluetoothDeviceDetailsViewModel
 import com.android.settings.core.SubSettingLauncher
-import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
+import com.android.settings.dashboard.DashboardFragment
+import com.android.settings.overlay.FeatureFactory
 import com.android.settings.spa.preference.ComposePreference
 import com.android.settingslib.bluetooth.CachedBluetoothDevice
+import com.android.settingslib.bluetooth.devicesettings.DeviceSettingId
+import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingActionModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingConfigItemModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
+import com.android.settingslib.core.AbstractPreferenceController
+import com.android.settingslib.core.lifecycle.LifecycleObserver
+import com.android.settingslib.core.lifecycle.events.OnPause
+import com.android.settingslib.core.lifecycle.events.OnStop
 import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.Preference as SpaPreference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -65,23 +76,22 @@ import com.android.settingslib.spa.widget.preference.TwoTargetSwitchPreference
 import com.android.settingslib.spa.widget.ui.Footer
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 /** Handles device details fragment layout according to config. */
 interface DeviceDetailsFragmentFormatter {
-    /** Gets keys of visible preferences in built-in preference in xml. */
-    fun getVisiblePreferenceKeys(fragmentType: FragmentTypeModel): List<String>?
-
-    /** Updates device details fragment layout. */
-    fun getInvisibleBluetoothProfiles(fragmentType: FragmentTypeModel): List<String>?
-
     /** Updates device details fragment layout. */
     fun updateLayout(fragmentType: FragmentTypeModel)
 
@@ -91,60 +101,51 @@ interface DeviceDetailsFragmentFormatter {
     ): Flow<DeviceSettingPreferenceModel.HelpPreference?>
 }
 
+@FlowPreview
 @OptIn(ExperimentalCoroutinesApi::class)
 class DeviceDetailsFragmentFormatterImpl(
     private val context: Context,
-    private val fragment: SettingsPreferenceFragment,
-    bluetoothAdapter: BluetoothAdapter,
+    private val fragment: DashboardFragment,
+    controllers: List<AbstractPreferenceController>,
+    private val bluetoothAdapter: BluetoothAdapter,
     private val cachedDevice: CachedBluetoothDevice,
     private val backgroundCoroutineContext: CoroutineContext,
 ) : DeviceDetailsFragmentFormatter {
-    private val repository =
-        featureFactory.bluetoothFeatureProvider.getDeviceSettingRepository(
-            context,
-            bluetoothAdapter,
-            fragment.lifecycleScope,
-        )
-    private val spatialAudioInteractor =
-        featureFactory.bluetoothFeatureProvider.getSpatialAudioInteractor(
-            context,
-            context.getSystemService(AudioManager::class.java),
-            fragment.lifecycleScope,
-        )
+    private val metricsFeatureProvider = FeatureFactory.featureFactory.metricsFeatureProvider
+    private val prefVisibility = mutableMapOf<String, MutableStateFlow<Boolean>>()
+    private val prefVisibilityJobs = mutableListOf<Job>()
+    private var isLoading = false
+    private var prefKeyToController: Map<String, AbstractPreferenceController> =
+        controllers.associateBy { it.preferenceKey }
+
     private val viewModel: BluetoothDeviceDetailsViewModel =
         ViewModelProvider(
-                fragment,
-                BluetoothDeviceDetailsViewModel.Factory(
-                    fragment.requireActivity().application,
-                    repository,
-                    spatialAudioInteractor,
-                    cachedDevice,
-                    backgroundCoroutineContext,
-                ),
-            )
+            fragment,
+            BluetoothDeviceDetailsViewModel.Factory(
+                fragment.requireActivity().application,
+                bluetoothAdapter,
+                cachedDevice,
+                backgroundCoroutineContext,
+            ),
+        )
             .get(BluetoothDeviceDetailsViewModel::class.java)
 
-    override fun getVisiblePreferenceKeys(fragmentType: FragmentTypeModel): List<String>? =
-        runBlocking {
-            viewModel
-                .getItems(fragmentType)
-                ?.filterIsInstance<DeviceSettingConfigItemModel.BuiltinItem>()
-                ?.map { it.preferenceKey }
-        }
-
-    override fun getInvisibleBluetoothProfiles(fragmentType: FragmentTypeModel): List<String>? =
-        runBlocking {
-            viewModel
-                .getItems(fragmentType)
-                ?.filterIsInstance<DeviceSettingConfigItemModel.BuiltinItem.BluetoothProfilesItem>()
-                ?.first()
-                ?.invisibleProfiles
-        }
-
     /** Updates bluetooth device details fragment layout. */
-    override fun updateLayout(fragmentType: FragmentTypeModel) = runBlocking {
-        val items = viewModel.getItems(fragmentType) ?: return@runBlocking
-        val layout = viewModel.getLayout(fragmentType) ?: return@runBlocking
+    override fun updateLayout(fragmentType: FragmentTypeModel) {
+        fragment.setLoading(true, false)
+        isLoading = true
+        fragment.lifecycleScope.launch { updateLayoutInternal(fragmentType) }
+    }
+
+    private suspend fun updateLayoutInternal(fragmentType: FragmentTypeModel) {
+        val items = viewModel.getItems(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }
+        val layout = viewModel.getLayout(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }
 
         val prefKeyToSettingId =
             items
@@ -155,28 +156,70 @@ class DeviceDetailsFragmentFormatterImpl(
         for (i in 0 until fragment.preferenceScreen.preferenceCount) {
             val pref = fragment.preferenceScreen.getPreference(i)
             prefKeyToSettingId[pref.key]?.let { id -> settingIdToXmlPreferences[id] = pref }
+            if (pref.key !in prefKeyToSettingId) {
+                getController(pref.key)?.let { disableController(it) }
+            }
         }
         fragment.preferenceScreen.removeAll()
-
+        for (job in prefVisibilityJobs) {
+            job.cancel()
+        }
+        prefVisibilityJobs.clear()
         for (row in items.indices) {
-            val settingId = items[row].settingId
+            val settingItem = items[row]
+            val settingId = settingItem.settingId
             if (settingIdToXmlPreferences.containsKey(settingId)) {
-                fragment.preferenceScreen.addPreference(
-                    settingIdToXmlPreferences[settingId]!!.apply { order = row }
-                )
+                val pref = settingIdToXmlPreferences[settingId]!!.apply { order = row }
+                fragment.preferenceScreen.addPreference(pref)
             } else {
+                val prefKey = getPreferenceKey(settingId)
+                prefVisibilityJobs.add(
+                    getDevicesSettingForRow(layout, row)
+                        .onEach { logItemShown(prefKey, it.isNotEmpty()) }
+                        .launchIn(fragment.lifecycleScope)
+                )
                 val pref =
                     ComposePreference(context)
                         .apply {
-                            key = getPreferenceKey(settingId)
+                            key = prefKey
                             order = row
                         }
-                        .also { pref -> pref.setContent { buildPreference(layout, row) } }
+                        .also { pref -> pref.setContent { buildPreference(layout, row, prefKey) } }
                 fragment.preferenceScreen.addPreference(pref)
             }
         }
         // TODO(b/343317785): figure out how to remove the foot preference.
-        fragment.preferenceScreen.addPreference(Preference(context).apply { order = 10000 })
+        fragment.preferenceScreen.addPreference(ComposePreference(context).apply {
+            order = 10000
+            isEnabled = false
+            isSelectable = false
+            setContent { Spacer(modifier = Modifier.height(1.dp)) }
+        })
+
+        for (row in items.indices) {
+            val settingItem = items[row]
+            val settingId = settingItem.settingId
+            if (settingIdToXmlPreferences.containsKey(settingId)) {
+                val pref = fragment.preferenceScreen.getPreference(row)
+                if (settingId == DeviceSettingId.DEVICE_SETTING_ID_BLUETOOTH_PROFILES) {
+                    (getController(pref.key) as? BluetoothDetailsProfilesController)?.run {
+                        if (settingItem is DeviceSettingConfigItemModel.BuiltinItem.BluetoothProfilesItem) {
+                            setInvisibleProfiles(settingItem.invisibleProfiles)
+                            setHasExtraSpace(false)
+                        }
+                    }
+                }
+                getController(pref.key)?.displayPreference(fragment.preferenceScreen)
+                logItemShown(pref.key, pref.isVisible)
+            }
+        }
+
+        fragment.listView.post {
+            if (isLoading) {
+                fragment.setLoading(false, false)
+                isLoading = false
+            }
+        }
     }
 
     override fun getMenuItem(
@@ -193,117 +236,117 @@ class DeviceDetailsFragmentFormatterImpl(
         } ?: emit(null)
     }
 
-    @Composable
-    private fun buildPreference(layout: DeviceSettingLayout, row: Int) {
-        val contents by
-            remember(row) {
-                    layout.rows[row].columns.flatMapLatest { columns ->
-                        if (columns.isEmpty()) {
-                            flowOf(emptyList<DeviceSettingPreferenceModel>())
-                        } else {
-                            combine(
-                                columns.map { column ->
-                                    viewModel.getDeviceSetting(cachedDevice, column.settingId)
-                                }
-                            ) {
-                                it.toList()
-                            }
-                        }
+    private fun getDevicesSettingForRow(
+        layout: DeviceSettingLayout,
+        row: Int,
+    ): Flow<List<DeviceSettingPreferenceModel>> =
+        layout.rows[row].columns.flatMapLatest { columns ->
+            if (columns.isEmpty()) {
+                flowOf(emptyList())
+            } else {
+                combine(
+                    columns.map { column ->
+                        viewModel.getDeviceSetting(cachedDevice, column.settingId)
                     }
+                ) {
+                    it.toList().filterNotNull()
                 }
-                .collectAsStateWithLifecycle(initialValue = listOf())
+            }
+        }
+
+    @Composable
+    private fun buildPreference(layout: DeviceSettingLayout, row: Int, prefKey: String) {
+        val contents by
+        remember(row) { getDevicesSettingForRow(layout, row) }
+            .collectAsStateWithLifecycle(initialValue = listOf())
 
         val highlighted by
-            remember(row) {
-                    layout.rows[row].columns.map { columns -> columns.any { it.highlighted } }
-                }
-                .collectAsStateWithLifecycle(initialValue = false)
+        remember(row) {
+            layout.rows[row].columns.map { columns -> columns.any { it.highlighted } }
+        }
+            .collectAsStateWithLifecycle(initialValue = false)
 
         val settings = contents
-        AnimatedVisibility(
-            visible = settings.isNotEmpty(),
-            enter = expandVertically(expandFrom = Alignment.Top),
-            exit = shrinkVertically(shrinkTowards = Alignment.Top),
-        ) {
+        AnimatedVisibility(visible = settings.isNotEmpty(), enter = fadeIn(), exit = fadeOut()) {
             Box {
                 Box(
                     modifier =
-                    Modifier.matchParentSize()
-                        .padding(16.dp, 0.dp, 8.dp, 0.dp)
-                        .background(
-                            color =
-                            if (highlighted) {
-                                MaterialTheme.colorScheme.primaryContainer
-                            } else {
-                                Color.Transparent
-                            },
-                            shape = RoundedCornerShape(28.dp),
-                        ),
+                        Modifier.matchParentSize()
+                            .padding(16.dp, 0.dp, 8.dp, 0.dp)
+                            .background(
+                                color =
+                                    if (highlighted) {
+                                        MaterialTheme.colorScheme.primaryContainer
+                                    } else {
+                                        Color.Transparent
+                                    },
+                                shape = RoundedCornerShape(28.dp),
+                            )
                 ) {}
-                buildPreferences(settings)
+                buildPreferences(settings, prefKey)
             }
         }
     }
 
     @Composable
-    fun buildPreferences(settings: List<DeviceSettingPreferenceModel?>) {
+    fun buildPreferences(settings: List<DeviceSettingPreferenceModel?>, prefKey: String) {
         when (settings.size) {
             0 -> {}
             1 -> {
                 when (val setting = settings[0]) {
                     is DeviceSettingPreferenceModel.PlainPreference -> {
-                        buildPlainPreference(setting)
+                        buildPlainPreference(setting, prefKey)
                     }
                     is DeviceSettingPreferenceModel.SwitchPreference -> {
-                        buildSwitchPreference(setting)
+                        buildSwitchPreference(setting, prefKey)
                     }
                     is DeviceSettingPreferenceModel.MultiTogglePreference -> {
-                        buildMultiTogglePreference(listOf(setting))
+                        buildMultiTogglePreference(setting, prefKey)
                     }
                     is DeviceSettingPreferenceModel.FooterPreference -> {
                         buildFooterPreference(setting)
                     }
                     is DeviceSettingPreferenceModel.MoreSettingsPreference -> {
-                        buildMoreSettingsPreference()
+                        buildMoreSettingsPreference(prefKey)
                     }
                     is DeviceSettingPreferenceModel.HelpPreference -> {}
                     null -> {}
                 }
             }
-            else -> {
-                if (
-                    !settings.all {
-                        it is DeviceSettingPreferenceModel.MultiTogglePreference
-                    }
-                ) {
-                    return
-                }
-                buildMultiTogglePreference(
-                    settings.filterIsInstance<
-                            DeviceSettingPreferenceModel.MultiTogglePreference
-                            >()
-                )
-            }
+            else -> {}
         }
     }
 
     @Composable
     private fun buildMultiTogglePreference(
-        prefs: List<DeviceSettingPreferenceModel.MultiTogglePreference>
+        pref: DeviceSettingPreferenceModel.MultiTogglePreference,
+        prefKey: String,
     ) {
-        MultiTogglePreferenceGroup(prefs)
+        MultiTogglePreference(
+            pref.copy(
+                onSelectedChange = { newState ->
+                    logItemClick(prefKey, newState)
+                    pref.onSelectedChange(newState)
+                }
+            )
+        )
     }
 
     @Composable
-    private fun buildSwitchPreference(model: DeviceSettingPreferenceModel.SwitchPreference) {
+    private fun buildSwitchPreference(
+        model: DeviceSettingPreferenceModel.SwitchPreference,
+        prefKey: String,
+    ) {
         val switchPrefModel =
             object : SwitchPreferenceModel {
                 override val title = model.title
                 override val summary = { model.summary ?: "" }
                 override val checked = { model.checked }
-                override val onCheckedChange = { newChecked: Boolean ->
-                    model.onCheckedChange(newChecked)
+                override val onCheckedChange = { newState: Boolean ->
+                    logItemClick(prefKey, if (newState) EVENT_SWITCH_ON else EVENT_SWITCH_OFF)
+                    model.onCheckedChange(newState)
                 }
+                override val changeable = { !model.disabled }
                 override val icon: (@Composable () -> Unit)?
                     get() {
                         if (model.icon == null) {
@@ -312,10 +355,14 @@ class DeviceDetailsFragmentFormatterImpl(
                         return { deviceSettingIcon(model.icon) }
                     }
             }
-        if (model.onPrimaryClick != null) {
+        if (model.action != null) {
             TwoTargetSwitchPreference(
                 switchPrefModel,
-                primaryOnClick = model.onPrimaryClick::invoke,
+                primaryOnClick = {
+                    logItemClick(prefKey, EVENT_CLICK_PRIMARY)
+                    triggerAction(model.action)
+                },
+                primaryEnabled = { !model.disabled },
             )
         } else {
             SwitchPreference(switchPrefModel)
@@ -323,13 +370,17 @@ class DeviceDetailsFragmentFormatterImpl(
     }
 
     @Composable
-    private fun buildPlainPreference(model: DeviceSettingPreferenceModel.PlainPreference) {
+    private fun buildPlainPreference(
+        model: DeviceSettingPreferenceModel.PlainPreference,
+        prefKey: String,
+    ) {
         SpaPreference(
             object : PreferenceModel {
                 override val title = model.title
                 override val summary = { model.summary ?: "" }
                 override val onClick = {
-                    model.onClick?.invoke()
+                    logItemClick(prefKey, EVENT_CLICK_PRIMARY)
+                    model.action?.let { triggerAction(it) }
                     Unit
                 }
                 override val icon: (@Composable () -> Unit)?
@@ -344,7 +395,7 @@ class DeviceDetailsFragmentFormatterImpl(
     }
 
     @Composable
-    fun buildMoreSettingsPreference() {
+    fun buildMoreSettingsPreference(prefKey: String) {
         SpaPreference(
             object : PreferenceModel {
                 override val title =
@@ -353,6 +404,7 @@ class DeviceDetailsFragmentFormatterImpl(
                     context.getString(R.string.bluetooth_device_more_settings_preference_summary)
                 }
                 override val onClick = {
+                    logItemClick(prefKey, EVENT_CLICK_PRIMARY)
                     SubSettingLauncher(context)
                         .setDestination(DeviceDetailsMoreSettingsFragment::class.java.name)
                         .setSourceMetricsCategory(fragment.getMetricsCategory())
@@ -361,7 +413,12 @@ class DeviceDetailsFragmentFormatterImpl(
                         )
                         .launch()
                 }
-                override val icon = @Composable { deviceSettingIcon(null) }
+                override val icon =
+                    @Composable {
+                        deviceSettingIcon(
+                            DeviceSettingIcon.ResourceIcon(R.drawable.ic_chevron_right_24dp)
+                        )
+                    }
             }
         )
     }
@@ -376,9 +433,83 @@ class DeviceDetailsFragmentFormatterImpl(
         icon?.let { Icon(it, modifier = Modifier.size(SettingsDimension.itemIconSize)) }
     }
 
+    private fun logItemClick(preferenceKey: String, value: Int = 0) {
+        logAction(preferenceKey, SettingsEnums.ACTION_BLUETOOTH_DEVICE_DETAILS_ITEM_CLICKED, value)
+    }
+
+    private fun logItemShown(preferenceKey: String, visible: Boolean) {
+        if (!visible && !prefVisibility.containsKey(preferenceKey)) {
+            return
+        }
+        prefVisibility
+            .computeIfAbsent(preferenceKey) {
+                MutableStateFlow(true).also { visibilityFlow ->
+                    visibilityFlow
+                        .onEach {
+                            logAction(
+                                preferenceKey,
+                                SettingsEnums.ACTION_BLUETOOTH_DEVICE_DETAILS_ITEM_SHOWN,
+                                if (it) EVENT_VISIBLE else EVENT_INVISIBLE,
+                            )
+                        }
+                        .launchIn(fragment.lifecycleScope)
+                }
+            }
+            .value = visible
+    }
+
+    private fun logAction(preferenceKey: String, action: Int, value: Int) {
+        metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, action, 0, preferenceKey, value)
+    }
+
+    private fun triggerAction(action: DeviceSettingActionModel) {
+        when (action) {
+            is DeviceSettingActionModel.IntentAction -> {
+                action.intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(action.intent)
+            }
+            is DeviceSettingActionModel.PendingIntentAction -> {
+                val options =
+                    ActivityOptions.makeBasic()
+                        .setPendingIntentBackgroundActivityStartMode(
+                            ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS
+                        )
+                action.pendingIntent.send(options.toBundle())
+            }
+        }
+    }
+
+    private fun getController(key: String): AbstractPreferenceController? {
+        return prefKeyToController[key]
+    }
+
+    private fun disableController(controller: AbstractPreferenceController) {
+        if (controller is LifecycleObserver) {
+            fragment.settingsLifecycle.removeObserver(controller as LifecycleObserver)
+        }
+
+        if (controller is BlockingPrefWithSliceController) {
+            // Make UiBlockListener finished, otherwise UI will flicker.
+            controller.onChanged(null)
+        }
+
+        if (controller is OnPause) {
+            (controller as OnPause).onPause()
+        }
+
+        if (controller is OnStop) {
+            (controller as OnStop).onStop()
+        }
+    }
+
     private fun getPreferenceKey(settingId: Int) = "DEVICE_SETTING_${settingId}"
 
-    companion object {
+    private companion object {
         const val TAG = "DeviceDetailsFormatter"
+        const val EVENT_SWITCH_OFF = 0
+        const val EVENT_SWITCH_ON = 1
+        const val EVENT_CLICK_PRIMARY = 2
+        const val EVENT_INVISIBLE = 0
+        const val EVENT_VISIBLE = 1
     }
 }
diff --git a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
index c0fbd4f2c4a..cc0fe7bc33a 100644
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
@@ -16,26 +16,30 @@
 
 package com.android.settings.bluetooth.ui.view
 
+import android.app.settings.SettingsEnums
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothManager
 import android.content.Context
+import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.android.settings.R
+import com.android.settings.bluetooth.BluetoothDetailsAudioDeviceTypeController
 import com.android.settings.bluetooth.BluetoothDetailsProfilesController
 import com.android.settings.bluetooth.Utils
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
 import com.android.settings.bluetooth.ui.model.FragmentTypeModel
 import com.android.settings.dashboard.DashboardFragment
+import com.android.settings.flags.Flags
 import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
 import com.android.settingslib.bluetooth.CachedBluetoothDevice
 import com.android.settingslib.bluetooth.LocalBluetoothManager
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
 import com.android.settingslib.core.AbstractPreferenceController
-import com.android.settingslib.core.lifecycle.LifecycleObserver
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
@@ -48,8 +52,7 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
     private lateinit var cachedDevice: CachedBluetoothDevice
     private lateinit var helpItem: StateFlow<DeviceSettingPreferenceModel.HelpPreference?>
 
-    // TODO(b/343317785): add metrics category
-    override fun getMetricsCategory(): Int = 0
+    override fun getMetricsCategory(): Int = SettingsEnums.BLUETOOTH_DEVICE_DETAILS_MORE_SETTINGS
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
@@ -73,7 +76,10 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
 
     override fun onOptionsItemSelected(menuItem: MenuItem): Boolean {
         if (menuItem.itemId == MENU_HELP_ITEM_ID) {
-            helpItem.value?.let { it.onClick() }
+            helpItem.value?.intent?.let {
+                it.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                requireContext().startActivity(it)
+            }
             return true
         }
         return super.onOptionsItemSelected(menuItem)
@@ -83,17 +89,29 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
         return R.xml.bluetooth_device_more_settings_fragment
     }
 
-    override fun addPreferenceController(controller: AbstractPreferenceController) {
-        val keys: List<String>? =
-            formatter.getVisiblePreferenceKeys(FragmentTypeModel.DeviceDetailsMoreSettingsFragment)
-        val lifecycle = settingsLifecycle
-        if (keys == null || keys.contains(controller.preferenceKey)) {
-            super.addPreferenceController(controller)
-        } else if (controller is LifecycleObserver) {
-            lifecycle.removeObserver((controller as LifecycleObserver))
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (!this::formatter.isInitialized) {
+            val controllers = preferenceControllers.stream()
+                .flatMap { obj: List<AbstractPreferenceController?> -> obj.stream() }
+                .toList()
+            val bluetoothManager = requireContext().getSystemService(BluetoothManager::class.java)
+            formatter =
+                featureFactory
+                    .bluetoothFeatureProvider
+                    .getDeviceDetailsFragmentFormatter(
+                        requireContext(), this, bluetoothManager.adapter, cachedDevice, controllers
+                    )
         }
+        formatter.updateLayout(FragmentTypeModel.DeviceDetailsMoreSettingsFragment)
+        helpItem =
+            formatter
+                .getMenuItem(FragmentTypeModel.DeviceDetailsMoreSettingsFragment)
+                .stateIn(lifecycleScope, SharingStarted.WhileSubscribed(), initialValue = null)
     }
 
+
+
     private fun getCachedDevice(): CachedBluetoothDevice? {
         val bluetoothAddress = arguments?.getString(KEY_DEVICE_ADDRESS) ?: return null
         localBluetoothManager = Utils.getLocalBtManager(context) ?: return null
@@ -102,30 +120,13 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
         return Utils.getLocalBtManager(context).cachedDeviceManager.findDevice(remoteDevice)
     }
 
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        super.onCreatePreferences(savedInstanceState, rootKey)
-        formatter.updateLayout(FragmentTypeModel.DeviceDetailsMoreSettingsFragment)
-    }
-
     override fun createPreferenceControllers(context: Context): List<AbstractPreferenceController> {
-        val bluetoothManager = context.getSystemService(BluetoothManager::class.java)
         cachedDevice =
             getCachedDevice()
                 ?: run {
                     finish()
                     return emptyList()
                 }
-        formatter =
-            featureFactory.bluetoothFeatureProvider.getDeviceDetailsFragmentFormatter(
-                requireContext(),
-                this,
-                bluetoothManager.adapter,
-                cachedDevice,
-            )
-        helpItem =
-            formatter
-                .getMenuItem(FragmentTypeModel.DeviceDetailsMoreSettingsFragment)
-                .stateIn(lifecycleScope, SharingStarted.WhileSubscribed(), initialValue = null)
         return listOf(
             BluetoothDetailsProfilesController(
                 context,
@@ -133,10 +134,14 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
                 localBluetoothManager,
                 cachedDevice,
                 settingsLifecycle,
-                formatter.getInvisibleBluetoothProfiles(
-                    FragmentTypeModel.DeviceDetailsMoreSettingsFragment
-                ),
-            )
+            ),
+            BluetoothDetailsAudioDeviceTypeController(
+                context,
+                this,
+                localBluetoothManager,
+                cachedDevice,
+                settingsLifecycle,
+            ),
         )
     }
 
diff --git a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
index 67a0ebc8398..8d3b8539b98 100644
--- a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
+++ b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
@@ -17,20 +17,20 @@
 package com.android.settings.bluetooth.ui.viewmodel
 
 import android.app.Application
+import android.bluetooth.BluetoothAdapter
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import com.android.settings.R
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractor
 import com.android.settings.bluetooth.ui.layout.DeviceSettingLayout
 import com.android.settings.bluetooth.ui.layout.DeviceSettingLayoutColumn
 import com.android.settings.bluetooth.ui.layout.DeviceSettingLayoutRow
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
 import com.android.settings.bluetooth.ui.model.FragmentTypeModel
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
 import com.android.settingslib.bluetooth.CachedBluetoothDevice
 import com.android.settingslib.bluetooth.devicesettings.DeviceSettingId
-import com.android.settingslib.bluetooth.devicesettings.data.repository.DeviceSettingRepository
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingConfigItemModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingModel
@@ -47,12 +47,18 @@ import kotlinx.coroutines.flow.stateIn
 
 class BluetoothDeviceDetailsViewModel(
     private val application: Application,
-    private val deviceSettingRepository: DeviceSettingRepository,
-    private val spatialAudioInteractor: SpatialAudioInteractor,
+    private val bluetoothAdapter: BluetoothAdapter,
     private val cachedDevice: CachedBluetoothDevice,
     backgroundCoroutineContext: CoroutineContext,
 ) : AndroidViewModel(application) {
 
+    private val deviceSettingRepository =
+        featureFactory.bluetoothFeatureProvider.getDeviceSettingRepository(
+            application,
+            bluetoothAdapter,
+            viewModelScope,
+        )
+
     private val items =
         viewModelScope.async(backgroundCoroutineContext, start = CoroutineStart.LAZY) {
             deviceSettingRepository.getDeviceSettingsConfig(cachedDevice)
@@ -79,11 +85,8 @@ class BluetoothDeviceDetailsViewModel(
         if (settingId == DeviceSettingId.DEVICE_SETTING_ID_MORE_SETTINGS) {
             return flowOf(DeviceSettingPreferenceModel.MoreSettingsPreference(settingId))
         }
-        return when (settingId) {
-            DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE ->
-                spatialAudioInteractor.getDeviceSetting(cachedDevice)
-            else -> deviceSettingRepository.getDeviceSetting(cachedDevice, settingId)
-        }.map { it?.toPreferenceModel() }
+        return deviceSettingRepository.getDeviceSetting(cachedDevice, settingId)
+            .map { it?.toPreferenceModel() }
     }
 
     private fun DeviceSettingModel.toPreferenceModel(): DeviceSettingPreferenceModel? {
@@ -101,7 +104,8 @@ class BluetoothDeviceDetailsViewModel(
                                 DeviceSettingStateModel.ActionSwitchPreferenceState(newState)
                             )
                         },
-                        onPrimaryClick = { intent?.let { application.startActivity(it) } },
+                        disabled = !isAllowedChangingState,
+                        action = action,
                     )
                 } else {
                     DeviceSettingPreferenceModel.PlainPreference(
@@ -109,7 +113,7 @@ class BluetoothDeviceDetailsViewModel(
                         title = title,
                         summary = summary,
                         icon = icon,
-                        onClick = { intent?.let { application.startActivity(it) } },
+                        action = action,
                     )
                 }
             }
@@ -119,7 +123,7 @@ class BluetoothDeviceDetailsViewModel(
                 DeviceSettingPreferenceModel.HelpPreference(
                     id = id,
                     icon = DeviceSettingIcon.ResourceIcon(R.drawable.ic_help),
-                    onClick = { application.startActivity(intent) },
+                    intent = intent,
                 )
             is DeviceSettingModel.MultiTogglePreference ->
                 DeviceSettingPreferenceModel.MultiTogglePreference(
@@ -149,7 +153,6 @@ class BluetoothDeviceDetailsViewModel(
         val positionToSettingIds =
             combine(configDeviceSetting) { settings ->
                     val positionMapping = mutableMapOf<Int, List<DeviceSettingLayoutColumn>>()
-                    var multiToggleSettingIds: MutableList<DeviceSettingLayoutColumn>? = null
                     for (i in settings.indices) {
                         val configItem = configItems[i]
                         val setting = settings[i]
@@ -157,35 +160,13 @@ class BluetoothDeviceDetailsViewModel(
                         if (!isXmlPreference && setting == null) {
                             continue
                         }
-                        if (setting !is DeviceSettingPreferenceModel.MultiTogglePreference) {
-                            multiToggleSettingIds = null
-                            positionMapping[i] =
-                                listOf(
-                                    DeviceSettingLayoutColumn(
-                                        configItem.settingId,
-                                        configItem.highlighted,
-                                    )
-                                )
-                            continue
-                        }
-
-                        if (multiToggleSettingIds != null) {
-                            multiToggleSettingIds.add(
+                        positionMapping[i] =
+                            listOf(
                                 DeviceSettingLayoutColumn(
                                     configItem.settingId,
                                     configItem.highlighted,
                                 )
                             )
-                        } else {
-                            multiToggleSettingIds =
-                                mutableListOf(
-                                    DeviceSettingLayoutColumn(
-                                        configItem.settingId,
-                                        configItem.highlighted,
-                                    )
-                                )
-                            positionMapping[i] = multiToggleSettingIds
-                        }
                     }
                     positionMapping
                 }
@@ -199,8 +180,7 @@ class BluetoothDeviceDetailsViewModel(
 
     class Factory(
         private val application: Application,
-        private val deviceSettingRepository: DeviceSettingRepository,
-        private val spatialAudioInteractor: SpatialAudioInteractor,
+        private val bluetoothAdapter: BluetoothAdapter,
         private val cachedDevice: CachedBluetoothDevice,
         private val backgroundCoroutineContext: CoroutineContext,
     ) : ViewModelProvider.Factory {
@@ -208,8 +188,7 @@ class BluetoothDeviceDetailsViewModel(
             @Suppress("UNCHECKED_CAST")
             return BluetoothDeviceDetailsViewModel(
                 application,
-                deviceSettingRepository,
-                spatialAudioInteractor,
+                bluetoothAdapter,
                 cachedDevice,
                 backgroundCoroutineContext,
             )
diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index c67995a2456..b6ca425aa17 100644
--- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -132,7 +132,12 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
 
                 @Override
                 public void onSourceAdded(
-                        @NonNull BluetoothDevice sink, int sourceId, int reason) {}
+                        @NonNull BluetoothDevice sink, int sourceId, int reason) {
+                    Log.d(TAG, "onSourceAdded: update media device list.");
+                    if (mBluetoothDeviceUpdater != null) {
+                        mBluetoothDeviceUpdater.forceUpdate();
+                    }
+                }
 
                 @Override
                 public void onSourceAddFailed(
@@ -165,21 +170,14 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
                 public void onReceiveStateChanged(
                         @NonNull BluetoothDevice sink,
                         int sourceId,
-                        @NonNull BluetoothLeBroadcastReceiveState state) {
-                    if (BluetoothUtils.isConnected(state)) {
-                        Log.d(TAG, "onReceiveStateChanged: synced, update media device list.");
-                        if (mBluetoothDeviceUpdater != null) {
-                            mBluetoothDeviceUpdater.forceUpdate();
-                        }
-                    }
-                }
+                        @NonNull BluetoothLeBroadcastReceiveState state) {}
             };
 
     public AvailableMediaDeviceGroupController(Context context) {
         super(context, KEY);
         mBtManager = Utils.getLocalBtManager(mContext);
         mExecutor = Executors.newSingleThreadExecutor();
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             mBroadcast =
                     mBtManager == null
                             ? null
@@ -200,7 +198,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
             Log.d(TAG, "onStart() Bluetooth is not supported on this device");
             return;
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             registerAudioSharingCallbacks();
         }
         mBtManager.getEventManager().registerCallback(this);
@@ -216,7 +214,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
             Log.d(TAG, "onStop() Bluetooth is not supported on this device");
             return;
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             unregisterAudioSharingCallbacks();
         }
         if (mBluetoothDeviceUpdater != null) {
@@ -278,7 +276,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
     public void onDeviceClick(Preference preference) {
         final CachedBluetoothDevice cachedDevice =
                 ((BluetoothDevicePreference) preference).getBluetoothDevice();
-        if (BluetoothUtils.isAudioSharingEnabled() && mDialogHandler != null) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext) && mDialogHandler != null) {
             mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
             FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
                     .action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);
@@ -294,7 +292,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
                         fragment.getContext(),
                         AvailableMediaDeviceGroupController.this,
                         fragment.getMetricsCategory());
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             mDialogHandler = new AudioSharingDialogHandler(mContext, fragment);
         }
     }
@@ -341,7 +339,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
                             if (isAudioModeOngoingCall(mContext)) {
                                 // in phone call
                                 titleResId = R.string.connected_device_call_device_title;
-                            } else if (BluetoothUtils.isAudioSharingEnabled()
+                            } else if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                                     && BluetoothUtils.isBroadcasting(mBtManager)) {
                                 // without phone call, in audio sharing
                                 titleResId = R.string.audio_sharing_media_device_group_title;
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 66f2f1b8f31..90ef5b95b63 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -21,6 +21,8 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -120,4 +122,9 @@ public class BluetoothDashboardFragment extends DashboardFragment {
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.bluetooth_screen);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return BluetoothDashboardScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt
new file mode 100644
index 00000000000..66fd8b17394
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class BluetoothDashboardScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.bluetooth_settings_title
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_bluetooth
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystBluetoothSwitchbarScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = BluetoothDashboardFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "bluetooth_switchbar_screen"
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreference.kt b/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreference.kt
new file mode 100644
index 00000000000..bf806531135
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreference.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice
+
+import android.bluetooth.BluetoothAdapter
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import com.android.settings.R
+import com.android.settings.widget.MainSwitchBarMetadata
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+
+class BluetoothMainSwitchPreference(private val bluetoothAdapter: BluetoothAdapter?) :
+    MainSwitchBarMetadata, PreferenceLifecycleProvider {
+
+    private lateinit var broadcastReceiver: BroadcastReceiver
+
+    override val key
+        get() = "use_bluetooth"
+
+    override val title
+        get() = R.string.bluetooth_main_switch_title
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun storage(context: Context) = BluetoothStateStore(bluetoothAdapter)
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        broadcastReceiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(receiverContext: Context, intent: Intent) {
+                    context.notifyPreferenceChange(key)
+                }
+            }
+        context.registerReceiver(
+            broadcastReceiver,
+            IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED),
+            Context.RECEIVER_EXPORTED_UNAUDITED
+        )
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        if (::broadcastReceiver.isInitialized) {
+            context.unregisterReceiver(broadcastReceiver)
+        }
+    }
+
+    override fun isEnabled(context: Context): Boolean {
+        return bluetoothAdapter?.state.let {
+            it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_OFF
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    class BluetoothStateStore(private val bluetoothAdapter: BluetoothAdapter?) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+
+        override fun contains(key: String) = true
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
+            return (bluetoothAdapter?.state.let {
+                it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_TURNING_ON
+            }) as T
+        }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value is Boolean) {
+                if (value) {
+                    bluetoothAdapter?.enable()
+                } else {
+                    bluetoothAdapter?.disable()
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 37b71863e54..65258fc7257 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -80,7 +80,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
                             + ", action : "
                             + action);
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(context)) {
             use(AudioSharingDevicePreferenceController.class).init(this);
         }
         use(AvailableMediaDeviceGroupController.class).init(this);
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index 4423c65e00b..f300fb00b86 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -54,10 +54,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
     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 final Map<BluetoothDevice, Preference> mDevicePreferenceMap = new HashMap<>();
     private final BluetoothAdapter mBluetoothAdapter;
@@ -118,6 +116,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         mContext.registerReceiver(mReceiver, mIntentFilter,
                 Context.RECEIVER_EXPORTED_UNAUDITED);
         mBluetoothDeviceUpdater.refreshPreference();
+        Log.d(TAG, "Updating preference group by onStart on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
@@ -146,55 +146,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         if (DEBUG) {
             Log.d(TAG, "onDeviceAdded() " + preference.getTitle());
         }
+        Log.d(TAG, "Updating preference group by onDeviceAdded on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
-    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) {
         if (preference instanceof BluetoothDevicePreference) {
@@ -207,37 +163,43 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         if (DEBUG) {
             Log.d(TAG, "onDeviceRemoved() " + preference.getTitle());
         }
+        Log.d(TAG, "Updating preference group by onDeviceRemoved on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
     /** Sort the preferenceGroup by most recently used. */
     public void updatePreferenceGroup() {
-        mPreferenceGroup.removeAll();
-        mPreferenceGroup.addPreference(mSeeAllPreference);
-        if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
-            // Bluetooth is supported
-            int order = 0;
-            for (BluetoothDevice device : mBluetoothAdapter.getMostRecentlyConnectedDevices()) {
-                Preference preference = mDevicePreferenceMap.getOrDefault(device, null);
-                if (preference != null) {
+        mContext.getMainExecutor().execute(() -> {
+            mPreferenceGroup.removeAll();
+            if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
+                // Bluetooth is supported
+                int order = 0;
+                for (BluetoothDevice device : mBluetoothAdapter.getMostRecentlyConnectedDevices()) {
+                    Preference preference = mDevicePreferenceMap.getOrDefault(device, null);
+                    if (preference != null) {
+                        Log.d(TAG, "Adding preference with order " + order + " when there are "
+                                + mPreferenceGroup.getPreferenceCount());
+                        preference.setOrder(order);
+                        mPreferenceGroup.addPreference(preference);
+                        order += 1;
+                    }
+                    if (order == MAX_DEVICE_NUM) {
+                        break;
+                    }
+                }
+                for (Preference preference : mDockDevicesList) {
+                    if (order == MAX_DEVICE_NUM) {
+                        break;
+                    }
                     preference.setOrder(order);
                     mPreferenceGroup.addPreference(preference);
                     order += 1;
                 }
-                if (order == MAX_DEVICE_NUM) {
-                    break;
-                }
             }
-            for (Preference preference : mDockDevicesList) {
-                if (order == MAX_DEVICE_NUM) {
-                    break;
-                }
-                preference.setOrder(order);
-                mPreferenceGroup.addPreference(preference);
-                order += 1;
-            }
-        }
-        updatePreferenceVisibility();
+            mPreferenceGroup.addPreference(mSeeAllPreference);
+            updatePreferenceVisibility();
+        });
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingActivity.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingActivity.java
index 08b21a1e79c..7f135ce19d7 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingActivity.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingActivity.java
@@ -25,7 +25,7 @@ public class AudioSharingActivity extends SettingsActivity {
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (!BluetoothUtils.isAudioSharingUIAvailable(this)) {
             finish();
         }
     }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java
index 96c5d453dcd..6410f96aefe 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java
@@ -55,7 +55,8 @@ public abstract class AudioSharingBasePreferenceController extends BasePreferenc
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return (BluetoothUtils.isAudioSharingUIAvailable(mContext))
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
index 60a8a1329f7..e5b984d707c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.connecteddevice.audiosharing;
 
-import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.util.Log;
 
@@ -30,6 +29,7 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.utils.ThreadUtils;
 
 public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater
         implements Preference.OnPreferenceClickListener {
@@ -55,7 +55,7 @@ public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater
         if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) {
             // If device is LE audio device and has a broadcast source,
             // it would show in audio sharing devices group.
-            if (BluetoothUtils.isAudioSharingEnabled()
+            if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                     && cachedDevice.isConnectedLeAudioDevice()
                     && BluetoothUtils.hasConnectedBroadcastSource(cachedDevice, mLocalBtManager)) {
                 isFilterMatched = true;
@@ -73,7 +73,9 @@ public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater
     @Override
     public boolean onPreferenceClick(Preference preference) {
         mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
-        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
+        var unused =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> mDevicePreferenceCallback.onDeviceClick(preference));
         return true;
     }
 
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
index fa9f94d83c4..f3e3978d468 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
@@ -65,27 +65,32 @@ public class AudioSharingCallAudioDialogFragment extends InstrumentedDialogFragm
      * @param listener The callback to handle the user action on this dialog.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             int checkedItemIndex,
             @NonNull DialogEventListener listener) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        sListener = listener;
-        if (manager.findFragmentByTag(TAG) == null) {
-            final Bundle bundle = new Bundle();
-            bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
-            bundle.putInt(BUNDLE_KEY_CHECKED_ITEM_INDEX, checkedItemIndex);
-            final AudioSharingCallAudioDialogFragment dialog =
-                    new AudioSharingCallAudioDialogFragment();
-            dialog.setArguments(bundle);
-            dialog.show(manager, TAG);
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            sListener = listener;
+            if (manager.findFragmentByTag(TAG) == null) {
+                final Bundle bundle = new Bundle();
+                bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
+                bundle.putInt(BUNDLE_KEY_CHECKED_ITEM_INDEX, checkedItemIndex);
+                final AudioSharingCallAudioDialogFragment dialog =
+                        new AudioSharingCallAudioDialogFragment();
+                dialog.setArguments(bundle);
+                dialog.show(manager, TAG);
+            }
         }
     }
 
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
index 168fce51dc4..719d6cb71e6 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
@@ -31,6 +31,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
 import android.util.Log;
+import android.util.Pair;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -109,7 +110,10 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
 
                 @Override
                 public void onSourceAdded(
-                        @NonNull BluetoothDevice sink, int sourceId, int reason) {}
+                        @NonNull BluetoothDevice sink, int sourceId, int reason) {
+                    Log.d(TAG, "onSourceAdded: updateSummary");
+                    updateSummary();
+                }
 
                 @Override
                 public void onSourceAddFailed(
@@ -137,12 +141,7 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
                 public void onReceiveStateChanged(
                         @NonNull BluetoothDevice sink,
                         int sourceId,
-                        @NonNull BluetoothLeBroadcastReceiveState state) {
-                    if (BluetoothUtils.isConnected(state)) {
-                        Log.d(TAG, "onReceiveStateChanged: synced, updateSummary");
-                        updateSummary();
-                    }
-                }
+                        @NonNull BluetoothLeBroadcastReceiveState state) {}
             };
 
     public AudioSharingCallAudioPreferenceController(Context context) {
@@ -195,40 +194,33 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
                         }
                         updateDeviceItemsInSharingSession();
                         if (!mDeviceItemsInSharingSession.isEmpty()) {
-                            int checkedItemIndex = getActiveItemIndex(mDeviceItemsInSharingSession);
+                            Pair<Integer, AudioSharingDeviceItem> pair = getActiveItemWithIndex();
                             AudioSharingCallAudioDialogFragment.show(
                                     mFragment,
                                     mDeviceItemsInSharingSession,
-                                    checkedItemIndex,
+                                    pair == null ? -1 : pair.first,
                                     (AudioSharingDeviceItem item) -> {
                                         int currentGroupId =
                                                 BluetoothUtils.getPrimaryGroupIdForBroadcast(
                                                         mContext.getContentResolver());
-                                        if (item.getGroupId() == currentGroupId) {
-                                            Log.d(
-                                                    TAG,
-                                                    "Skip set fallback active device: unchanged");
+                                        int clickedGroupId = item.getGroupId();
+                                        if (clickedGroupId == currentGroupId) {
+                                            Log.d(TAG, "Skip set call audio device: unchanged");
                                             return;
                                         }
                                         List<BluetoothDevice> devices =
                                                 mGroupedConnectedDevices.getOrDefault(
-                                                        item.getGroupId(), ImmutableList.of());
+                                                        clickedGroupId, ImmutableList.of());
                                         CachedBluetoothDevice lead =
                                                 AudioSharingUtils.getLeadDevice(
                                                         mCacheManager, devices);
                                         if (lead != null) {
-                                            Log.d(
-                                                    TAG,
-                                                    "Set fallback active device: "
-                                                            + lead.getDevice()
-                                                                    .getAnonymizedAddress());
-                                            lead.setActive();
+                                            String addr = lead.getDevice().getAnonymizedAddress();
+                                            Log.d(TAG, "Set call audio device: " + addr);
+                                            AudioSharingUtils.setPrimary(mContext, lead);
                                             logCallAudioDeviceChange(currentGroupId, lead);
                                         } else {
-                                            Log.d(
-                                                    TAG,
-                                                    "Fail to set fallback active device: no"
-                                                            + " lead device");
+                                            Log.d(TAG, "Skip set call audio device: no lead");
                                         }
                                     });
                         }
@@ -263,6 +255,18 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
         }
     }
 
+    @Override
+    public void onActiveDeviceChanged(@Nullable CachedBluetoothDevice activeDevice,
+            int bluetoothProfile) {
+        if (activeDevice != null && bluetoothProfile == BluetoothProfile.LE_AUDIO
+                && BluetoothUtils.isBroadcasting(mBtManager)) {
+            Log.d(TAG, "onActiveDeviceChanged: update summary, device = "
+                    + activeDevice.getDevice().getAnonymizedAddress()
+                    + ", profile = " + bluetoothProfile);
+            updateSummary();
+        }
+    }
+
     /**
      * Initialize the controller.
      *
@@ -348,30 +352,22 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
      */
     private void updateSummary() {
         updateDeviceItemsInSharingSession();
-        int fallbackActiveGroupId =
-                BluetoothUtils.getPrimaryGroupIdForBroadcast(mContext.getContentResolver());
-        if (fallbackActiveGroupId != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
-            for (AudioSharingDeviceItem item : mDeviceItemsInSharingSession) {
-                if (item.getGroupId() == fallbackActiveGroupId) {
-                    Log.d(
-                            TAG,
-                            "updatePreference: set summary to fallback group "
-                                    + fallbackActiveGroupId);
-                    AudioSharingUtils.postOnMainThread(
-                            mContext,
-                            () -> {
-                                if (mPreference != null) {
-                                    mPreference.setSummary(
-                                            mContext.getString(
-                                                    R.string.audio_sharing_call_audio_description,
-                                                    item.getName()));
-                                }
-                            });
-                    return;
-                }
-            }
+        Pair<Integer, AudioSharingDeviceItem> pair = getActiveItemWithIndex();
+        if (pair != null) {
+            Log.d(TAG, "updateSummary, group = " + pair.second.getGroupId());
+            AudioSharingUtils.postOnMainThread(
+                    mContext,
+                    () -> {
+                        if (mPreference != null) {
+                            mPreference.setSummary(
+                                    mContext.getString(
+                                            R.string.audio_sharing_call_audio_description,
+                                            pair.second.getName()));
+                        }
+                    });
+            return;
         }
-        Log.d(TAG, "updatePreference: set empty summary");
+        Log.d(TAG, "updateSummary: set empty");
         AudioSharingUtils.postOnMainThread(
                 mContext,
                 () -> {
@@ -388,16 +384,26 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
                         mBtManager, mGroupedConnectedDevices, /* filterByInSharing= */ true);
     }
 
-    private int getActiveItemIndex(List<AudioSharingDeviceItem> deviceItems) {
-        int checkedItemIndex = -1;
+    @Nullable
+    private Pair<Integer, AudioSharingDeviceItem> getActiveItemWithIndex() {
+        List<AudioSharingDeviceItem> deviceItems = new ArrayList<>(mDeviceItemsInSharingSession);
         int fallbackActiveGroupId =
                 BluetoothUtils.getPrimaryGroupIdForBroadcast(mContext.getContentResolver());
-        for (AudioSharingDeviceItem item : deviceItems) {
-            if (item.getGroupId() == fallbackActiveGroupId) {
-                return deviceItems.indexOf(item);
+        if (fallbackActiveGroupId != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+            for (AudioSharingDeviceItem item : deviceItems) {
+                if (item.getGroupId() == fallbackActiveGroupId) {
+                    Log.d(TAG, "getActiveItemWithIndex, fallback group = " + item.getGroupId());
+                    return new Pair<>(deviceItems.indexOf(item), item);
+                }
             }
         }
-        return checkedItemIndex;
+        for (AudioSharingDeviceItem item : deviceItems) {
+            if (item.isActive()) {
+                Log.d(TAG, "getActiveItemWithIndex, active LEA group = " + item.getGroupId());
+                return new Pair<>(deviceItems.indexOf(item), item);
+            }
+        }
+        return null;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
index 52df1d33a0d..6ce111baee3 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
@@ -155,7 +155,8 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
index 3750cf1ebbe..6921a8da4c0 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
@@ -44,23 +44,28 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen
      *
      * @param host The Fragment this dialog will be hosted.
      */
-    public static void show(Fragment host) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+    public static void show(@Nullable Fragment host) {
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, return.");
-            return;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, return.");
+                return;
+            }
+            Log.d(TAG, "Show up the confirm dialog.");
+            AudioSharingConfirmDialogFragment dialogFrag = new AudioSharingConfirmDialogFragment();
+            dialogFrag.show(manager, TAG);
         }
-        Log.d(TAG, "Show up the confirm dialog.");
-        AudioSharingConfirmDialogFragment dialogFrag = new AudioSharingConfirmDialogFragment();
-        dialogFrag.show(manager, TAG);
     }
 
     @Override
@@ -72,7 +77,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen
                         .setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing)
                         .setIsCustomBodyEnabled(true)
                         .setCustomMessage(R.string.audio_sharing_comfirm_dialog_content)
-                        .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> {})
+                        .setPositiveButton(R.string.audio_sharing_close_button_label, (d, w) -> {})
                         .build();
         dialog.setCanceledOnTouchOutside(true);
         return dialog;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java
index 786e1dccc05..ce0a4658ff7 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java
@@ -45,6 +45,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     public static final int SHARE_THEN_PAIR_REQUEST_CODE = 1002;
 
     SettingsMainSwitchBar mMainSwitchBar;
+    private Context mContext;
     private AudioSharingDeviceVolumeGroupController mAudioSharingDeviceVolumeGroupController;
     private AudioSharingCallAudioPreferenceController mAudioSharingCallAudioPreferenceController;
     private AudioSharingPlaySoundPreferenceController mAudioSharingPlaySoundPreferenceController;
@@ -78,6 +79,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+        mContext = context;
         mAudioSharingDeviceVolumeGroupController =
                 use(AudioSharingDeviceVolumeGroupController.class);
         mAudioSharingDeviceVolumeGroupController.init(this);
@@ -107,23 +109,25 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        // In share then pair flow, after users be routed to pair new device page and successfully
-        // pair and connect an LEA headset, the pair fragment will be finished with RESULT_OK
-        // and EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE, pass the BT device to switch bar controller,
-        // which is responsible for adding source to the device with loading indicator.
-        if (requestCode == SHARE_THEN_PAIR_REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                BluetoothDevice btDevice =
-                        data != null
-                                ? data.getParcelableExtra(EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE,
-                                BluetoothDevice.class)
-                                : null;
-                Log.d(TAG, "onActivityResult: RESULT_OK with device = " + btDevice);
-                if (btDevice != null) {
-                    var unused = ThreadUtils.postOnBackgroundThread(
-                            () -> mAudioSharingSwitchBarController.handleAutoAddSourceAfterPair(
-                                    btDevice));
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
+            // In share then pair flow, after users be routed to pair new device page and
+            // successfully pair and connect an LEA headset, the pair fragment will be finished with
+            // RESULT_OK and EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE, pass the BT device to switch bar
+            // controller, which is responsible for adding source to the device with loading
+            // indicator.
+            if (requestCode == SHARE_THEN_PAIR_REQUEST_CODE) {
+                if (resultCode == Activity.RESULT_OK) {
+                    BluetoothDevice btDevice =
+                            data != null
+                                    ? data.getParcelableExtra(EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE,
+                                    BluetoothDevice.class)
+                                    : null;
+                    Log.d(TAG, "onActivityResult: RESULT_OK with device = " + btDevice);
+                    if (btDevice != null) {
+                        var unused = ThreadUtils.postOnBackgroundThread(
+                                () -> mAudioSharingSwitchBarController.handleAutoAddSourceAfterPair(
+                                        btDevice));
+                    }
                 }
             }
         }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceAdapter.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceAdapter.java
index 0b6b8c9ad39..7ff7844034f 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceAdapter.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceAdapter.java
@@ -85,6 +85,10 @@ public class AudioSharingDeviceAdapter extends RecyclerView.Adapter<RecyclerView
                 mButtonView.setText(btnText);
                 mButtonView.setOnClickListener(
                         v -> mOnClickListener.onClick(mDevices.get(position)));
+                if (position == 0) {
+                    mButtonView.setBackgroundResource(
+                            com.android.settingslib.R.drawable.audio_sharing_rounded_bg_ripple_top);
+                }
             } else {
                 Log.w(TAG, "bind view skipped due to button view is null");
             }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItem.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItem.java
index 5998e30c5bc..ca62dc39d80 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItem.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItem.java
@@ -19,6 +19,8 @@ package com.android.settings.connecteddevice.audiosharing;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 public final class AudioSharingDeviceItem implements Parcelable {
     private final String mName;
     private final int mGroupId;
@@ -72,4 +74,10 @@ public final class AudioSharingDeviceItem implements Parcelable {
                     return new AudioSharingDeviceItem[size];
                 }
             };
+
+    @Override
+    @NonNull
+    public String toString() {
+        return "AudioSharingDeviceItem groupId = " + mGroupId + ", isActive = " + mIsActive;
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
index 8b4c7f267bb..c286ed6114e 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.connecteddevice.audiosharing;
 
+import static com.android.settingslib.Utils.isAudioModeOngoingCall;
 import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.EXTRA_BLUETOOTH_DEVICE;
 
 import android.app.settings.SettingsEnums;
@@ -39,7 +40,9 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
@@ -91,6 +94,7 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
     @Nullable private DashboardFragment mFragment;
     @Nullable private AudioSharingDialogHandler mDialogHandler;
     private AtomicBoolean mIntentHandled = new AtomicBoolean(false);
+    private AtomicBoolean mIsAudioModeOngoingCall = new AtomicBoolean(false);
 
     @VisibleForTesting
     BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
@@ -112,7 +116,18 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
 
                 @Override
                 public void onSourceAdded(
-                        @NonNull BluetoothDevice sink, int sourceId, int reason) {}
+                        @NonNull BluetoothDevice sink, int sourceId, int reason) {
+                    Log.d(TAG, "onSourceAdded: update sharing device list.");
+                    if (mBluetoothDeviceUpdater != null) {
+                        mBluetoothDeviceUpdater.forceUpdate();
+                    }
+                    if (mDeviceManager != null && mDialogHandler != null) {
+                        CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(sink);
+                        if (cachedDevice != null) {
+                            mDialogHandler.closeOpeningDialogsForLeaDevice(cachedDevice);
+                        }
+                    }
+                }
 
                 @Override
                 public void onSourceAddFailed(
@@ -169,20 +184,7 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
                 public void onReceiveStateChanged(
                         @NonNull BluetoothDevice sink,
                         int sourceId,
-                        @NonNull BluetoothLeBroadcastReceiveState state) {
-                    if (BluetoothUtils.isConnected(state)) {
-                        Log.d(TAG, "onSourceAdded: update sharing device list.");
-                        if (mBluetoothDeviceUpdater != null) {
-                            mBluetoothDeviceUpdater.forceUpdate();
-                        }
-                        if (mDeviceManager != null && mDialogHandler != null) {
-                            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(sink);
-                            if (cachedDevice != null) {
-                                mDialogHandler.closeOpeningDialogsForLeaDevice(cachedDevice);
-                            }
-                        }
-                    }
-                }
+                        @NonNull BluetoothLeBroadcastReceiveState state) {}
             };
 
     public AudioSharingDevicePreferenceController(Context context) {
@@ -201,51 +203,57 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
 
     @Override
     public void onStart(@NonNull LifecycleOwner owner) {
-        if (!isAvailable()) {
-            Log.d(TAG, "Skip onStart(), feature is not supported.");
-            return;
-        }
-        if (!AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)
-                && mProfileManager != null) {
-            Log.d(TAG, "Register profile service listener");
-            mProfileManager.addServiceListener(this);
-        }
-        if (mEventManager == null
-                || mAssistant == null
-                || mDialogHandler == null
-                || mBluetoothDeviceUpdater == null) {
-            Log.d(TAG, "Skip onStart(), profile is not ready.");
-            return;
-        }
-        Log.d(TAG, "onStart() Register callbacks.");
-        mEventManager.registerCallback(this);
-        mAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
-        mDialogHandler.registerCallbacks(mExecutor);
-        mBluetoothDeviceUpdater.registerCallback();
-        mBluetoothDeviceUpdater.refreshPreference();
+        var unused = ThreadUtils.postOnBackgroundThread(() -> {
+            if (!isAvailable()) {
+                Log.d(TAG, "Skip onStart(), feature is not supported.");
+                return;
+            }
+            if (!AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)
+                    && mProfileManager != null) {
+                Log.d(TAG, "Register profile service listener");
+                mProfileManager.addServiceListener(this);
+            }
+            if (mEventManager == null
+                    || mAssistant == null
+                    || mDialogHandler == null
+                    || mBluetoothDeviceUpdater == null) {
+                Log.d(TAG, "Skip onStart(), profile is not ready.");
+                return;
+            }
+            Log.d(TAG, "onStart() Register callbacks.");
+            mEventManager.registerCallback(this);
+            mAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
+            mDialogHandler.registerCallbacks(mExecutor);
+            mBluetoothDeviceUpdater.registerCallback();
+            mBluetoothDeviceUpdater.refreshPreference();
+            mIsAudioModeOngoingCall.set(isAudioModeOngoingCall(mContext));
+            updateTitle();
+        });
     }
 
     @Override
     public void onStop(@NonNull LifecycleOwner owner) {
-        if (!isAvailable()) {
-            Log.d(TAG, "Skip onStop(), feature is not supported.");
-            return;
-        }
-        if (mProfileManager != null) {
-            mProfileManager.removeServiceListener(this);
-        }
-        if (mEventManager == null
-                || mAssistant == null
-                || mDialogHandler == null
-                || mBluetoothDeviceUpdater == null) {
-            Log.d(TAG, "Skip onStop(), profile is not ready.");
-            return;
-        }
-        Log.d(TAG, "onStop() Unregister callbacks.");
-        mEventManager.unregisterCallback(this);
-        mAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
-        mDialogHandler.unregisterCallbacks();
-        mBluetoothDeviceUpdater.unregisterCallback();
+        var unused = ThreadUtils.postOnBackgroundThread(() -> {
+            if (!isAvailable()) {
+                Log.d(TAG, "Skip onStop(), feature is not supported.");
+                return;
+            }
+            if (mProfileManager != null) {
+                mProfileManager.removeServiceListener(this);
+            }
+            if (mEventManager == null
+                    || mAssistant == null
+                    || mDialogHandler == null
+                    || mBluetoothDeviceUpdater == null) {
+                Log.d(TAG, "Skip onStop(), profile is not ready.");
+                return;
+            }
+            Log.d(TAG, "onStop() Unregister callbacks.");
+            mEventManager.unregisterCallback(this);
+            mAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
+            mDialogHandler.unregisterCallbacks();
+            mBluetoothDeviceUpdater.unregisterCallback();
+        });
     }
 
     @Override
@@ -298,7 +306,8 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() && mBluetoothDeviceUpdater != null
+        return (BluetoothUtils.isAudioSharingUIAvailable(mContext)
+                && mBluetoothDeviceUpdater != null)
                 ? AVAILABLE_UNSEARCHABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
@@ -367,6 +376,25 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
         handleOnProfileStateChanged(cachedDevice, bluetoothProfile);
     }
 
+    @Override
+    public void onAudioModeChanged() {
+        mIsAudioModeOngoingCall.set(isAudioModeOngoingCall(mContext));
+        updateTitle();
+    }
+
+    @Override
+    public void onDeviceClick(@NonNull Preference preference) {
+        boolean isCallMode = mIsAudioModeOngoingCall.get();
+        if (isCallMode) {
+            Log.d(TAG, "onDeviceClick, set active in call mode");
+            CachedBluetoothDevice cachedDevice =
+                    ((BluetoothDevicePreference) preference).getBluetoothDevice();
+            AudioSharingUtils.setPrimary(mContext, cachedDevice);
+        }
+        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK,
+                isCallMode);
+    }
+
     /**
      * Initialize the controller.
      *
@@ -499,4 +527,22 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
             mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
         }
     }
+
+    private void updateTitle() {
+        if (mPreferenceGroup == null) return;
+        int titleResId;
+        if (mIsAudioModeOngoingCall.get()) {
+            // in phone call
+            titleResId = R.string.connected_device_call_device_title;
+        } else {
+            // without phone call
+            titleResId = R.string.audio_sharing_device_group_title;
+        }
+        AudioSharingUtils.postOnMainThread(mContext,
+                () -> {
+                    if (mPreferenceGroup != null) {
+                        mPreferenceGroup.setTitle(titleResId);
+                    }
+                });
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java
index 42de10a81b2..be0ee0b8b44 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java
@@ -132,7 +132,12 @@ public class AudioSharingDeviceVolumeGroupController extends AudioSharingBasePre
 
                 @Override
                 public void onSourceAdded(
-                        @NonNull BluetoothDevice sink, int sourceId, int reason) {}
+                        @NonNull BluetoothDevice sink, int sourceId, int reason) {
+                    Log.d(TAG, "onSourceAdded: update volume list.");
+                    if (mBluetoothDeviceUpdater != null) {
+                        mBluetoothDeviceUpdater.forceUpdate();
+                    }
+                }
 
                 @Override
                 public void onSourceAddFailed(
@@ -165,14 +170,7 @@ public class AudioSharingDeviceVolumeGroupController extends AudioSharingBasePre
                 public void onReceiveStateChanged(
                         @NonNull BluetoothDevice sink,
                         int sourceId,
-                        @NonNull BluetoothLeBroadcastReceiveState state) {
-                    if (BluetoothUtils.isConnected(state)) {
-                        Log.d(TAG, "onReceiveStateChanged: synced, update volume list.");
-                        if (mBluetoothDeviceUpdater != null) {
-                            mBluetoothDeviceUpdater.forceUpdate();
-                        }
-                    }
-                }
+                        @NonNull BluetoothLeBroadcastReceiveState state) {}
             };
 
     public AudioSharingDeviceVolumeGroupController(Context context) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
index 1b68eaccbfe..1bf54926d3c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
@@ -31,6 +31,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothPairingDetail;
@@ -83,32 +84,42 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
      * @param eventData   The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        sHost = host;
-        sListener = listener;
-        sEventData = eventData;
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, return.");
-            return;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            sHost = host;
+            sListener = listener;
+            sEventData = eventData;
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, return.");
+                return;
+            }
+            Log.d(TAG, "Show up the dialog.");
+            final Bundle bundle = new Bundle();
+            bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
+            AudioSharingDialogFragment dialogFrag = new AudioSharingDialogFragment();
+            dialogFrag.setArguments(bundle);
+            dialogFrag.show(manager, TAG);
         }
-        Log.d(TAG, "Show up the dialog.");
-        final Bundle bundle = new Bundle();
-        bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
-        AudioSharingDialogFragment dialogFrag = new AudioSharingDialogFragment();
-        dialogFrag.setArguments(bundle);
-        dialogFrag.show(manager, TAG);
     }
 
     /** Return the tag of {@link AudioSharingDialogFragment} dialog. */
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
index 396144ab16c..0c3448729b8 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
@@ -192,7 +192,7 @@ public class AudioSharingDialogHandler {
                     // If this method is called with user triggered, e.g. manual click on the
                     // "Connected devices" page, we need call setActive for the device, since user
                     // intend to switch active device for the call.
-                    cachedDevice.setActive();
+                    AudioSharingUtils.setPrimary(mContext, cachedDevice);
                 }
                 return;
             }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
index 7d9164449aa..b4ce2d1575b 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -79,67 +80,67 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            int newGroupId = BluetoothUtils.getGroupId(newDevice);
-            if (sNewDevice != null && newGroupId == BluetoothUtils.getGroupId(sNewDevice)) {
-                Log.d(
-                        TAG,
-                        String.format(
-                                Locale.US,
-                                "Dialog is showing for the same device group %d, "
-                                        + "update the content.",
-                                newGroupId));
-                sListener = listener;
-                sNewDevice = newDevice;
-                sEventData = eventData;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
                 return;
-            } else {
-                Log.d(
-                        TAG,
-                        String.format(
-                                Locale.US,
-                                "Dialog is showing for new device group %d, "
-                                        + "dismiss current dialog.",
-                                newGroupId));
-                dialog.dismiss();
-                var unused =
-                        ThreadUtils.postOnBackgroundThread(
-                                () ->
-                                        FeatureFactory.getFeatureFactory()
-                                                .getMetricsFeatureProvider()
-                                                .action(
-                                                        dialog.getContext(),
-                                                        SettingsEnums
-                                                        .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
-                                                        SettingsEnums
-                                                        .DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
             }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                int newGroupId = BluetoothUtils.getGroupId(newDevice);
+                if (sNewDevice != null && newGroupId == BluetoothUtils.getGroupId(sNewDevice)) {
+                    Log.d(
+                            TAG,
+                            String.format(
+                                    Locale.US,
+                                    "Dialog is showing for the same device group %d, "
+                                            + "update the content.",
+                                    newGroupId));
+                    sListener = listener;
+                    sNewDevice = newDevice;
+                    sEventData = eventData;
+                    return;
+                } else {
+                    Log.d(
+                            TAG,
+                            String.format(
+                                    Locale.US,
+                                    "Dialog is showing for new device group %d, "
+                                            + "dismiss current dialog.",
+                                    newGroupId));
+                    dialog.dismiss();
+                    logDialogAutoDismiss(dialog);
+                }
+            }
+            sListener = listener;
+            sNewDevice = newDevice;
+            sEventData = eventData;
+            Log.d(TAG, "Show up the dialog.");
+            final Bundle bundle = new Bundle();
+            bundle.putParcelableList(BUNDLE_KEY_DEVICE_TO_DISCONNECT_ITEMS, deviceItems);
+            bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
+            AudioSharingDisconnectDialogFragment dialogFrag =
+                    new AudioSharingDisconnectDialogFragment();
+            dialogFrag.setArguments(bundle);
+            dialogFrag.show(manager, TAG);
         }
-        sListener = listener;
-        sNewDevice = newDevice;
-        sEventData = eventData;
-        Log.d(TAG, "Show up the dialog.");
-        final Bundle bundle = new Bundle();
-        bundle.putParcelableList(BUNDLE_KEY_DEVICE_TO_DISCONNECT_ITEMS, deviceItems);
-        bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
-        AudioSharingDisconnectDialogFragment dialogFrag =
-                new AudioSharingDisconnectDialogFragment();
-        dialogFrag.setArguments(bundle);
-        dialogFrag.show(manager, TAG);
     }
 
     /** Return the tag of {@link AudioSharingDisconnectDialogFragment} dialog. */
@@ -210,4 +211,17 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
                         AudioSharingDeviceAdapter.ActionType.REMOVE));
         return builder.build();
     }
+
+    private static void logDialogAutoDismiss(AlertDialog dialog) {
+        var unused =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> FeatureFactory.getFeatureFactory()
+                                .getMetricsFeatureProvider()
+                                .action(
+                                        dialog.getContext(),
+                                        SettingsEnums
+                                                .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
+                                        SettingsEnums
+                                                .DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java
index 95b9bc36b92..752ea0aad28 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java
@@ -25,7 +25,9 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
+import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 
@@ -44,36 +46,44 @@ public class AudioSharingErrorDialogFragment extends InstrumentedDialogFragment
      * @param host The Fragment this dialog will be hosted.
      */
     public static void show(@Nullable Fragment host) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, return.");
-            return;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, return.");
+                return;
+            }
+            Log.d(TAG, "Show up the error dialog.");
+            AudioSharingErrorDialogFragment dialogFrag = new AudioSharingErrorDialogFragment();
+            dialogFrag.show(manager, TAG);
         }
-        Log.d(TAG, "Show up the error dialog.");
-        AudioSharingErrorDialogFragment dialogFrag = new AudioSharingErrorDialogFragment();
-        dialogFrag.show(manager, TAG);
     }
 
     @Override
     @NonNull
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        // TODO: put strings to res till they are finalized
         AlertDialog dialog =
                 AudioSharingDialogFactory.newBuilder(getActivity())
-                        .setTitle("Couldn't share audio")
-                        .setTitleIcon(com.android.settings.R.drawable.ic_warning_24dp)
+                        .setTitle(R.string.audio_sharing_retry_dialog_title)
+                        .setTitleIcon(R.drawable.ic_warning_24dp)
                         .setIsCustomBodyEnabled(true)
-                        .setCustomMessage("Something went wrong. Please try again.")
-                        .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> {
-                        })
+                        .setCustomMessage(R.string.audio_sharing_retry_dialog_content)
+                        .setPositiveButton(R.string.okay, (d, w) -> {})
                         .build();
         dialog.setCanceledOnTouchOutside(true);
         return dialog;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java
index aceeb94420e..2f34fa1ee4a 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java
@@ -26,7 +26,9 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
+import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 
@@ -60,27 +62,37 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr
      */
     public static void show(@Nullable Fragment host, @NonNull String deviceName,
             @NonNull DialogEventListener listener) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        sListener = listener;
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, return.");
-            return;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            sListener = listener;
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, return.");
+                return;
+            }
+            Log.d(TAG, "Show up the incompatible device dialog.");
+            final Bundle bundle = new Bundle();
+            bundle.putString(BUNDLE_KEY_DEVICE_NAME, deviceName);
+            AudioSharingIncompatibleDialogFragment dialogFrag =
+                    new AudioSharingIncompatibleDialogFragment();
+            dialogFrag.setArguments(bundle);
+            dialogFrag.show(manager, TAG);
         }
-        Log.d(TAG, "Show up the incompatible device dialog.");
-        final Bundle bundle = new Bundle();
-        bundle.putString(BUNDLE_KEY_DEVICE_NAME, deviceName);
-        AudioSharingIncompatibleDialogFragment dialogFrag =
-                new AudioSharingIncompatibleDialogFragment();
-        dialogFrag.setArguments(bundle);
-        dialogFrag.show(manager, TAG);
     }
 
     @Override
@@ -88,15 +100,14 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         Bundle arguments = requireArguments();
         String deviceName = arguments.getString(BUNDLE_KEY_DEVICE_NAME);
-        // TODO: move strings to res once they are finalized
         AlertDialog dialog =
                 AudioSharingDialogFactory.newBuilder(getActivity())
-                        .setTitle("Can't share audio with " + deviceName)
-                        .setTitleIcon(com.android.settings.R.drawable.ic_warning_24dp)
+                        .setTitle(getString(R.string.audio_sharing_incompatible_dialog_title,
+                                deviceName))
+                        .setTitleIcon(R.drawable.ic_warning_24dp)
                         .setIsCustomBodyEnabled(true)
-                        .setCustomMessage(
-                                "Audio sharing only works with headphones that support LE Audio.")
-                        .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> {})
+                        .setCustomMessage(R.string.audio_sharing_incompatible_dialog_content)
+                        .setPositiveButton(R.string.okay, (d, w) -> {})
                         .build();
         dialog.setCanceledOnTouchOutside(true);
         return dialog;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
index ef461ebf1a0..f5f3b2cd8f2 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
@@ -76,34 +77,45 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        sListener = listener;
-        sNewDevice = newDevice;
-        sEventData = eventData;
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, update the content.");
-            updateDialog(deviceItems, newDevice.getName(), dialog);
-        } else {
-            Log.d(TAG, "Show up the dialog.");
-            final Bundle bundle = new Bundle();
-            bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
-            bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
-            final AudioSharingJoinDialogFragment dialogFrag = new AudioSharingJoinDialogFragment();
-            dialogFrag.setArguments(bundle);
-            dialogFrag.show(manager, TAG);
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
+            }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            sListener = listener;
+            sNewDevice = newDevice;
+            sEventData = eventData;
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, update the content.");
+                updateDialog(deviceItems, newDevice.getName(), dialog);
+            } else {
+                Log.d(TAG, "Show up the dialog.");
+                final Bundle bundle = new Bundle();
+                bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
+                bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
+                final AudioSharingJoinDialogFragment dialogFrag =
+                        new AudioSharingJoinDialogFragment();
+                dialogFrag.setArguments(bundle);
+                dialogFrag.show(manager, TAG);
+            }
         }
     }
 
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
index a1a969840d2..c017ecc8779 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
@@ -174,7 +174,8 @@ public class AudioSharingNamePreferenceController extends BasePreferenceControll
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreference.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreference.java
index e3bbfb7c6cb..17dcc7f017f 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreference.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreference.java
@@ -41,6 +41,7 @@ public class AudioSharingPasswordPreference extends ValidatedEditTextPreference
     @Nullable private EditText mEditText;
     @Nullable private CheckBox mCheckBox;
     @Nullable private View mDialogMessage;
+    @Nullable private View mEditTextFormatAlert;
     private boolean mEditable = true;
 
     interface OnDialogEventListener {
@@ -77,6 +78,7 @@ public class AudioSharingPasswordPreference extends ValidatedEditTextPreference
         mEditText = view.findViewById(android.R.id.edit);
         mCheckBox = view.findViewById(R.id.audio_sharing_stream_password_checkbox);
         mDialogMessage = view.findViewById(android.R.id.message);
+        mEditTextFormatAlert = view.findViewById(R.id.edit_alert_message);
 
         if (mEditText == null || mCheckBox == null || mDialogMessage == null) {
             Log.w(TAG, "onBindDialogView() : Invalid layout");
@@ -123,6 +125,14 @@ public class AudioSharingPasswordPreference extends ValidatedEditTextPreference
         mDialogMessage.setVisibility(editable ? GONE : VISIBLE);
     }
 
+    void showEditTextFormatAlert(boolean show) {
+        if (mEditTextFormatAlert == null) {
+            Log.w(TAG, "showEditTextFormatAlert() : Invalid layout");
+            return;
+        }
+        mEditTextFormatAlert.setVisibility(show ? VISIBLE : GONE);
+    }
+
     void setChecked(boolean checked) {
         if (mCheckBox == null) {
             Log.w(TAG, "setChecked() : Invalid layout");
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
index 9a27a93c9f6..3a741e43ea3 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
@@ -113,7 +113,8 @@ public class AudioSharingPasswordPreferenceController extends BasePreferenceCont
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -136,7 +137,11 @@ public class AudioSharingPasswordPreferenceController extends BasePreferenceCont
 
     @Override
     public boolean isTextValid(String value) {
-        return mAudioSharingPasswordValidator.isTextValid(value);
+        boolean isValid = mAudioSharingPasswordValidator.isTextValid(value);
+        if (mPreference != null) {
+            mPreference.showEditTextFormatAlert(!isValid);
+        }
+        return isValid;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
index 59494db6b90..09a3036e073 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
@@ -57,7 +57,7 @@ public class AudioSharingPlaySoundPreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return (mRingtone != null && BluetoothUtils.isAudioSharingEnabled())
+        return (mRingtone != null && BluetoothUtils.isAudioSharingUIAvailable(mContext))
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java
index 3c078efa597..f3effbdf617 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java
@@ -135,7 +135,8 @@ public class AudioSharingPreferenceController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingProgressDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingProgressDialogFragment.java
index 53bfcf8f17c..9d112e6503f 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingProgressDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingProgressDialogFragment.java
@@ -31,6 +31,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -64,49 +65,66 @@ public class AudioSharingProgressDialogFragment extends InstrumentedDialogFragme
      * @param message The content to be shown on the dialog.
      */
     public static void show(@Nullable Fragment host, @NonNull String message) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            if (!sMessage.equals(message)) {
-                Log.d(TAG, "Update dialog message.");
-                TextView messageView = dialog.findViewById(R.id.message);
-                if (messageView != null) {
-                    messageView.setText(message);
-                }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+                return;
             }
-            Log.d(TAG, "Dialog is showing, return.");
-            return;
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                if (!sMessage.equals(message)) {
+                    Log.d(TAG, "Update dialog message.");
+                    TextView messageView = dialog.findViewById(R.id.message);
+                    if (messageView != null) {
+                        messageView.setText(message);
+                    }
+                    sMessage = message;
+                }
+                Log.d(TAG, "Dialog is showing, return.");
+                return;
+            }
+            sMessage = message;
+            Log.d(TAG, "Show up the progress dialog.");
+            Bundle args = new Bundle();
+            args.putString(BUNDLE_KEY_MESSAGE, message);
+            AudioSharingProgressDialogFragment dialogFrag =
+                    new AudioSharingProgressDialogFragment();
+            dialogFrag.setArguments(args);
+            dialogFrag.show(manager, TAG);
         }
-        sMessage = message;
-        Log.d(TAG, "Show up the progress dialog.");
-        Bundle args = new Bundle();
-        args.putString(BUNDLE_KEY_MESSAGE, message);
-        AudioSharingProgressDialogFragment dialogFrag = new AudioSharingProgressDialogFragment();
-        dialogFrag.setArguments(args);
-        dialogFrag.show(manager, TAG);
     }
 
     /** Dismiss the {@link AudioSharingProgressDialogFragment} dialog. */
     public static void dismiss(@Nullable Fragment host) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to dismiss dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to dismiss dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            Log.d(TAG, "Dialog is showing, dismiss.");
-            dialog.dismiss();
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to dismiss dialog: " + e.getMessage());
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                Log.d(TAG, "Dialog is showing, dismiss.");
+                dialog.dismiss();
+            }
         }
     }
 
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
index 371613f461d..740fb359afc 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
@@ -38,7 +38,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 public class AudioSharingReceiver extends BroadcastReceiver {
-    private static final String TAG = "AudioSharingNotification";
+    private static final String TAG = "AudioSharingReceiver";
     private static final String ACTION_LE_AUDIO_SHARING_SETTINGS =
             "com.android.settings.BLUETOOTH_AUDIO_SHARING_SETTINGS";
     private static final String ACTION_LE_AUDIO_SHARING_STOP =
@@ -49,10 +49,6 @@ public class AudioSharingReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
-            Log.w(TAG, "Skip handling received intent, flag is off.");
-            return;
-        }
         String action = intent.getAction();
         if (action == null) {
             Log.w(TAG, "Received unexpected intent with null action.");
@@ -66,13 +62,22 @@ public class AudioSharingReceiver extends BroadcastReceiver {
                         intent.getIntExtra(
                                 LocalBluetoothLeBroadcast.EXTRA_LE_AUDIO_SHARING_STATE, -1);
                 if (state == LocalBluetoothLeBroadcast.BROADCAST_STATE_ON) {
+                    if (!BluetoothUtils.isAudioSharingUIAvailable(context)) {
+                        Log.w(TAG, "Skip showSharingNotification, feature disabled.");
+                        return;
+                    }
                     showSharingNotification(context);
                     metricsFeatureProvider.action(
                             context, SettingsEnums.ACTION_SHOW_AUDIO_SHARING_NOTIFICATION);
                 } else if (state == LocalBluetoothLeBroadcast.BROADCAST_STATE_OFF) {
+                    // TODO: check BluetoothUtils#isAudioSharingEnabled() till BluetoothAdapter#
+                    //       isLeAudioBroadcastSourceSupported() and BluetoothAdapter#
+                    //       isLeAudioBroadcastAssistantSupported() always return FEATURE_SUPPORTED
+                    //       or FEATURE_NOT_SUPPORTED when BT and BLE off
                     cancelSharingNotification(context);
                     metricsFeatureProvider.action(
-                            context, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
+                            context, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                            LocalBluetoothLeBroadcast.ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
                 } else {
                     Log.w(
                             TAG,
@@ -80,16 +85,24 @@ public class AudioSharingReceiver extends BroadcastReceiver {
                 }
                 break;
             case ACTION_LE_AUDIO_SHARING_STOP:
-                LocalBluetoothManager manager = Utils.getLocalBtManager(context);
-                if (BluetoothUtils.isBroadcasting(manager)) {
-                    AudioSharingUtils.stopBroadcasting(manager);
-                    metricsFeatureProvider.action(
-                            context, SettingsEnums.ACTION_STOP_AUDIO_SHARING_FROM_NOTIFICATION);
-                } else {
-                    cancelSharingNotification(context);
-                    metricsFeatureProvider.action(
-                            context, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
+                if (BluetoothUtils.isAudioSharingUIAvailable(context)) {
+                    LocalBluetoothManager manager = Utils.getLocalBtManager(context);
+                    if (BluetoothUtils.isBroadcasting(manager)) {
+                        AudioSharingUtils.stopBroadcasting(manager);
+                        metricsFeatureProvider.action(
+                                context, SettingsEnums.ACTION_STOP_AUDIO_SHARING_FROM_NOTIFICATION);
+                        return;
+                    }
                 }
+                Log.w(TAG, "cancelSharingNotification, feature disabled or not in broadcast.");
+                // TODO: check BluetoothUtils#isAudioSharingEnabled() till BluetoothAdapter#
+                //       isLeAudioBroadcastSourceSupported() and BluetoothAdapter#
+                //       isLeAudioBroadcastAssistantSupported() always return FEATURE_SUPPORTED
+                //       or FEATURE_NOT_SUPPORTED when BT and BLE off
+                cancelSharingNotification(context);
+                metricsFeatureProvider.action(
+                        context, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STOP);
                 break;
             default:
                 Log.w(TAG, "Received unexpected intent " + intent.getAction());
@@ -129,15 +142,15 @@ public class AudioSharingReceiver extends BroadcastReceiver {
                         PendingIntent.FLAG_IMMUTABLE);
         NotificationCompat.Action stopAction =
                 new NotificationCompat.Action.Builder(
-                                0,
-                                context.getString(R.string.audio_sharing_stop_button_label),
-                                stopPendingIntent)
+                        0,
+                        context.getString(R.string.audio_sharing_stop_button_label),
+                        stopPendingIntent)
                         .build();
         NotificationCompat.Action settingsAction =
                 new NotificationCompat.Action.Builder(
-                                0,
-                                context.getString(R.string.audio_sharing_settings_button_label),
-                                settingsPendingIntent)
+                        0,
+                        context.getString(R.string.audio_sharing_settings_button_label),
+                        settingsPendingIntent)
                         .build();
         final Bundle extras = new Bundle();
         extras.putString(
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
index 5b71f5163e9..047f2fcf8d3 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -76,65 +77,66 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
-        final FragmentManager manager;
-        try {
-            manager = host.getChildFragmentManager();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
             return;
         }
-        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
-        if (dialog != null) {
-            int newGroupId = BluetoothUtils.getGroupId(newDevice);
-            if (sCachedDevice != null
-                    && newGroupId == BluetoothUtils.getGroupId(sCachedDevice)) {
-                Log.d(
-                        TAG,
-                        String.format(
-                                Locale.US,
-                                "Dialog is showing for the same device group %d, return.",
-                                newGroupId));
-                sListener = listener;
-                sCachedDevice = newDevice;
-                sEventData = eventData;
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
+            final FragmentManager manager;
+            try {
+                manager = host.getChildFragmentManager();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "Fail to show dialog: " + e.getMessage());
                 return;
-            } else {
-                Log.d(
-                        TAG,
-                        String.format(
-                                Locale.US,
-                                "Dialog is showing for new device group %d, "
-                                        + "dismiss current dialog.",
-                                newGroupId));
-                dialog.dismiss();
-                var unused =
-                        ThreadUtils.postOnBackgroundThread(
-                                () ->
-                                        FeatureFactory.getFeatureFactory()
-                                                .getMetricsFeatureProvider()
-                                                .action(
-                                                        dialog.getContext(),
-                                                        SettingsEnums
-                                                        .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
-                                                        SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
             }
+            Lifecycle.State currentState = host.getLifecycle().getCurrentState();
+            if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                Log.d(TAG, "Fail to show dialog with state: " + currentState);
+                return;
+            }
+            AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
+            if (dialog != null) {
+                int newGroupId = BluetoothUtils.getGroupId(newDevice);
+                if (sCachedDevice != null
+                        && newGroupId == BluetoothUtils.getGroupId(sCachedDevice)) {
+                    Log.d(
+                            TAG,
+                            String.format(
+                                    Locale.US,
+                                    "Dialog is showing for the same device group %d, return.",
+                                    newGroupId));
+                    sListener = listener;
+                    sCachedDevice = newDevice;
+                    sEventData = eventData;
+                    return;
+                } else {
+                    Log.d(
+                            TAG,
+                            String.format(
+                                    Locale.US,
+                                    "Dialog is showing for new device group %d, "
+                                            + "dismiss current dialog.",
+                                    newGroupId));
+                    dialog.dismiss();
+                    logDialogAutoDismiss(dialog);
+                }
+            }
+            sListener = listener;
+            sCachedDevice = newDevice;
+            sEventData = eventData;
+            Log.d(TAG, "Show up the dialog.");
+            final Bundle bundle = new Bundle();
+            bundle.putParcelableList(BUNDLE_KEY_DEVICE_TO_DISCONNECT_ITEMS, deviceItems);
+            bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
+            AudioSharingStopDialogFragment dialogFrag = new AudioSharingStopDialogFragment();
+            dialogFrag.setArguments(bundle);
+            dialogFrag.show(manager, TAG);
         }
-        sListener = listener;
-        sCachedDevice = newDevice;
-        sEventData = eventData;
-        Log.d(TAG, "Show up the dialog.");
-        final Bundle bundle = new Bundle();
-        bundle.putParcelableList(BUNDLE_KEY_DEVICE_TO_DISCONNECT_ITEMS, deviceItems);
-        bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
-        AudioSharingStopDialogFragment dialogFrag = new AudioSharingStopDialogFragment();
-        dialogFrag.setArguments(bundle);
-        dialogFrag.show(manager, TAG);
     }
 
     /** Return the tag of {@link AudioSharingStopDialogFragment} dialog. */
@@ -215,4 +217,16 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
         AudioSharingDialogHelper.updateMessageStyle(dialog);
         return dialog;
     }
+
+    private static void logDialogAutoDismiss(AlertDialog dialog) {
+        var unused =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> FeatureFactory.getFeatureFactory()
+                                .getMetricsFeatureProvider()
+                                .action(
+                                        dialog.getContext(),
+                                        SettingsEnums
+                                                .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
+                                        SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
index ebc8cecadbf..7ca3256b849 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
@@ -177,6 +177,19 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                                     + broadcastId
                                     + ", metadata = "
                                     + metadata.getBroadcastName());
+                    if (mAssistant == null
+                            || mAssistant.getAllConnectedDevices().stream()
+                                    .anyMatch(
+                                            device -> BluetoothUtils
+                                                    .hasActiveLocalBroadcastSourceForBtDevice(
+                                                            device, mBtManager))) {
+                        Log.d(
+                                TAG,
+                                "Skip handleOnBroadcastReady: null assistant or "
+                                        + "sink has active local source.");
+                        return;
+                    }
+                    handleOnBroadcastReady();
                 }
 
                 @Override
@@ -221,20 +234,6 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                                     + reason
                                     + ", broadcastId = "
                                     + broadcastId);
-                    if (mAssistant == null
-                            || mAssistant.getAllConnectedDevices().stream()
-                                    .anyMatch(
-                                            device -> BluetoothUtils
-                                                    .hasActiveLocalBroadcastSourceForBtDevice(
-                                                            device, mBtManager))) {
-                        Log.d(
-                                TAG,
-                                "Skip handleOnBroadcastReady: null assistant or "
-                                        + "sink has active local source.");
-                        cleanUpStatesForStartSharing();
-                        return;
-                    }
-                    handleOnBroadcastReady();
                 }
 
                 @Override
@@ -261,7 +260,30 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
 
                 @Override
                 public void onSourceAdded(
-                        @NonNull BluetoothDevice sink, int sourceId, int reason) {}
+                        @NonNull BluetoothDevice sink, int sourceId, int reason) {
+                    if (mSinksInAdding.contains(sink)) {
+                        mSinksInAdding.remove(sink);
+                    }
+                    dismissProgressDialogIfNeeded();
+                    Log.d(TAG, "onSourceAdded(), sink = " + sink + ", remaining sinks = "
+                            + mSinksInAdding);
+                    if (mSinksToWaitFor.contains(sink)) {
+                        mSinksToWaitFor.remove(sink);
+                        if (mSinksToWaitFor.isEmpty()) {
+                            // To avoid users advance to share then pair flow before the
+                            // primary/active sinks successfully join the audio sharing,
+                            // popup dialog till adding source complete for mSinksToWaitFor.
+                            Pair<Integer, Object>[] eventData =
+                                    AudioSharingUtils.buildAudioSharingDialogEventData(
+                                            SettingsEnums.AUDIO_SHARING_SETTINGS,
+                                            SettingsEnums.DIALOG_AUDIO_SHARING_ADD_DEVICE,
+                                            /* userTriggered= */ false,
+                                            /* deviceCountInSharing= */ 1,
+                                            /* candidateDeviceCount= */ 0);
+                            showAudioSharingDialog(eventData);
+                        }
+                    }
+                }
 
                 @Override
                 public void onSourceAddFailed(
@@ -307,34 +329,9 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                         @NonNull BluetoothDevice sink,
                         int sourceId,
                         @NonNull BluetoothLeBroadcastReceiveState state) {
-                    if (mStoppingSharing.get()) {
-                        Log.d(TAG, "Skip onReceiveStateChanged, stopping broadcast");
-                        return;
-                    }
-                    if (BluetoothUtils.isConnected(state)) {
-                        if (mSinksInAdding.contains(sink)) {
-                            mSinksInAdding.remove(sink);
-                        }
-                        dismissProgressDialogIfNeeded();
-                        Log.d(TAG, "onReceiveStateChanged() connected, sink = " + sink
-                                + ", remaining sinks = " + mSinksInAdding);
-                        if (mSinksToWaitFor.contains(sink)) {
-                            mSinksToWaitFor.remove(sink);
-                            if (mSinksToWaitFor.isEmpty()) {
-                                // To avoid users advance to share then pair flow before the
-                                // primary/active sinks successfully join the audio sharing,
-                                // popup dialog till adding source complete for mSinksToWaitFor.
-                                Pair<Integer, Object>[] eventData =
-                                        AudioSharingUtils.buildAudioSharingDialogEventData(
-                                                SettingsEnums.AUDIO_SHARING_SETTINGS,
-                                                SettingsEnums.DIALOG_AUDIO_SHARING_ADD_DEVICE,
-                                                /* userTriggered= */ false,
-                                                /* deviceCountInSharing= */ 1,
-                                                /* candidateDeviceCount= */ 0);
-                                showAudioSharingDialog(eventData);
-                            }
-                        }
-                    }
+                    Log.d(TAG,
+                            "onReceiveStateChanged(), sink = " + sink + ", sourceId = " + sourceId
+                                    + ", state = " + state);
                 }
             };
 
@@ -426,9 +423,7 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                         () -> {
                             mSwitchBar.setEnabled(true);
                             mSwitchBar.setChecked(false);
-                            if (mFragment != null) {
-                                AudioSharingConfirmDialogFragment.show(mFragment);
-                            }
+                            AudioSharingConfirmDialogFragment.show(mFragment);
                         });
                 return;
             }
@@ -447,7 +442,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -571,10 +567,10 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
         if (mBroadcast != null) {
             mBroadcast.startPrivateBroadcast();
             mSinksInAdding.clear();
-            // TODO: use string res once finalized.
             AudioSharingUtils.postOnMainThread(mContext,
                     () -> AudioSharingProgressDialogFragment.show(mFragment,
-                            "Starting audio stream..."));
+                            mContext.getString(
+                                    R.string.audio_sharing_progress_dialog_start_stream_content)));
             mMetricsFeatureProvider.action(
                     mContext,
                     SettingsEnums.ACTION_AUDIO_SHARING_MAIN_SWITCH_ON,
@@ -733,13 +729,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                 };
         AudioSharingUtils.postOnMainThread(
                 mContext,
-                () -> {
-                    // Check nullability to pass NullAway check
-                    if (mFragment != null) {
-                        AudioSharingDialogFragment.show(
-                                mFragment, mDeviceItemsForSharing, listener, eventData);
-                    }
-                });
+                () -> AudioSharingDialogFragment.show(
+                        mFragment, mDeviceItemsForSharing, listener, eventData));
     }
 
     private void showErrorDialog() {
@@ -767,7 +758,7 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                     && !(fragment instanceof AudioSharingErrorDialogFragment)
                     && ((DialogFragment) fragment).getDialog() != null) {
                 Log.d(TAG, "Remove stale dialog = " + fragment.getTag());
-                ((DialogFragment) fragment).dismiss();
+                ((DialogFragment) fragment).dismissAllowingStateLoss();
             }
         }
     }
@@ -830,8 +821,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
     private void addSourceToTargetSinks(List<BluetoothDevice> targetActiveSinks,
             @NonNull String sinkName) {
         mSinksInAdding.addAll(targetActiveSinks);
-        // TODO: move to res once finalized
-        String progressMessage = "Sharing with " + sinkName + "...";
+        String progressMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_add_source_content, sinkName);
         showProgressDialog(progressMessage);
         AudioSharingUtils.addSourceToTargetSinks(targetActiveSinks, mBtManager);
     }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
index a662809fb78..5a15b6ae51c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
@@ -21,6 +21,7 @@ import static com.android.settings.connecteddevice.audiosharing.AudioSharingUtil
 import static com.android.settings.connecteddevice.audiosharing.AudioSharingUtils.MetricKey.METRIC_KEY_PAGE_ID;
 import static com.android.settings.connecteddevice.audiosharing.AudioSharingUtils.MetricKey.METRIC_KEY_SOURCE_PAGE_ID;
 import static com.android.settings.connecteddevice.audiosharing.AudioSharingUtils.MetricKey.METRIC_KEY_USER_TRIGGERED;
+import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID;
 
 import static java.util.stream.Collectors.toList;
 
@@ -28,6 +29,7 @@ import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
 import android.content.Context;
+import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.widget.Toast;
@@ -219,8 +221,8 @@ public class AudioSharingUtils {
             Log.d(TAG, "hasActiveConnectedLeadDevice return false due to null device manager.");
             return false;
         }
-        return deviceManager.getCachedDevicesCopy().stream().anyMatch(
-                BluetoothUtils::isActiveMediaDevice);
+        return deviceManager.getCachedDevicesCopy().stream()
+                .anyMatch(BluetoothUtils::isActiveMediaDevice);
     }
 
     /** Build {@link AudioSharingDeviceItem} from {@link CachedBluetoothDevice}. */
@@ -344,6 +346,28 @@ public class AudioSharingUtils {
         return vc != null && vc.isProfileReady();
     }
 
+    /** Set {@link CachedBluetoothDevice} as primary device for call audio */
+    public static void setPrimary(
+            @NonNull Context context, @Nullable CachedBluetoothDevice cachedDevice) {
+        if (cachedDevice == null) return;
+        cachedDevice.setActive();
+        if (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(context)) {
+            int groupId = BluetoothUtils.getGroupId(cachedDevice);
+            // TODO: use real key name in SettingsProvider
+            int userPreferredId =
+                    Settings.Secure.getInt(
+                            context.getContentResolver(),
+                            BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                            BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+            if (groupId != userPreferredId) {
+                Settings.Secure.putInt(
+                        context.getContentResolver(),
+                        BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                        groupId);
+            }
+        }
+    }
+
     /**
      * Build audio sharing dialog log event data
      *
diff --git a/src/com/android/settings/connecteddevice/audiosharing/StreamSettingsCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/StreamSettingsCategoryController.java
index 40f86d0d81b..0ee71cb0a5e 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/StreamSettingsCategoryController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/StreamSettingsCategoryController.java
@@ -91,7 +91,8 @@ public class StreamSettingsCategoryController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
index 48acf3256d0..f9cce4ce099 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
-import static com.android.settingslib.flags.Flags.audioSharingHysteresisModeFix;
-
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastAssistant;
@@ -38,6 +36,7 @@ import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.utils.ThreadUtils;
@@ -77,7 +76,7 @@ public class AudioStreamButtonController extends BasePreferenceController
                         BluetoothLeBroadcastReceiveState state) {
                     super.onReceiveStateChanged(sink, sourceId, state);
                     boolean shouldUpdateButton =
-                            audioSharingHysteresisModeFix()
+                            BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(mContext)
                                     ? AudioStreamsHelper.hasSourcePresent(state)
                                     : AudioStreamsHelper.isConnected(state);
                     if (shouldUpdateButton) {
@@ -157,7 +156,7 @@ public class AudioStreamButtonController extends BasePreferenceController
         }
 
         List<BluetoothLeBroadcastReceiveState> sources =
-                audioSharingHysteresisModeFix()
+                BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(mContext)
                         ? mAudioStreamsHelper.getAllPresentSources()
                         : mAudioStreamsHelper.getAllConnectedSources();
         boolean isConnected =
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
index 958740b5afe..df9c26eec01 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
@@ -214,15 +214,16 @@ public class AudioStreamConfirmDialog extends InstrumentedDialogFragment {
     }
 
     private int getDialogId(boolean hasMetadata, boolean hasConnectedDevice) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
+            if (!hasConnectedDevice) {
+                return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_NO_LE_DEVICE;
+            }
+            return hasMetadata
+                    ? SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_LISTEN
+                    : SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_DATA_ERROR;
+        } else {
             return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_FEATURE_UNSUPPORTED;
         }
-        if (!hasConnectedDevice) {
-            return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_NO_LE_DEVICE;
-        }
-        return hasMetadata
-                ? SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_LISTEN
-                : SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_DATA_ERROR;
     }
 
     @Nullable
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java
index 3437524d995..902501a60e8 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java
@@ -50,7 +50,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     protected void createUiFromIntent(@Nullable Bundle savedState, Intent intent) {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             Log.d(TAG, "createUiFromIntent() : supported but not ready, skip createUiFromIntent");
             mSavedState = savedState;
@@ -67,7 +67,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     public void onStart() {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             Log.d(TAG, "onStart() : supported but not ready, listen to service ready");
             if (mProfileManager != null) {
@@ -87,7 +87,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     public void onServiceConnected() {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             if (mProfileManager != null) {
                 mProfileManager.removeServiceListener(this);
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
index 0ee93e7742e..88efff2b6ab 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
@@ -37,6 +37,7 @@ import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.LayoutPreference;
@@ -86,7 +87,7 @@ public class AudioStreamHeaderController extends BasePreferenceController
                         updateSummary();
                         mAudioStreamsHelper.startMediaService(
                                 mContext, mBroadcastId, mBroadcastName);
-                    } else if (audioSharingHysteresisModeFix()
+                    } else if (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(mContext)
                             && AudioStreamsHelper.hasSourcePresent(state)) {
                         // if source present but not connected, only update the summary
                         updateSummary();
@@ -171,13 +172,13 @@ public class AudioStreamHeaderController extends BasePreferenceController
                                                             : mContext.getString(
                                                                     AUDIO_STREAM_HEADER_PRESENT_NOW_SUMMARY))
                                             : mAudioStreamsHelper.getAllConnectedSources().stream()
-                                                    .map(
-                                                            BluetoothLeBroadcastReceiveState
-                                                                    ::getBroadcastId)
-                                                    .anyMatch(
-                                                            connectedBroadcastId ->
-                                                                    connectedBroadcastId
-                                                                            == mBroadcastId)
+                                                            .map(
+                                                                    BluetoothLeBroadcastReceiveState
+                                                                            ::getBroadcastId)
+                                                            .anyMatch(
+                                                                    connectedBroadcastId ->
+                                                                            connectedBroadcastId
+                                                                                    == mBroadcastId)
                                                     ? mContext.getString(
                                                             AUDIO_STREAM_HEADER_LISTENING_NOW_SUMMARY)
                                                     : AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
index d5be2bb63fc..5d26352674f 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
@@ -106,7 +106,7 @@ public class AudioStreamMediaService extends Service {
     // If the initial volume from `onDeviceVolumeChanged` is larger than zero (not muted), we will
     // override this value. Otherwise, we raise the volume to 25 when the play button is clicked.
     private final AtomicInteger mLatestPositiveVolume = new AtomicInteger(25);
-    private final AtomicBoolean mHasStopped = new AtomicBoolean(false);
+    private final Object mLocalSessionLock = new Object();
     private int mBroadcastId;
     @Nullable private List<BluetoothDevice> mDevices;
     @Nullable private LocalBluetoothManager mLocalBtManager;
@@ -122,10 +122,10 @@ public class AudioStreamMediaService extends Service {
 
     @Override
     public void onCreate() {
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (!BluetoothUtils.isAudioSharingUIAvailable(this)) {
             return;
         }
-
+        Log.d(TAG, "onCreate()");
         super.onCreate();
         mLocalBtManager = Utils.getLocalBtManager(this);
         if (mLocalBtManager == null) {
@@ -146,47 +146,66 @@ public class AudioStreamMediaService extends Service {
             return;
         }
 
-        if (mNotificationManager.getNotificationChannel(CHANNEL_ID) == null) {
-            NotificationChannel notificationChannel =
-                    new NotificationChannel(
-                            CHANNEL_ID,
-                            getString(com.android.settings.R.string.bluetooth),
-                            NotificationManager.IMPORTANCE_HIGH);
-            mNotificationManager.createNotificationChannel(notificationChannel);
-        }
+        mExecutor.execute(
+                () -> {
+                    if (mLocalBtManager == null
+                            || mLeBroadcastAssistant == null
+                            || mNotificationManager == null) {
+                        return;
+                    }
+                    if (mNotificationManager.getNotificationChannel(CHANNEL_ID) == null) {
+                        NotificationChannel notificationChannel =
+                                new NotificationChannel(
+                                        CHANNEL_ID,
+                                        getString(com.android.settings.R.string.bluetooth),
+                                        NotificationManager.IMPORTANCE_HIGH);
+                        mNotificationManager.createNotificationChannel(notificationChannel);
+                    }
 
-        mBluetoothCallback = new BtCallback();
-        mLocalBtManager.getEventManager().registerCallback(mBluetoothCallback);
+                    mBluetoothCallback = new BtCallback();
+                    mLocalBtManager.getEventManager().registerCallback(mBluetoothCallback);
 
-        mVolumeControl = mLocalBtManager.getProfileManager().getVolumeControlProfile();
-        if (mVolumeControl != null) {
-            mVolumeControlCallback = new VolumeControlCallback();
-            mVolumeControl.registerCallback(mExecutor, mVolumeControlCallback);
-        }
+                    mVolumeControl = mLocalBtManager.getProfileManager().getVolumeControlProfile();
+                    if (mVolumeControl != null) {
+                        mVolumeControlCallback = new VolumeControlCallback();
+                        mVolumeControl.registerCallback(mExecutor, mVolumeControlCallback);
+                    }
 
-        mBroadcastAssistantCallback = new AssistantCallback();
-        mLeBroadcastAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
+                    mBroadcastAssistantCallback = new AssistantCallback();
+                    mLeBroadcastAssistant.registerServiceCallBack(
+                            mExecutor, mBroadcastAssistantCallback);
+                });
     }
 
     @Override
     public void onDestroy() {
         Log.d(TAG, "onDestroy()");
         super.onDestroy();
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
-            return;
-        }
-        if (mLocalBtManager != null) {
-            mLocalBtManager.getEventManager().unregisterCallback(mBluetoothCallback);
-        }
-        if (mLeBroadcastAssistant != null && mBroadcastAssistantCallback != null) {
-            mLeBroadcastAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
-        }
-        if (mVolumeControl != null && mVolumeControlCallback != null) {
-            mVolumeControl.unregisterCallback(mVolumeControlCallback);
-        }
-        if (mLocalSession != null) {
-            mLocalSession.release();
-            mLocalSession = null;
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)) {
+            if (mDevices != null) {
+                mDevices.clear();
+                mDevices = null;
+            }
+            synchronized (mLocalSessionLock) {
+                if (mLocalSession != null) {
+                    mLocalSession.release();
+                    mLocalSession = null;
+                }
+            }
+            mExecutor.execute(
+                    () -> {
+                        if (mLocalBtManager != null) {
+                            mLocalBtManager.getEventManager().unregisterCallback(
+                                    mBluetoothCallback);
+                        }
+                        if (mLeBroadcastAssistant != null && mBroadcastAssistantCallback != null) {
+                            mLeBroadcastAssistant.unregisterServiceCallBack(
+                                    mBroadcastAssistantCallback);
+                        }
+                        if (mVolumeControl != null && mVolumeControlCallback != null) {
+                            mVolumeControl.unregisterCallback(mVolumeControlCallback);
+                        }
+                    });
         }
     }
 
@@ -195,43 +214,45 @@ public class AudioStreamMediaService extends Service {
         Log.d(TAG, "onStartCommand()");
         if (intent == null) {
             Log.w(TAG, "Intent is null. Service will not start.");
-            mHasStopped.set(true);
             stopSelf();
             return START_NOT_STICKY;
         }
         mBroadcastId = intent.getIntExtra(BROADCAST_ID, -1);
         if (mBroadcastId == -1) {
             Log.w(TAG, "Invalid broadcast ID. Service will not start.");
-            mHasStopped.set(true);
             stopSelf();
             return START_NOT_STICKY;
         }
         var extra = intent.getParcelableArrayListExtra(DEVICES, BluetoothDevice.class);
         if (extra == null || extra.isEmpty()) {
             Log.w(TAG, "No device. Service will not start.");
-            mHasStopped.set(true);
             stopSelf();
             return START_NOT_STICKY;
         }
         mDevices = Collections.synchronizedList(extra);
-        createLocalMediaSession(intent.getStringExtra(BROADCAST_TITLE));
-        startForeground(NOTIFICATION_ID, buildNotification());
-        // Reset in case the service is previously stopped but not yet destroyed.
-        mHasStopped.set(false);
+        MediaSession.Token token =
+                getOrCreateLocalMediaSession(intent.getStringExtra(BROADCAST_TITLE));
+        startForeground(NOTIFICATION_ID, buildNotification(token));
         return START_NOT_STICKY;
     }
 
-    private void createLocalMediaSession(String title) {
-        mLocalSession = new MediaSession(this, TAG);
-        mLocalSession.setMetadata(
-                new MediaMetadata.Builder()
-                        .putString(MediaMetadata.METADATA_KEY_TITLE, title)
-                        .putLong(MediaMetadata.METADATA_KEY_DURATION, STATIC_PLAYBACK_DURATION)
-                        .build());
-        mLocalSession.setActive(true);
-        mLocalSession.setPlaybackState(getPlaybackState());
-        mMediaSessionCallback = new MediaSessionCallback();
-        mLocalSession.setCallback(mMediaSessionCallback);
+    private MediaSession.Token getOrCreateLocalMediaSession(String title) {
+        synchronized (mLocalSessionLock) {
+            if (mLocalSession != null) {
+                return mLocalSession.getSessionToken();
+            }
+            mLocalSession = new MediaSession(this, TAG);
+            mLocalSession.setMetadata(
+                    new MediaMetadata.Builder()
+                            .putString(MediaMetadata.METADATA_KEY_TITLE, title)
+                            .putLong(MediaMetadata.METADATA_KEY_DURATION, STATIC_PLAYBACK_DURATION)
+                            .build());
+            mLocalSession.setActive(true);
+            mLocalSession.setPlaybackState(getPlaybackState());
+            mMediaSessionCallback = new MediaSessionCallback();
+            mLocalSession.setCallback(mMediaSessionCallback);
+            return mLocalSession.getSessionToken();
+        }
     }
 
     private PlaybackState getPlaybackState() {
@@ -252,12 +273,9 @@ public class AudioStreamMediaService extends Service {
         return device != null ? device.getName() : DEFAULT_DEVICE_NAME;
     }
 
-    private Notification buildNotification() {
+    private Notification buildNotification(MediaSession.Token token) {
         String deviceName = getDeviceName();
-        Notification.MediaStyle mediaStyle =
-                new Notification.MediaStyle()
-                        .setMediaSession(
-                                mLocalSession != null ? mLocalSession.getSessionToken() : null);
+        Notification.MediaStyle mediaStyle = new Notification.MediaStyle().setMediaSession(token);
         if (deviceName != null && !deviceName.isEmpty()) {
             mediaStyle.setRemotePlaybackInfo(
                     deviceName, com.android.settingslib.R.drawable.ic_bt_le_audio, null);
@@ -291,20 +309,15 @@ public class AudioStreamMediaService extends Service {
         }
 
         private void handleRemoveSource() {
-            var unused =
-                    ThreadUtils.postOnBackgroundThread(
-                            () -> {
-                                List<BluetoothLeBroadcastReceiveState> connected =
-                                        mAudioStreamsHelper == null
-                                                ? emptyList()
-                                                : mAudioStreamsHelper.getAllConnectedSources();
-                                if (connected.stream()
-                                        .map(BluetoothLeBroadcastReceiveState::getBroadcastId)
-                                        .noneMatch(id -> id == mBroadcastId)) {
-                                    mHasStopped.set(true);
-                                    stopSelf();
-                                }
-                            });
+            List<BluetoothLeBroadcastReceiveState> connected =
+                    mAudioStreamsHelper == null
+                            ? emptyList()
+                            : mAudioStreamsHelper.getAllConnectedSources();
+            if (connected.stream()
+                    .map(BluetoothLeBroadcastReceiveState::getBroadcastId)
+                    .noneMatch(id -> id == mBroadcastId)) {
+                stopSelf();
+            }
         }
     }
 
@@ -326,7 +339,11 @@ public class AudioStreamMediaService extends Service {
                     mIsMuted.set(false);
                     mLatestPositiveVolume.set(volume);
                 }
-                updateNotification(getPlaybackState());
+                synchronized (mLocalSessionLock) {
+                    if (mLocalSession != null) {
+                        mLocalSession.setPlaybackState(getPlaybackState());
+                    }
+                }
             }
         }
     }
@@ -336,7 +353,6 @@ public class AudioStreamMediaService extends Service {
         public void onBluetoothStateChanged(int bluetoothState) {
             if (BluetoothAdapter.STATE_OFF == bluetoothState) {
                 Log.d(TAG, "onBluetoothStateChanged() : stopSelf");
-                mHasStopped.set(true);
                 stopSelf();
             }
         }
@@ -362,7 +378,6 @@ public class AudioStreamMediaService extends Service {
             }
             if (mDevices == null || mDevices.isEmpty()) {
                 Log.d(TAG, "onProfileConnectionStateChanged() : stopSelf");
-                mHasStopped.set(true);
                 stopSelf();
             }
         }
@@ -371,7 +386,11 @@ public class AudioStreamMediaService extends Service {
     private class MediaSessionCallback extends MediaSession.Callback {
         public void onSeekTo(long pos) {
             Log.d(TAG, "onSeekTo: " + pos);
-            updateNotification(getPlaybackState());
+            synchronized (mLocalSessionLock) {
+                if (mLocalSession != null) {
+                    mLocalSession.setPlaybackState(getPlaybackState());
+                }
+            }
         }
 
         @Override
@@ -425,18 +444,4 @@ public class AudioStreamMediaService extends Service {
                             });
         }
     }
-
-    private void updateNotification(PlaybackState playbackState) {
-        var unused =
-                ThreadUtils.postOnBackgroundThread(
-                        () -> {
-                            if (mLocalSession != null) {
-                                mLocalSession.setPlaybackState(playbackState);
-                                if (mNotificationManager != null && !mHasStopped.get()) {
-                                    mNotificationManager.notify(
-                                            NOTIFICATION_ID, buildNotification());
-                                }
-                            }
-                        });
-    }
 }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java
index 458cfab55ff..563af74f57c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java
@@ -18,8 +18,6 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
 import static android.text.Spanned.SPAN_EXCLUSIVE_INCLUSIVE;
 
-import static com.android.settingslib.flags.Flags.audioSharingHysteresisModeFix;
-
 import android.os.Handler;
 import android.os.Looper;
 import android.text.SpannableString;
@@ -98,7 +96,8 @@ class AudioStreamStateHandler {
                             newState
                                             == AudioStreamsProgressCategoryController
                                                     .AudioStreamState.SOURCE_ADDED
-                                    || (audioSharingHysteresisModeFix()
+                                    || (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(
+                                                    preference.getContext())
                                             && newState
                                                     == AudioStreamsProgressCategoryController
                                                             .AudioStreamState.SOURCE_PRESENT));
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
index 0107c6ee49b..f45b63c76f5 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
@@ -31,7 +31,6 @@ import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.flags.Flags;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -80,13 +79,6 @@ public class AudioStreamsCategoryController extends AudioSharingBasePreferenceCo
         }
     }
 
-    @Override
-    public int getAvailabilityStatus() {
-        return Flags.enableLeAudioQrCodePrivateBroadcastSharing()
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
-    }
-
     @Override
     public void updateVisibility() {
         if (mPreference == null) return;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
index c0d91626d78..25a9135701b 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
@@ -19,7 +19,6 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams;
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.BROADCAST_ID;
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.BROADCAST_TITLE;
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.DEVICES;
-import static com.android.settingslib.flags.Flags.audioSharingHysteresisModeFix;
 
 import static java.util.Collections.emptyList;
 
@@ -139,7 +138,6 @@ public class AudioStreamsHelper {
     }
 
     /** Retrieves a list of all LE broadcast receive states from active sinks. */
-    @VisibleForTesting
     public List<BluetoothLeBroadcastReceiveState> getAllConnectedSources() {
         if (mLeBroadcastAssistant == null) {
             Log.w(TAG, "getAllSources(): LeBroadcastAssistant is null!");
@@ -165,7 +163,6 @@ public class AudioStreamsHelper {
     }
 
     /** Retrieves LocalBluetoothLeBroadcastAssistant. */
-    @VisibleForTesting
     @Nullable
     public LocalBluetoothLeBroadcastAssistant getLeBroadcastAssistant() {
         return mLeBroadcastAssistant;
@@ -273,7 +270,8 @@ public class AudioStreamsHelper {
         List<BluetoothLeBroadcastReceiveState> sourceList =
                 assistant.getAllSources(cachedDevice.getDevice());
         if (!sourceList.isEmpty()
-                && (audioSharingHysteresisModeFix()
+                && (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(
+                                localBtManager.getContext())
                         || sourceList.stream().anyMatch(AudioStreamsHelper::isConnected))) {
             Log.d(
                     TAG,
@@ -286,7 +284,8 @@ public class AudioStreamsHelper {
             List<BluetoothLeBroadcastReceiveState> list =
                     assistant.getAllSources(device.getDevice());
             if (!list.isEmpty()
-                    && (audioSharingHysteresisModeFix()
+                    && (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(
+                                    localBtManager.getContext())
                             || list.stream().anyMatch(AudioStreamsHelper::isConnected))) {
                 Log.d(
                         TAG,
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
index b379d4e7314..f0034316372 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
@@ -16,19 +16,24 @@
 
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
-import static com.android.settingslib.flags.Flags.audioSharingHysteresisModeFix;
 
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.content.Context;
+
+import com.android.settingslib.bluetooth.BluetoothUtils;
 
 public class AudioStreamsProgressCategoryCallback extends AudioStreamsBroadcastAssistantCallback {
     private static final String TAG = "AudioStreamsProgressCategoryCallback";
 
+    private final Context mContext;
     private final AudioStreamsProgressCategoryController mCategoryController;
 
     public AudioStreamsProgressCategoryCallback(
+            Context context,
             AudioStreamsProgressCategoryController audioStreamsProgressCategoryController) {
+        mContext = context;
         mCategoryController = audioStreamsProgressCategoryController;
     }
 
@@ -41,7 +46,8 @@ public class AudioStreamsProgressCategoryCallback extends AudioStreamsBroadcastA
             mCategoryController.handleSourceConnected(state);
         } else if (AudioStreamsHelper.isBadCode(state)) {
             mCategoryController.handleSourceConnectBadCode(state);
-        } else if (audioSharingHysteresisModeFix() && AudioStreamsHelper.hasSourcePresent(state)) {
+        } else if (BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(mContext)
+                && AudioStreamsHelper.hasSourcePresent(state)) {
             // Keep this check as the last, source might also present in above states
             mCategoryController.handleSourcePresent(state);
         }
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
index 7ab588260d0..f0a0c5b8f7f 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
-import static com.android.settingslib.flags.Flags.audioSharingHysteresisModeFix;
-
 import static java.util.Collections.emptyList;
 
 import android.app.AlertDialog;
@@ -101,7 +99,7 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
                                     (p.getAudioStreamState()
                                                     == AudioStreamsProgressCategoryController
                                                             .AudioStreamState.SOURCE_ADDED
-                                            || (audioSharingHysteresisModeFix()
+                                            || (isAudioSharingHysteresisModeFixAvailable(mContext)
                                                     && p.getAudioStreamState()
                                                             == AudioStreamsProgressCategoryController
                                                                     .AudioStreamState
@@ -147,7 +145,7 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
         mAudioStreamsHelper = new AudioStreamsHelper(mBluetoothManager);
         mMediaControlHelper = new MediaControlHelper(mContext, mBluetoothManager);
         mLeBroadcastAssistant = mAudioStreamsHelper.getLeBroadcastAssistant();
-        mBroadcastAssistantCallback = new AudioStreamsProgressCategoryCallback(this);
+        mBroadcastAssistantCallback = new AudioStreamsProgressCategoryCallback(context, this);
     }
 
     @Override
@@ -258,7 +256,7 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
                         // change it's state.
                         existingPreference.setAudioStreamMetadata(source);
                         if (fromState != AudioStreamState.SOURCE_ADDED
-                                && (!audioSharingHysteresisModeFix()
+                                && (!isAudioSharingHysteresisModeFixAvailable(mContext)
                                         || fromState != AudioStreamState.SOURCE_PRESENT)) {
                             Log.w(
                                     TAG,
@@ -364,7 +362,7 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
             // not, means the source is removed from the sink, we move back the preference to SYNCED
             // state.
             if ((preference.getAudioStreamState() == AudioStreamState.SOURCE_ADDED
-                            || (audioSharingHysteresisModeFix()
+                            || (isAudioSharingHysteresisModeFixAvailable(mContext)
                                     && preference.getAudioStreamState()
                                             == AudioStreamState.SOURCE_PRESENT))
                     && mAudioStreamsHelper.getAllConnectedSources().stream()
@@ -600,7 +598,7 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
                     // Handle QR code scan, display currently connected streams then start scanning
                     // sequentially
                     handleSourceFromQrCodeIfExists();
-                    if (audioSharingHysteresisModeFix()) {
+                    if (isAudioSharingHysteresisModeFixAvailable(mContext)) {
                         // With hysteresis mode, we prioritize showing connected sources first.
                         // If no connected sources are found, we then show present sources.
                         List<BluetoothLeBroadcastReceiveState> sources =
@@ -702,4 +700,8 @@ public class AudioStreamsProgressCategoryController extends BasePreferenceContro
                             dialog.dismiss();
                         });
     }
+
+    private static boolean isAudioSharingHysteresisModeFixAvailable(Context context) {
+        return BluetoothUtils.isAudioSharingHysteresisModeFixAvailable(context);
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/display/DisplayTopology.kt b/src/com/android/settings/connecteddevice/display/DisplayTopology.kt
new file mode 100644
index 00000000000..162d9d284fb
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/DisplayTopology.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.display
+
+import com.android.settings.R
+
+import android.content.Context
+import android.graphics.Point
+import android.graphics.PointF
+import android.graphics.RectF
+
+import androidx.preference.Preference
+
+import java.util.Locale
+
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Contains the parameters needed for transforming global display coordinates to and from topology
+ * pane coordinates. This is necessary for implementing an interactive display topology pane. The
+ * pane allows dragging and dropping display blocks into place to define the topology. Conversion to
+ * pane coordinates is necessary when rendering the original topology. Conversion in the other
+ * direction, to display coordinates, is necessary for resolve a drag position to display space.
+ *
+ * The topology pane coordinates are integral and represent the relative position from the upper-
+ * left corner of the pane. It uses a scale optimized for showing all displays with minimal or no
+ * scrolling. The display coordinates are floating point and the origin can be in any position. In
+ * practice the origin will be the upper-left coordinate of the primary display.
+ */
+class TopologyScale(paneWidth : Int, displaysPos : Collection<RectF>) {
+    /** Scale of block sizes to real-world display sizes. Should be less than 1. */
+    val blockRatio : Float
+
+    /** Height of topology pane needed to allow all display blocks to appear with some padding. */
+    val paneHeight : Int
+
+    /** Pane's X view coordinate that corresponds with topology's X=0 coordinate. */
+    val originPaneX : Int
+
+    /** Pane's Y view coordinate that corresponds with topology's Y=0 coordinate. */
+    val originPaneY : Int
+
+    init {
+        val displayBounds = RectF(
+                Float.MAX_VALUE, Float.MAX_VALUE, Float.MIN_VALUE, Float.MIN_VALUE)
+        var smallestDisplayDim = Float.MAX_VALUE
+        var biggestDisplayHeight = Float.MIN_VALUE
+
+        // displayBounds is the smallest rect encompassing all displays, in display space.
+        // smallestDisplayDim is the size of the smallest display edge, in display space.
+        for (pos in displaysPos) {
+            displayBounds.union(pos)
+            smallestDisplayDim = minOf(smallestDisplayDim, pos.height(), pos.width())
+            biggestDisplayHeight = max(biggestDisplayHeight, pos.height())
+        }
+
+        // Set height according to the width and the aspect ratio of the display bounds.
+        // 0.05 is a reasonable limit to the size of display blocks. It appears to match the
+        // ratio used in the ChromeOS topology editor. It prevents blocks from being too large,
+        // which would make dragging and dropping awkward.
+        val rawBlockRatio = min(0.05, paneWidth.toDouble() * 0.6 / displayBounds.width())
+
+        // If the `ratio` is set too low because one of the displays will have an edge less than
+        // 48dp long, increase it such that the smallest edge is that long. This may override the
+        // 0.05 limit since it is more important than it.
+        blockRatio = max(48.0 / smallestDisplayDim, rawBlockRatio).toFloat()
+
+        // Essentially, we just set the pane height based on the pre-determined pane width and the
+        // aspect ratio of the display bounds. But we may need to increase it slightly to achieve
+        // 20% padding above and below the display bounds - this is where the 0.6 comes from.
+        val rawPaneHeight = max(
+                paneWidth.toDouble() / displayBounds.width() * displayBounds.height(),
+                displayBounds.height() * blockRatio / 0.6)
+
+        // It is easy for the aspect ratio to result in an excessively tall pane, since the width is
+        // pre-determined and may be considerably wider than necessary. So we prevent the height
+        // from growing too large here, by limiting vertical padding to the size of the tallest
+        // display. This improves results for very tall display bounds.
+        paneHeight = min(
+                rawPaneHeight.toInt(),
+                (blockRatio * (displayBounds.height() + biggestDisplayHeight * 2f)).toInt())
+
+        // Set originPaneXY (the location of 0,0 in display space in the pane's coordinate system)
+        // such that the display bounds rect is centered in the pane.
+        // It is unlikely that either of these coordinates will be negative since blockRatio has
+        // been chosen to allow 20% padding around each side of the display blocks. However, the
+        // a11y requirement applied above (48.0 / smallestDisplayDim) may cause the blocks to not
+        // fit. This should be rare in practice, and can be worked around by moving the settings UI
+        // to a larger display.
+        val blockMostLeft = (paneWidth - displayBounds.width() * blockRatio) / 2
+        val blockMostTop = (paneHeight - displayBounds.height() * blockRatio) / 2
+
+        originPaneX = (blockMostLeft - displayBounds.left * blockRatio).toInt()
+        originPaneY = (blockMostTop - displayBounds.top * blockRatio).toInt()
+    }
+
+    /** Transforms coordinates in view pane space to display space. */
+    fun paneToDisplayCoor(panePos : Point) : PointF {
+        return PointF(
+                (panePos.x - originPaneX).toFloat() / blockRatio,
+                (panePos.y - originPaneY).toFloat() / blockRatio)
+    }
+
+    /** Transforms coordinates in display space to view pane space. */
+    fun displayToPaneCoor(displayPos : PointF) : Point {
+        return Point(
+                (displayPos.x * blockRatio).toInt() + originPaneX,
+                (displayPos.y * blockRatio).toInt() + originPaneY)
+    }
+
+    override fun toString() : String {
+        return String.format(
+                Locale.ROOT,
+                "{TopoScale blockRatio=%f originPaneXY=%d,%d paneHeight=%d}",
+                blockRatio, originPaneX, originPaneY, paneHeight)
+    }
+}
+
+const val PREFERENCE_KEY = "display_topology_preference"
+
+/**
+ * DisplayTopologyPreference allows the user to change the display topology
+ * when there is one or more extended display attached.
+ */
+class DisplayTopologyPreference(context : Context) : Preference(context) {
+    init {
+        layoutResource = R.layout.display_topology_preference
+
+        // Prevent highlight when hovering with mouse.
+        isSelectable = false
+
+        key = PREFERENCE_KEY
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
index 7b5bef625f6..de1363d24cd 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
@@ -16,12 +16,12 @@
 
 package com.android.settings.connecteddevice.display;
 
-
 import static android.view.Display.INVALID_DISPLAY;
 
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_HELP_URL;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DISPLAY_ID_ARG;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.forceShowDisplayList;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplayAllowed;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isUseDisplaySettingEnabled;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isResolutionSettingEnabled;
@@ -45,6 +45,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragmentBase;
+import com.android.settings.accessibility.TextReadingPreferenceFragment;
 import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
 import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;
 import com.android.settings.core.SubSettingLauncher;
@@ -63,6 +64,7 @@ import java.util.List;
 public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmentBase {
     static final int EXTERNAL_DISPLAY_SETTINGS_RESOURCE = R.xml.external_display_settings;
     static final String DISPLAYS_LIST_PREFERENCE_KEY = "displays_list_preference";
+    static final String BUILTIN_DISPLAY_LIST_PREFERENCE_KEY = "builtin_display_list_preference";
     static final String EXTERNAL_DISPLAY_USE_PREFERENCE_KEY = "external_display_use_preference";
     static final String EXTERNAL_DISPLAY_ROTATION_KEY = "external_display_rotation";
     static final String EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY = "external_display_resolution";
@@ -82,6 +84,8 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
             R.string.external_display_rotation;
     static final int EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE =
             R.string.external_display_resolution_settings_title;
+    static final int BUILTIN_DISPLAY_SETTINGS_CATEGORY_RESOURCE =
+            R.string.builtin_display_settings_category;
     @VisibleForTesting
     static final String PREVIOUSLY_SHOWN_LIST_KEY = "mPreviouslyShownListOfDisplays";
     private boolean mStarted;
@@ -96,8 +100,12 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
     @Nullable
     private FooterPreference mFooterPreference;
     @Nullable
+    private Preference mDisplayTopologyPreference;
+    @Nullable
     private PreferenceCategory mDisplaysPreference;
     @Nullable
+    private PreferenceCategory mBuiltinDisplayPreference;
+    @Nullable
     private Injector mInjector;
     @Nullable
     private String[] mRotationEntries;
@@ -197,7 +205,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
     }
 
     @VisibleForTesting
-    protected void launchDisplaySettings(final int displayId) {
+    protected void launchExternalDisplaySettings(final int displayId) {
         final Bundle args = new Bundle();
         var context = getPrefContext();
         args.putInt(DISPLAY_ID_ARG, displayId);
@@ -207,6 +215,16 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
                 .setSourceMetricsCategory(getMetricsCategory()).launch();
     }
 
+    @VisibleForTesting
+    protected void launchBuiltinDisplaySettings() {
+        final Bundle args = new Bundle();
+        var context = getPrefContext();
+        new SubSettingLauncher(context)
+                .setDestination(TextReadingPreferenceFragment.class.getName())
+                .setArguments(args)
+                .setSourceMetricsCategory(getMetricsCategory()).launch();
+    }
+
     /**
      * Returns the preference for the footer.
      */
@@ -278,6 +296,23 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
         return mDisplaysPreference;
     }
 
+    @NonNull
+    private PreferenceCategory getBuiltinDisplayListPreference(@NonNull Context context) {
+        if (mBuiltinDisplayPreference == null) {
+            mBuiltinDisplayPreference = new PreferenceCategory(context);
+            mBuiltinDisplayPreference.setPersistent(false);
+        }
+        return mBuiltinDisplayPreference;
+    }
+
+    @NonNull Preference getDisplayTopologyPreference(@NonNull Context context) {
+        if (mDisplayTopologyPreference == null) {
+            mDisplayTopologyPreference = new DisplayTopologyPreference(context);
+            mDisplayTopologyPreference.setPersistent(false);
+        }
+        return mDisplayTopologyPreference;
+    }
+
     private void restoreState(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             return;
@@ -297,10 +332,13 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
 
     private void updateScreenForDisplayId(final int displayId,
             @NonNull final PreferenceScreen screen, @NonNull Context context) {
-        final var displaysToShow = getDisplaysToShow(displayId);
-        if (displaysToShow.isEmpty() && displayId == INVALID_DISPLAY) {
+        final boolean forceShowList = displayId == INVALID_DISPLAY
+                && mInjector != null && forceShowDisplayList(mInjector.getFlags());
+        final var displaysToShow = externalDisplaysToShow(displayId);
+
+        if (!forceShowList && displaysToShow.isEmpty() && displayId == INVALID_DISPLAY) {
             showTextWhenNoDisplaysToShow(screen, context);
-        } else if (displaysToShow.size() == 1
+        } else if (!forceShowList && displaysToShow.size() == 1
                 && ((displayId == INVALID_DISPLAY && !mPreviouslyShownListOfDisplays)
                         || displaysToShow.get(0).getDisplayId() == displayId)) {
             showDisplaySettings(displaysToShow.get(0), screen, context);
@@ -359,6 +397,20 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
 
     private void showDisplaysList(@NonNull List<Display> displaysToShow,
             @NonNull PreferenceScreen screen, @NonNull Context context) {
+        if (mInjector != null && mInjector.getFlags().displayTopologyPaneInDisplayList()) {
+            screen.addPreference(getDisplayTopologyPreference(context));
+
+            // If topology is shown, we also show a preference for the built-in display for
+            // consistency with the topology.
+            var builtinCategory = getBuiltinDisplayListPreference(context);
+            builtinCategory.setKey(BUILTIN_DISPLAY_LIST_PREFERENCE_KEY);
+            builtinCategory.setTitle(BUILTIN_DISPLAY_SETTINGS_CATEGORY_RESOURCE);
+            builtinCategory.removeAll();
+            screen.addPreference(builtinCategory);
+
+            builtinCategory.addPreference(new BuiltinDisplaySizeAndTextPreference(context));
+        }
+
         var pref = getDisplaysListPreference(context);
         pref.setKey(DISPLAYS_LIST_PREFERENCE_KEY);
         pref.removeAll();
@@ -370,7 +422,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
         }
     }
 
-    private List<Display> getDisplaysToShow(int displayIdToShow) {
+    private List<Display> externalDisplaysToShow(int displayIdToShow) {
         if (mInjector == null) {
             return List.of();
         }
@@ -511,6 +563,24 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
         mInjector.getHandler().removeCallbacks(mUpdateRunnable);
     }
 
+    private class BuiltinDisplaySizeAndTextPreference extends Preference
+            implements Preference.OnPreferenceClickListener {
+        BuiltinDisplaySizeAndTextPreference(@NonNull final Context context) {
+            super(context);
+
+            setPersistent(false);
+            setKey("builtin_display_size_and_text");
+            setTitle(R.string.accessibility_text_reading_options_title);
+            setOnPreferenceClickListener(this);
+        }
+
+        @Override
+        public boolean onPreferenceClick(@NonNull Preference preference) {
+            launchBuiltinDisplaySettings();
+            return true;
+        }
+    }
+
     @VisibleForTesting
     class DisplayPreference extends TwoTargetPreference
             implements Preference.OnPreferenceClickListener {
@@ -519,6 +589,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
         DisplayPreference(@NonNull final Context context, @NonNull final Display display) {
             super(context);
             mDisplayId = display.getDisplayId();
+
             setPersistent(false);
             setKey("display_id_" + mDisplayId);
             setTitle(display.getName());
@@ -529,7 +600,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
 
         @Override
         public boolean onPreferenceClick(@NonNull Preference preference) {
-            launchDisplaySettings(mDisplayId);
+            launchExternalDisplaySettings(mDisplayId);
             writePreferenceClickMetric(preference);
             return true;
         }
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
index c9ea8ae0a04..6e56965c3ef 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
@@ -19,8 +19,8 @@ import static android.content.Context.DISPLAY_SERVICE;
 import static android.hardware.display.DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED;
 import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_ADDED;
 import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CHANGED;
-import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CONNECTION_CHANGED;
 import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_REMOVED;
+import static android.hardware.display.DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED;
 import static android.view.Display.INVALID_DISPLAY;
 
 import static com.android.server.display.feature.flags.Flags.enableModeLimitForExternalDisplay;
@@ -159,8 +159,8 @@ public class ExternalDisplaySettingsConfiguration {
                 return;
             }
             dm.registerDisplayListener(listener, mHandler, EVENT_FLAG_DISPLAY_ADDED
-                    | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED
-                    | EVENT_FLAG_DISPLAY_CONNECTION_CHANGED);
+                    | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED,
+                    PRIVATE_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED);
         }
 
         /**
@@ -319,7 +319,16 @@ public class ExternalDisplaySettingsConfiguration {
      */
     public static boolean isExternalDisplaySettingsPageEnabled(@NonNull FeatureFlags flags) {
         return flags.rotationConnectedDisplaySetting()
-                || flags.resolutionAndEnableConnectedDisplaySetting();
+                || flags.resolutionAndEnableConnectedDisplaySetting()
+                || flags.displayTopologyPaneInDisplayList();
+    }
+
+    /**
+     * If true, indicates the display list activity should be shown even if there is only one
+     * display.
+     */
+    public static boolean forceShowDisplayList(@NonNull FeatureFlags flags) {
+        return flags.displayTopologyPaneInDisplayList();
     }
 
     static boolean isDisplayAllowed(@NonNull Display display,
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java
index 64dd7bb2fdf..99a248fe477 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.connecteddevice.display;
 
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.forceShowDisplayList;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplayAllowed;
 
 import android.content.Context;
@@ -142,6 +143,10 @@ public class ExternalDisplayUpdater {
             }
         }
 
+        if (forceShowDisplayList(mInjector.getFlags())) {
+            return context.getString(R.string.external_display_off);
+        }
+
         for (var display : mInjector.getAllDisplays()) {
             if (display != null && isDisplayAllowed(display, mInjector)) {
                 return context.getString(R.string.external_display_off);
diff --git a/src/com/android/settings/connecteddevice/display/TopologyClamp.kt b/src/com/android/settings/connecteddevice/display/TopologyClamp.kt
new file mode 100644
index 00000000000..237e634bd12
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/TopologyClamp.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.display
+
+import android.graphics.RectF
+import kotlin.math.hypot
+
+// Unfortunately, in the world of IEEE 32-bit floats, A + X - X is not always == A
+// For example: A = 1075.4271f
+//              C = 1249.2203f
+// For example: - A - 173.79326f = - C
+// However:     - C + A = - 173.79321f
+// So we need to keep track of how the movingDisplay block is attaching to otherDisplays throughout
+// the calculations below. We cannot use the rect.left with its width as a proxy for rect.right. We
+// have to save the "inner" or attached side and use the width or height to calculate the "external"
+// side.
+
+/** A potential X position for the display to clamp at. */
+private class XCoor(
+    val left : Float, val right : Float,
+
+    /**
+     * If present, the position of the display being attached to. If absent, indicates the X
+     * position is derived from the exact drag position.
+     */
+    val attaching : RectF?,
+)
+
+/** A potential Y position for the display to clamp at. */
+private class YCoor(
+    val top : Float, val bottom : Float,
+
+    /**
+     * If present, the position of the display being attached to. If absent, indicates the Y
+     * position is derived from the exact drag position.
+     */
+    val attaching : RectF?,
+)
+
+/**
+ * Finds the optimal clamp position assuming the user has dragged the block to `movingDisplay`.
+ *
+ * @param otherDisplays positions of the stationary displays (every one not being dragged)
+ * @param movingDisplay the position the user is current holding the block during a drag
+ *
+ * @return the clamp position as a RectF, whose dimensions will match that of `movingDisplay`
+ */
+fun clampPosition(otherDisplays : Iterable<RectF>, movingDisplay : RectF) : RectF {
+    val xCoors = otherDisplays.flatMap {
+        listOf(
+            // Attaching to left edge of `it`
+            XCoor(it.left - movingDisplay.width(), it.left, it),
+            // Attaching to right edge of `it`
+            XCoor(it.right, it.right + movingDisplay.width(), it),
+        )
+    }.plusElement(XCoor(movingDisplay.left, movingDisplay.right, null))
+
+    val yCoors = otherDisplays.flatMap {
+        listOf(
+            // Attaching to the top edge of `it`
+            YCoor(it.top - movingDisplay.height(), it.top, it),
+            // Attaching to the bottom edge of `it`
+            YCoor(it.bottom, it.bottom + movingDisplay.height(), it),
+        )
+    }.plusElement(YCoor(movingDisplay.top, movingDisplay.bottom, null))
+
+    class Cand(val x : XCoor, val y : YCoor)
+
+    val candidateGrid = xCoors.flatMap { x -> yCoors.map { y -> Cand(x, y) }}
+    val hasAttachInRange = candidateGrid.filter {
+        if (it.x.attaching != null) {
+            // Attaching to a vertical (left or right) edge. The y range of dragging and
+            // stationary blocks must overlap.
+            it.y.top <= it.x.attaching.bottom && it.y.bottom >= it.x.attaching.top
+        } else if (it.y.attaching != null) {
+            // Attaching to a horizontal (top or bottom) edge. The x range of dragging and
+            // stationary blocks must overlap.
+            it.x.left <= it.y.attaching.right && it.x.right >= it.y.attaching.left
+        } else {
+            // Not attaching to another display's edge at all, so not a valid clamp position.
+            false
+        }
+    }
+    // Clamp positions closest to the user's drag position are best. Sort by increasing distance
+    // from it, so the best will be first.
+    val prioritized = hasAttachInRange.sortedBy {
+        hypot(it.x.left - movingDisplay.left, it.y.top - movingDisplay.top)
+    }
+    val notIntersectingAny = prioritized.asSequence()
+        .map { RectF(it.x.left, it.y.top, it.x.right, it.y.bottom) }
+        .filter { p -> otherDisplays.all { !RectF.intersects(p, it) } }
+
+    // Note we return a copy of `movingDisplay` if there is no valid clamp position, which will only
+    // happen if `otherDisplays` is empty or has no valid rectangles. It may not be wise to rely on
+    // this behavior.
+    return notIntersectingAny.firstOrNull() ?: RectF(movingDisplay)
+}
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 9b03e9b16e2..ac87ea5abc6 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -147,7 +147,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
         mMetricsFeatureProvider.logClickedPreference(preference, getMetricsCategory());
     }
 
-    private void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {
+    protected void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {
         if (screen != null) {
             final CharSequence title = screen.getTitle();
             if (!TextUtils.isEmpty(title)) {
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index c9530aba850..491ca5cce93 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -46,6 +46,7 @@ import com.android.settings.Utils;
 import com.android.settings.core.CategoryMixin.CategoryHandler;
 import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
 import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;
+import com.android.settingslib.widget.SettingsThemeHelper;
 import com.android.window.flags.Flags;
 
 import com.google.android.material.appbar.AppBarLayout;
@@ -68,6 +69,12 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
     private static final int DEFAULT_REQUEST = -1;
     private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f;
 
+    private static final int EXPRESSIVE_LAYOUT_ID =
+            com.android.settingslib.collapsingtoolbar.R.layout.settingslib_expressive_collapsing_toolbar_base_layout;
+    private static final int COLLAPSING_LAYOUT_ID =
+            com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout;
+
+
     protected CategoryMixin mCategoryMixin;
     protected CollapsingToolbarLayout mCollapsingToolbarLayout;
     protected AppBarLayout mAppBarLayout;
@@ -116,8 +123,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
         }
 
         if (isToolbarEnabled() && !isAnySetupWizard) {
-            super.setContentView(
-                    com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout);
+            int resId = SettingsThemeHelper.isExpressiveTheme(getApplicationContext())
+                    ? EXPRESSIVE_LAYOUT_ID : COLLAPSING_LAYOUT_ID;
+            super.setContentView(resId);
             mCollapsingToolbarLayout =
                     findViewById(com.android.settingslib.collapsingtoolbar.R.id.collapsing_toolbar);
             mAppBarLayout = findViewById(R.id.app_bar);
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 734bddcbb2a..8541c7a6e49 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -28,7 +28,6 @@ import com.android.settings.accessibility.AccessibilityDetailsSettingsFragment;
 import com.android.settings.accessibility.AccessibilityHearingAidsFragment;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
-import com.android.settings.accessibility.AutoBrightnessPreferenceFragmentForSetupWizard;
 import com.android.settings.accessibility.CaptioningPropertiesFragment;
 import com.android.settings.accessibility.ColorAndMotionFragment;
 import com.android.settings.accessibility.HearingDevicePairingFragment;
@@ -44,6 +43,7 @@ import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.ChooseAccountFragment;
 import com.android.settings.accounts.ManagedProfileSettings;
 import com.android.settings.applications.AppDashboardFragment;
+import com.android.settings.applications.AppStorageSettings;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.applications.UsageAccessDetails;
@@ -60,6 +60,7 @@ import com.android.settings.applications.appinfo.TurnScreenOnDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.applications.contacts.ContactsStorageSettings;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.applications.managedomainurls.ManageDomainUrls;
 import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
@@ -116,6 +117,7 @@ import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
 import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings;
 import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
+import com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced;
 import com.android.settings.fuelgauge.batteryusage.PowerUsageSummary;
 import com.android.settings.gestures.ButtonNavigationSettingsFragment;
 import com.android.settings.gestures.DoubleTapPowerSettings;
@@ -134,7 +136,7 @@ import com.android.settings.inputmethod.ModifierKeysSettings;
 import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.SpellCheckersSettings;
-import com.android.settings.inputmethod.TrackpadSettings;
+import com.android.settings.inputmethod.TouchpadAndMouseSettings;
 import com.android.settings.inputmethod.UserDictionaryList;
 import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.language.LanguageSettings;
@@ -180,7 +182,9 @@ import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment;
 import com.android.settings.privatespace.delete.PrivateSpaceDeletionProgressFragment;
 import com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings;
+import com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment;
 import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
+import com.android.settings.regionalpreferences.TemperatureUnitFragment;
 import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.MemtagPage;
@@ -235,7 +239,7 @@ public class SettingsGateway {
             KeyboardSettings.class.getName(),
             ModifierKeysSettings.class.getName(),
             NewKeyboardLayoutEnabledLocalesFragment.class.getName(),
-            TrackpadSettings.class.getName(),
+            TouchpadAndMouseSettings.class.getName(),
             SpellCheckersSettings.class.getName(),
             UserDictionaryList.class.getName(),
             UserDictionarySettings.class.getName(),
@@ -243,6 +247,7 @@ public class SettingsGateway {
             MyDeviceInfoFragment.class.getName(),
             ModuleLicensesDashboard.class.getName(),
             ManageApplications.class.getName(),
+            AppStorageSettings.class.getName(),
             FirmwareVersionSettings.class.getName(),
             ManageAssist.class.getName(),
             ProcessStatsUi.class.getName(),
@@ -264,7 +269,6 @@ public class SettingsGateway {
             EditShortcutsPreferenceFragment.class.getName(),
             TextReadingPreferenceFragment.class.getName(),
             TextReadingPreferenceFragmentForSetupWizard.class.getName(),
-            AutoBrightnessPreferenceFragmentForSetupWizard.class.getName(),
             CaptioningPropertiesFragment.class.getName(),
             ToggleDaltonizerPreferenceFragment.class.getName(),
             ToggleColorInversionPreferenceFragment.class.getName(),
@@ -275,6 +279,7 @@ public class SettingsGateway {
             DevelopmentSettingsDashboardFragment.class.getName(),
             WifiDisplaySettings.class.getName(),
             PowerUsageSummary.class.getName(),
+            PowerUsageAdvanced.class.getName(),
             AccountSyncSettings.class.getName(),
             FaceSettings.class.getName(),
             FingerprintSettings.FingerprintSettingsFragment.class.getName(),
@@ -392,6 +397,8 @@ public class SettingsGateway {
             ColorContrastFragment.class.getName(),
             LongBackgroundTasksDetails.class.getName(),
             RegionalPreferencesEntriesFragment.class.getName(),
+            TemperatureUnitFragment.class.getName(),
+            FirstDayOfWeekItemFragment.class.getName(),
             BatteryInfoFragment.class.getName(),
             UserAspectRatioDetails.class.getName(),
             ScreenTimeoutSettings.class.getName(),
@@ -401,7 +408,8 @@ public class SettingsGateway {
             AccessibilityHearingAidsFragment.class.getName(),
             HearingDevicePairingFragment.class.getName(),
             ZenModesListFragment.class.getName(),
-            ZenModeFragment.class.getName()
+            ZenModeFragment.class.getName(),
+            ContactsStorageSettings.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -413,6 +421,7 @@ public class SettingsGateway {
             Settings.SoundSettingsActivity.class.getName(),
             Settings.StorageDashboardActivity.class.getName(),
             Settings.PowerUsageSummaryActivity.class.getName(),
+            Settings.PowerUsageAdvancedActivity.class.getName(),
             Settings.AccountDashboardActivity.class.getName(),
             Settings.PrivacySettingsActivity.class.getName(),
             Settings.SecurityDashboardActivity.class.getName(),
@@ -432,13 +441,12 @@ public class SettingsGateway {
             Settings.UserSettingsActivity.class.getName(),
             Settings.ConfigureNotificationSettingsActivity.class.getName(),
             Settings.ManageApplicationsActivity.class.getName(),
+            Settings.AppStorageSettingsActivity.class.getName(),
             Settings.PaymentSettingsActivity.class.getName(),
             // Home page > Display
             Settings.AdaptiveBrightnessActivity.class.getName(),
             // Home page > Security & screen lock
             Settings.LocationSettingsActivity.class.getName(),
-            // Home page > System
-            Settings.LanguageAndInputSettingsActivity.class.getName(),
             Settings.LanguageSettingsActivity.class.getName(),
             Settings.KeyboardSettingsActivity.class.getName(),
             Settings.DateTimeSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 6333f22b95b..c79cc65bbfa 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -48,11 +48,14 @@ import com.android.settings.core.CategoryMixin.CategoryListener;
 import com.android.settings.core.PreferenceControllerListHelper;
 import com.android.settings.flags.Flags;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.restriction.UserRestrictionBindingHelper;
 import com.android.settingslib.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.preference.PreferenceScreenBindingHelper;
+import com.android.settingslib.preference.PreferenceScreenCreator;
 import com.android.settingslib.search.Indexable;
 
 import java.util.ArrayList;
@@ -60,6 +63,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -90,6 +94,8 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
     private boolean mListeningToCategoryChange;
     private List<String> mSuppressInjectedTileKeys;
 
+    private @Nullable UserRestrictionBindingHelper mUserRestrictionBindingHelper;
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -98,7 +104,8 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
         mDashboardFeatureProvider =
                 FeatureFactory.getFeatureFactory().getDashboardFeatureProvider();
 
-        if (!isCatalystEnabled()) {
+        PreferenceScreenCreator preferenceScreenCreator = getPreferenceScreenCreator();
+        if (preferenceScreenCreator == null || !preferenceScreenCreator.hasCompleteHierarchy()) {
             // Load preference controllers from code
             final List<AbstractPreferenceController> controllersFromCode =
                     createPreferenceControllers(context);
@@ -175,6 +182,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
             // editing dialog is recreated (that would happen before onResume is called).
             updatePreferenceStates();
         }
+        if (isCatalystEnabled()) {
+            PreferenceScreenBindingHelper helper = getPreferenceScreenBindingHelper();
+            if (helper != null) {
+                mUserRestrictionBindingHelper = new UserRestrictionBindingHelper(requireContext(),
+                        helper);
+            }
+        }
     }
 
     @Override
@@ -249,6 +263,15 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
+        if (isCatalystEnabled()) {
+            Intent intent = preference.getIntent();
+            if (intent != null && preference.getContext().getPackageManager().queryIntentActivities(
+                    intent, 0).isEmpty()) {
+                Log.w(TAG, "No activity to start for " + intent);
+                return true;
+            }
+        }
+
         final Collection<List<AbstractPreferenceController>> controllers =
                 mPreferenceControllers.values();
         for (List<AbstractPreferenceController> controllerList : controllers) {
@@ -277,8 +300,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
     }
 
     @Override
-    protected final int getPreferenceScreenResId(@NonNull Context context) {
-        return getPreferenceScreenResId();
+    public void onDestroy() {
+        if (mUserRestrictionBindingHelper != null) {
+            mUserRestrictionBindingHelper.close();
+            mUserRestrictionBindingHelper = null;
+        }
+        super.onDestroy();
     }
 
     @Override
@@ -321,6 +348,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
         return null;
     }
 
+    /** Returns grouped controllers of input type T. */
+    protected <T extends AbstractPreferenceController> List<AbstractPreferenceController> useGroup(
+            Class<T> clazz) {
+        return mPreferenceControllers.values().stream().flatMap(Collection::stream).filter(
+                controller -> clazz.isInstance(controller)).toList();
+    }
+
     /** Returns all controllers of type T. */
     protected <T extends AbstractPreferenceController> List<T> useAll(Class<T> clazz) {
         return (List<T>) mPreferenceControllers.getOrDefault(clazz, Collections.emptyList());
@@ -374,10 +408,14 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
             return;
         }
         PreferenceScreen screen;
-        if (isCatalystEnabled()) {
+        PreferenceScreenCreator preferenceScreenCreator = getPreferenceScreenCreator();
+        if (preferenceScreenCreator != null) {
             screen = createPreferenceScreen();
+            if (!preferenceScreenCreator.hasCompleteHierarchy()) {
+                removeControllersForHybridMode();
+            }
             setPreferenceScreen(screen);
-            requireActivity().setTitle(screen.getTitle());
+            updateActivityTitleWithScreenTitle(screen);
         } else {
             addPreferencesFromResource(resId);
             screen = getPreferenceScreen();
@@ -386,13 +424,33 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
         displayResourceTilesToScreen(screen);
     }
 
-    /** Returns if catalyst is enabled on current screen. */
-    protected final boolean isCatalystEnabled() {
-        if (!Flags.catalyst()) {
-            return false;
+    /**
+     * Removes preference controllers that have been migrated to catalyst.
+     *
+     * In hybrid mode, preference screen is inflated from XML resource, while preference metadata
+     * in the preference hierarchy are used to update preference widget UI. To avoid conflict,
+     * remove the preference controllers.
+     */
+    private void removeControllersForHybridMode() {
+        Set<String> keys = getPreferenceKeysInHierarchy();
+        Iterator<AbstractPreferenceController> iterator = mControllers.iterator();
+        Lifecycle lifecycle = getSettingsLifecycle();
+        while (iterator.hasNext()) {
+            AbstractPreferenceController controller = iterator.next();
+            String key = controller.getPreferenceKey();
+            if (keys.contains(key)) {
+                Log.i(TAG, "Remove preference controller for " + key);
+                iterator.remove();
+                List<AbstractPreferenceController> controllers = mPreferenceControllers.get(
+                        controller.getClass());
+                if (controllers != null) {
+                    controllers.remove(controller);
+                }
+                if (controller instanceof LifecycleObserver) {
+                    lifecycle.removeObserver((LifecycleObserver) controller);
+                }
+            }
         }
-        Context context = getContext();
-        return context != null ? getPreferenceScreenCreator(context) != null : false;
     }
 
     /**
diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
index 0fefa2f246e..b9f585faf2f 100644
--- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java
+++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
@@ -39,7 +39,6 @@ import android.widget.TextView;
 import com.android.internal.util.UserIcons;
 import com.android.internal.widget.RecyclerView;
 import com.android.settings.R;
-import com.android.settingslib.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,8 +61,8 @@ public class UserAdapter extends BaseAdapter {
             mUserHandle = userHandle;
             mUserManager = um;
             UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
-            int tintColor = Utils.getColorAttrDefaultColor(context,
-                    com.android.internal.R.attr.materialColorPrimary);
+            int tintColor = context.getColor(com.android.internal.R.color.materialColorPrimary);
+
             if (userInfo.isManagedProfile()
                     || (android.os.Flags.allowPrivateProfile()
                         && android.multiuser.Flags.enablePrivateSpaceFeatures()
@@ -71,7 +70,9 @@ public class UserAdapter extends BaseAdapter {
                         && userInfo.isPrivateProfile())) {
                 mIcon = context.getPackageManager().getUserBadgeForDensityNoBackground(
                         userHandle, /* density= */ 0);
-                mIcon.setTint(tintColor);
+                if (mIcon != null) {
+                    mIcon.setTint(tintColor);
+                }
             } else {
                 mIcon = UserIcons.getDefaultUserIconInColor(context.getResources(), tintColor);
             }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 5e8e3740904..c8ce7d82e4a 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -30,8 +30,6 @@ import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionAc
 import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
 import com.android.settings.display.NightDisplayPreferenceController;
 import com.android.settings.flags.Flags;
-import com.android.settings.notification.zen.ZenOnboardingActivity;
-import com.android.settings.notification.zen.ZenSuggestionActivity;
 import com.android.settings.password.ScreenLockSuggestionActivity;
 import com.android.settings.wallpaper.StyleSuggestionActivity;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
@@ -72,8 +70,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
             return WifiCallingSuggestionActivity.isSuggestionComplete(context);
         } else if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
             return NightDisplayPreferenceController.isSuggestionComplete(context);
-        } else if (className.equals(ZenSuggestionActivity.class.getName())) {
-            return ZenOnboardingActivity.isSuggestionComplete(context);
         }
         return false;
     }
diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java
index d8c73922b2a..277c9b3fe7e 100644
--- a/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -38,6 +38,7 @@ public class AppDataUsagePreference extends AppPreference {
     public AppDataUsagePreference(Context context, AppItem item, int percent,
             UidDetailProvider provider) {
         super(context);
+        setLayoutResource(R.layout.preference_process_stats);
         setKey("app_data_usage_" + item.key);
         mItem = item;
         mPercent = percent;
diff --git a/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt
new file mode 100644
index 00000000000..23cfadce3d0
--- /dev/null
+++ b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import com.android.settings.R
+import com.android.settings.widget.MainSwitchBarMetadata
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+
+class DataSaverMainSwitchPreference : MainSwitchBarMetadata, PreferenceLifecycleProvider {
+
+    override val key
+        get() = KEY
+
+    override val title
+        get() = R.string.data_saver_switch_title
+
+    override fun storage(context: Context) = createDataStore(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class DataSaverStore(private val dataSaverBackend: DataSaverBackend) :
+        AbstractKeyedDataObservable<String>(), KeyValueStore, DataSaverBackend.Listener {
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
+            dataSaverBackend.isDataSaverEnabled as T?
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            dataSaverBackend.isDataSaverEnabled = value as Boolean
+        }
+
+        override fun onFirstObserverAdded() = dataSaverBackend.addListener(this)
+
+        override fun onLastObserverRemoved() = dataSaverBackend.remListener(this)
+
+        override fun onDataSaverChanged(isDataSaving: Boolean) =
+            notifyChange(KEY, DataChangeReason.UPDATE)
+    }
+
+    companion object {
+        const val KEY = "use_data_saver"
+
+        /** Creates [KeyValueStore] for data saver preference. */
+        fun createDataStore(context: Context): KeyValueStore =
+            DataSaverStore(DataSaverBackend(context))
+    }
+}
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 305d061be88..0c3c1aac890 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -17,29 +17,39 @@ package com.android.settings.datausage;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.flags.Flags;
 
 public class DataSaverPreference extends Preference implements DataSaverBackend.Listener {
 
-    private final DataSaverBackend mDataSaverBackend;
+    private final @Nullable DataSaverBackend mDataSaverBackend;
 
     public DataSaverPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mDataSaverBackend = new DataSaverBackend(context);
+        mDataSaverBackend = isCatalystEnabled() ? null : new DataSaverBackend(context);
+    }
+
+    private boolean isCatalystEnabled() {
+        return Flags.catalyst() && Flags.catalystRestrictBackgroundParentEntry();
     }
 
     @Override
     public void onAttached() {
         super.onAttached();
-        mDataSaverBackend.addListener(this);
+        if (mDataSaverBackend != null) {
+            mDataSaverBackend.addListener(this);
+        }
     }
 
     @Override
     public void onDetached() {
         super.onDetached();
-        mDataSaverBackend.remListener(this);
+        if (mDataSaverBackend != null) {
+            mDataSaverBackend.remListener(this);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/datausage/DataSaverScreen.kt b/src/com/android/settings/datausage/DataSaverScreen.kt
new file mode 100644
index 00000000000..fd4441fbbe2
--- /dev/null
+++ b/src/com/android/settings/datausage/DataSaverScreen.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
+import com.android.settings.R
+import com.android.settings.Settings.DataSaverSummaryActivity
+import com.android.settings.flags.Flags
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
+
+@ProvidePreferenceScreen
+class DataSaverScreen(context: Context) :
+    PreferenceScreenCreator,
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider {
+
+    private val dataSaverStore = DataSaverMainSwitchPreference.createDataStore(context)
+    private lateinit var keyedObserver: KeyedObserver<String>
+
+    override val key
+        get() = KEY
+
+    override val title
+        get() = R.string.data_saver_title
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_data_usage
+
+    override fun isIndexable(context: Context) =
+        DataUsageUtils.hasMobileData(context) &&
+            DataUsageUtils.getDefaultSubscriptionId(context) != INVALID_SUBSCRIPTION_ID
+
+    override fun getSummary(context: Context): CharSequence? =
+        when {
+            dataSaverStore.getBoolean(DATA_SAVER_KEY) == true ->
+                context.getString(R.string.data_saver_on)
+            else -> context.getString(R.string.data_saver_off)
+        }
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_data_saver)
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystRestrictBackgroundParentEntry()
+
+    override fun fragmentClass() = DataSaverSummary::class.java
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, DataSaverSummaryActivity::class.java, metadata?.key)
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) { +DataSaverMainSwitchPreference() }
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        keyedObserver = KeyedObserver { _, _ -> context.notifyPreferenceChange(KEY) }
+        dataSaverStore.addObserver(DATA_SAVER_KEY, keyedObserver, HandlerExecutor.main)
+    }
+
+    override fun onDestroy(context: PreferenceLifecycleContext) {
+        dataSaverStore.removeObserver(DATA_SAVER_KEY, keyedObserver)
+    }
+
+    companion object {
+        const val KEY = "restrict_background_parent_entry"
+    }
+}
diff --git a/src/com/android/settings/datausage/DataSaverSummary.kt b/src/com/android/settings/datausage/DataSaverSummary.kt
index e118bd67b8b..60de8a72539 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.kt
+++ b/src/com/android/settings/datausage/DataSaverSummary.kt
@@ -43,26 +43,34 @@ class DataSaverSummary : DashboardFragment() {
             return
         }
 
-        dataSaverBackend = DataSaverBackend(requireContext())
+        if (!isCatalystEnabled) {
+            dataSaverBackend = DataSaverBackend(requireContext())
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        switchBar = (activity as SettingsActivity).switchBar.apply {
-            setTitle(getString(R.string.data_saver_switch_title))
-            show()
-            addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) }
+        if (!isCatalystEnabled) {
+            switchBar = (activity as SettingsActivity).switchBar.apply {
+                setTitle(getString(R.string.data_saver_switch_title))
+                show()
+                addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) }
+            }
         }
     }
 
     override fun onResume() {
         super.onResume()
-        dataSaverBackend.addListener(dataSaverBackendListener)
+        if (!isCatalystEnabled) {
+            dataSaverBackend.addListener(dataSaverBackendListener)
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        dataSaverBackend.remListener(dataSaverBackendListener)
+        if (!isCatalystEnabled) {
+            dataSaverBackend.remListener(dataSaverBackendListener)
+        }
     }
 
     private fun onSwitchChanged(isChecked: Boolean) {
@@ -79,6 +87,8 @@ class DataSaverSummary : DashboardFragment() {
     override fun getHelpResource() = R.string.help_url_data_saver
     override fun getLogTag() = TAG
 
+    override fun getPreferenceScreenBindingKey(context: Context) = DataSaverScreen.KEY
+
     private val dataSaverBackendListener = object : DataSaverBackend.Listener {
         override fun onDataSaverChanged(isDataSaving: Boolean) {
             synchronized(this) {
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index b3e66a9ce06..bb84c1804e9 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -30,6 +30,7 @@ import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -37,7 +38,7 @@ import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.AppSwitchPreference;
 
 public class UnrestrictedDataAccessPreference extends AppSwitchPreference implements
-        DataSaverBackend.Listener {
+        DataSaverBackend.Listener, RestrictedPreferenceHelperProvider {
     private static final String ECM_SETTING_IDENTIFIER = "android:unrestricted_data_access";
 
     private final ApplicationsState mApplicationsState;
@@ -78,6 +79,11 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
         return entry.info.packageName + "|" + entry.info.uid;
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mHelper;
+    }
+
     @Override
     public void onAttached() {
         super.onAttached();
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index 2942acb1956..5b17e7ecb6c 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -27,6 +27,8 @@ import android.app.time.TimeConfiguration;
 import android.app.time.TimeManager;
 import android.content.Context;
 
+import androidx.preference.Preference;
+
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
@@ -76,6 +78,17 @@ public class AutoTimePreferenceController extends TogglePreferenceController {
         }
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        refreshSummary(preference);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mContext.getString(R.string.date_time_auto_summary);
+    }
+
     @Override
     public boolean isChecked() {
         return isEnabled();
diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index 8eccf319784..3d8f8011dda 100644
--- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -32,6 +32,7 @@ import androidx.preference.Preference;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.flags.Flags;
 
 public class AutoTimeZonePreferenceController extends TogglePreferenceController {
 
@@ -46,7 +47,7 @@ public class AutoTimeZonePreferenceController extends TogglePreferenceController
         // setTimeAndDateCallback() isn't called, e.g. for slices and other cases where the
         // controller is instantiated outside of the context of the real Date & Time settings
         // screen.
-        mCallback  = (c) -> {};
+        mCallback = (c) -> {};
     }
 
     /**
@@ -103,10 +104,25 @@ public class AutoTimeZonePreferenceController extends TogglePreferenceController
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
-                .setAutoDetectionEnabled(isChecked)
-                .build();
-        boolean result = mTimeManager.updateTimeZoneConfiguration(configuration);
+        TimeZoneConfiguration.Builder configuration = new TimeZoneConfiguration.Builder()
+                .setAutoDetectionEnabled(isChecked);
+
+        if (Flags.revampToggles()) {
+            // "Use location for time zone" is only used if "Automatic time zone" is enabled. If
+            // the user toggles off automatic time zone, set the toggle off and disable the toggle.
+            int geoDetectionCapability = mTimeManager
+                    .getTimeZoneCapabilitiesAndConfig()
+                    .getCapabilities()
+                    .getConfigureGeoDetectionEnabledCapability();
+
+            if (!isChecked
+                    && (geoDetectionCapability == CAPABILITY_NOT_APPLICABLE
+                    || geoDetectionCapability == CAPABILITY_POSSESSED)) {
+                configuration.setGeoDetectionEnabled(false);
+            }
+        }
+
+        boolean result = mTimeManager.updateTimeZoneConfiguration(configuration.build());
 
         mCallback.updateTimeAndDateDisplay(mContext);
         return result;
@@ -129,17 +145,19 @@ public class AutoTimeZonePreferenceController extends TogglePreferenceController
         // time zone must use location.
         if (LocationProviderStatusPreferenceController.hasLocationTimeZoneNoTelephonyFallback(
                 mTimeManager.getTimeZoneCapabilitiesAndConfig().getDetectorStatus())) {
-            return mContext.getResources().getString(R.string.auto_zone_requires_location_summary);
+            return mContext.getString(R.string.auto_zone_requires_location_summary);
         }
-        // If the user has a dedicated toggle to control location use, the summary can
-        // be empty because the use of location is explicit.
-        return "";
+
+        // If the user has a dedicated toggle to control location use, explain what it does.
+        return mContext.getString(R.string.zone_auto_title_summary);
     }
 
     @VisibleForTesting
     boolean isEnabled() {
-        TimeZoneConfiguration config = getTimeZoneCapabilitiesAndConfig().getConfiguration();
-        return config.isAutoDetectionEnabled();
+        return mTimeManager
+                .getTimeZoneCapabilitiesAndConfig()
+                .getConfiguration()
+                .isAutoDetectionEnabled();
     }
 
     private TimeZoneCapabilitiesAndConfig getTimeZoneCapabilitiesAndConfig() {
diff --git a/src/com/android/settings/datetime/DateTimeSettings.java b/src/com/android/settings/datetime/DateTimeSettings.java
index f3c11d43ac3..e5c13bfec18 100644
--- a/src/com/android/settings/datetime/DateTimeSettings.java
+++ b/src/com/android/settings/datetime/DateTimeSettings.java
@@ -23,6 +23,7 @@ import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.flags.Flags;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
@@ -49,6 +50,9 @@ public class DateTimeSettings extends DashboardFragment implements
 
     @Override
     protected int getPreferenceScreenResId() {
+        if (Flags.revampToggles()) {
+            return R.xml.date_time_prefs_revamped;
+        }
         return R.xml.date_time_prefs;
     }
 
@@ -119,5 +123,6 @@ public class DateTimeSettings extends DashboardFragment implements
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.date_time_prefs);
+            new BaseSearchIndexProvider(
+                    Flags.revampToggles() ? R.xml.date_time_prefs_revamped : R.xml.date_time_prefs);
 }
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index a50ce4c3c22..52d49ac8b78 100644
--- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.flags.Flags;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -64,8 +65,10 @@ public class LocationTimeZoneDetectionPreferenceController
 
     @Override
     public boolean isChecked() {
+        // forceRefresh set to true as the location toggle may have been turned off by switching off
+        // automatic time zone
         TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
-                getTimeZoneCapabilitiesAndConfig(/*forceRefresh=*/false);
+                getTimeZoneCapabilitiesAndConfig(/*forceRefresh=*/ Flags.revampToggles());
         TimeZoneConfiguration configuration = capabilitiesAndConfig.getConfiguration();
         return configuration.isGeoDetectionEnabled();
     }
@@ -73,7 +76,7 @@ public class LocationTimeZoneDetectionPreferenceController
     @Override
     public boolean setChecked(boolean isChecked) {
         TimeZoneCapabilitiesAndConfig timeZoneCapabilitiesAndConfig =
-                getTimeZoneCapabilitiesAndConfig(/*forceRefresh=*/false);
+                getTimeZoneCapabilitiesAndConfig(/*forceRefresh=*/ false);
         boolean isLocationEnabled =
                 timeZoneCapabilitiesAndConfig.getCapabilities().isUseLocationEnabled();
         if (isChecked && !isLocationEnabled) {
@@ -130,17 +133,30 @@ public class LocationTimeZoneDetectionPreferenceController
                 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.
+        // The preference can be present and enabled, present and disabled or not present.
         if (capability == CAPABILITY_NOT_SUPPORTED || capability == CAPABILITY_NOT_ALLOWED) {
             return UNSUPPORTED_ON_DEVICE;
         } else if (capability == CAPABILITY_NOT_APPLICABLE || capability == CAPABILITY_POSSESSED) {
-            return AVAILABLE;
+            if (Flags.revampToggles()) {
+                return isAutoTimeZoneEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+            } else {
+                return AVAILABLE;
+            }
         } else {
             throw new IllegalStateException("Unknown capability=" + capability);
         }
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        if (Flags.revampToggles()) {
+            // enable / disable the toggle based on automatic time zone being enabled or not
+            preference.setEnabled(isAutoTimeZoneEnabled());
+        }
+    }
+
     @Override
     public CharSequence getSummary() {
         TimeZoneCapabilitiesAndConfig timeZoneCapabilitiesAndConfig =
@@ -212,4 +228,13 @@ public class LocationTimeZoneDetectionPreferenceController
         }
         return mTimeZoneCapabilitiesAndConfig;
     }
+
+    /**
+     * Returns whether the user can select this preference or not, as it is a sub toggle of
+     * automatic time zone.
+     */
+    private boolean isAutoTimeZoneEnabled() {
+        return mTimeManager.getTimeZoneCapabilitiesAndConfig().getConfiguration()
+                .isAutoDetectionEnabled();
+    }
 }
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 19805ad03dd..2dee76e9fbd 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -25,6 +25,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.flags.Flags;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -72,8 +73,10 @@ public class TimeFormatPreferenceController extends TogglePreferenceController {
         if (mIsFromSUW) {
             return DISABLED_DEPENDENT_SETTING;
         }
-        if (AutoTimeFormatPreferenceController.isAutoTimeFormatSelection(mContext)) {
-            return DISABLED_DEPENDENT_SETTING;
+        if (!Flags.revampToggles()) {
+            if (AutoTimeFormatPreferenceController.isAutoTimeFormatSelection(mContext)) {
+                return DISABLED_DEPENDENT_SETTING;
+            }
         }
         return AVAILABLE;
     }
@@ -130,7 +133,7 @@ public class TimeFormatPreferenceController extends TogglePreferenceController {
             timeFormatPreference = Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT;
         } else {
             timeFormatPreference = is24Hour ? Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR
-                : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR;
+                    : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR;
         }
         timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, timeFormatPreference);
         context.sendBroadcast(timeChanged);
@@ -138,7 +141,7 @@ public class TimeFormatPreferenceController extends TogglePreferenceController {
 
     static void set24Hour(Context context, Boolean is24Hour) {
         String value = is24Hour == null ? null :
-            is24Hour ? HOURS_24 : HOURS_12;
+                is24Hour ? HOURS_24 : HOURS_12;
         Settings.System.putString(context.getContentResolver(),
                 Settings.System.TIME_12_24, value);
     }
diff --git a/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
index 739258d3fda..bf5efa76daf 100644
--- a/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothLeAudioModePreferenceController.java
@@ -34,12 +34,10 @@ import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.Objects;
 
-/**
- * Preference controller to control Bluetooth LE audio mode
- */
-public class BluetoothLeAudioModePreferenceController
-        extends DeveloperOptionsPreferenceController
+/** Preference controller to control Bluetooth LE audio mode */
+public class BluetoothLeAudioModePreferenceController extends DeveloperOptionsPreferenceController
         implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String PREFERENCE_KEY = "bluetooth_leaudio_mode";
@@ -51,15 +49,13 @@ public class BluetoothLeAudioModePreferenceController
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    @VisibleForTesting
-    @Nullable String mNewMode;
-    @VisibleForTesting
-    BluetoothAdapter mBluetoothAdapter;
+    @VisibleForTesting @Nullable String mNewMode;
+    @VisibleForTesting BluetoothAdapter mBluetoothAdapter;
 
     boolean mChanged = false;
 
-    public BluetoothLeAudioModePreferenceController(@NonNull Context context,
-            @Nullable DevelopmentSettingsDashboardFragment fragment) {
+    public BluetoothLeAudioModePreferenceController(
+            @NonNull Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
         super(context);
         mFragment = fragment;
         mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
@@ -69,7 +65,8 @@ public class BluetoothLeAudioModePreferenceController
     }
 
     @Override
-    @NonNull public String getPreferenceKey() {
+    @NonNull
+    public String getPreferenceKey() {
         return PREFERENCE_KEY;
     }
 
@@ -125,20 +122,25 @@ public class BluetoothLeAudioModePreferenceController
         }
     }
 
-    /**
-     * Called when the RebootDialog confirm is clicked.
-     */
+    /** Called when the RebootDialog confirm is clicked. */
     public void onRebootDialogConfirmed() {
         if (!mChanged) {
             return;
         }
         SystemProperties.set(LE_AUDIO_DYNAMIC_SWITCHER_MODE_PROPERTY, mNewMode);
+        if (mFragment != null && !Objects.equals(mNewMode, "broadcast")) {
+            mFragment.onBroadcastDisabled();
+        }
     }
 
-    /**
-     * Called when the RebootDialog cancel is clicked.
-     */
+    /** Called when the RebootDialog cancel is clicked. */
     public void onRebootDialogCanceled() {
         mChanged = false;
     }
+
+    public interface OnModeChangeListener {
+
+        /** Called when the broadcast mode is disabled. */
+        void onBroadcastDisabled();
+    }
 }
diff --git a/src/com/android/settings/development/BluetoothLeAudioUiPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioUiPreferenceController.java
new file mode 100644
index 00000000000..f2ae55ff82f
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothLeAudioUiPreferenceController.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothStatusCodes;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.sysprop.BluetoothProperties;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.flags.Flags;
+import com.android.settingslib.utils.ThreadUtils;
+
+/** Preference controller to enable / disable the Bluetooth LE audio sharing UI flow */
+public class BluetoothLeAudioUiPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener,
+                PreferenceControllerMixin,
+                BluetoothLeAudioModePreferenceController.OnModeChangeListener {
+    private static final String TAG = "BluetoothLeAudioUiPreferenceController";
+    private static final String PREFERENCE_KEY = "bluetooth_leaudio_broadcast_ui";
+
+    @VisibleForTesting
+    static final String VALUE_KEY = "bluetooth_le_audio_sharing_ui_preview_enabled";
+
+    @VisibleForTesting static final int VALUE_OFF = 0;
+    @VisibleForTesting static final int VALUE_ON = 1;
+    @VisibleForTesting static final int VALUE_UNSET = -1;
+    @Nullable private final DevelopmentSettingsDashboardFragment mFragment;
+    private final BluetoothAdapter mBluetoothAdapter;
+    private boolean mCurrentSettingsValue = false;
+    private boolean mShouldToggleCurrentValue = false;
+
+    public BluetoothLeAudioUiPreferenceController(
+            @NonNull Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mFragment = fragment;
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return Flags.audioSharingDeveloperOption()
+                && BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false)
+                && BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);
+    }
+
+    @Override
+    public boolean onPreferenceChange(@NonNull Preference preference, @Nullable Object newValue) {
+        if (mFragment != null && newValue != null && (boolean) newValue != mCurrentSettingsValue) {
+            mShouldToggleCurrentValue = true;
+            BluetoothRebootDialog.show(mFragment);
+        }
+        return false;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        if (mBluetoothAdapter == null) {
+            return;
+        }
+        var unused = ThreadUtils.postOnBackgroundThread(
+                () -> {
+                    boolean shouldEnable =
+                            mBluetoothAdapter.isEnabled()
+                                    && mBluetoothAdapter.isLeAudioBroadcastSourceSupported()
+                                            == BluetoothStatusCodes.FEATURE_SUPPORTED
+                                    && mBluetoothAdapter.isLeAudioBroadcastAssistantSupported()
+                                            == BluetoothStatusCodes.FEATURE_SUPPORTED;
+                    boolean valueOn =
+                            Settings.Global.getInt(
+                                            mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET)
+                                    == VALUE_ON;
+                    mContext.getMainExecutor()
+                            .execute(
+                                    () -> {
+                                        if (!shouldEnable && valueOn) {
+                                            Log.e(
+                                                    TAG,
+                                                    "Error state: toggle disabled but current"
+                                                            + " settings value is true.");
+                                        }
+                                        mCurrentSettingsValue = valueOn;
+                                        preference.setEnabled(shouldEnable);
+                                        ((SwitchPreferenceCompat) preference).setChecked(valueOn);
+                                    });
+                });
+    }
+
+    @Override
+    public @NonNull String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    /** Called when the RebootDialog confirm is clicked. */
+    public void onRebootDialogConfirmed() {
+        if (isAvailable() && mShouldToggleCurrentValue) {
+            // Blocking, ensure reboot happens after value is saved.
+            Log.d(TAG, "onRebootDialogConfirmed(): setting value to " + !mCurrentSettingsValue);
+            toggleSetting(mContext.getContentResolver(), !mCurrentSettingsValue);
+        }
+    }
+
+    /** Called when the RebootDialog cancel is clicked. */
+    public void onRebootDialogCanceled() {
+        mShouldToggleCurrentValue = false;
+    }
+
+    @Override
+    public void onBroadcastDisabled() {
+        if (isAvailable() && mCurrentSettingsValue) {
+            Log.d(TAG, "onBroadcastDisabled(): setting value to false");
+            // Blocking, ensure reboot happens after value is saved.
+            toggleSetting(mContext.getContentResolver(), false);
+        }
+    }
+
+    private static void toggleSetting(ContentResolver contentResolver, boolean valueOn) {
+        Settings.Global.putInt(contentResolver, VALUE_KEY, valueOn ? VALUE_ON : VALUE_OFF);
+    }
+}
diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java
index f43e17cca86..492686ead65 100644
--- a/src/com/android/settings/development/DesktopModePreferenceController.java
+++ b/src/com/android/settings/development/DesktopModePreferenceController.java
@@ -17,14 +17,14 @@
 package com.android.settings.development;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
+import static android.window.DesktopModeFlags.ToggleOverride.fromSetting;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
 
 import android.content.Context;
 import android.provider.Settings;
-import android.window.flags.DesktopModeFlags.ToggleOverride;
+import android.window.DesktopModeFlags.ToggleOverride;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index b01415245c1..de3680d61ea 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -99,7 +99,9 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         AdbClearKeysDialogHost, LogPersistDialogHost,
         BluetoothRebootDialog.OnRebootDialogListener,
         AbstractBluetoothPreferenceController.Callback,
-        NfcRebootDialog.OnNfcRebootDialogConfirmedListener, BluetoothSnoopLogHost {
+        NfcRebootDialog.OnNfcRebootDialogConfirmedListener,
+        BluetoothSnoopLogHost,
+        BluetoothLeAudioModePreferenceController.OnModeChangeListener {
 
     private static final String TAG = "DevSettingsDashboard";
     @VisibleForTesting static final int REQUEST_BIOMETRIC_PROMPT = 100;
@@ -498,6 +500,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
                 getDevelopmentOptionsController(
                         BluetoothLeAudioModePreferenceController.class);
         leAudioModeController.onRebootDialogConfirmed();
+
+        final BluetoothLeAudioUiPreferenceController leAudioUiController =
+                getDevelopmentOptionsController(BluetoothLeAudioUiPreferenceController.class);
+        leAudioUiController.onRebootDialogConfirmed();
     }
 
     @Override
@@ -520,6 +526,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
                 getDevelopmentOptionsController(
                         BluetoothLeAudioModePreferenceController.class);
         leAudioModeController.onRebootDialogCanceled();
+
+        final BluetoothLeAudioUiPreferenceController leAudioUiController =
+                getDevelopmentOptionsController(BluetoothLeAudioUiPreferenceController.class);
+        leAudioUiController.onRebootDialogCanceled();
     }
 
     @Override
@@ -741,6 +751,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothLeAudioPreferenceController(context, fragment));
         controllers.add(new BluetoothLeAudioModePreferenceController(context, fragment));
+        controllers.add(new BluetoothLeAudioUiPreferenceController(context, fragment));
         controllers.add(new BluetoothLeAudioDeviceDetailsPreferenceController(context));
         controllers.add(new BluetoothLeAudioAllowListPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
@@ -855,6 +866,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         }
     }
 
+    @Override
+    public void onBroadcastDisabled() {
+        for (AbstractPreferenceController controller : mPreferenceControllers) {
+            if (controller instanceof BluetoothLeAudioUiPreferenceController) {
+                ((BluetoothLeAudioUiPreferenceController) controller).onBroadcastDisabled();
+            }
+        }
+    }
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 6df100ca4ec..421963eb31c 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -84,7 +84,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
         for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
             final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
             simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
-            simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
+            setPhoneNumber(simSlotNumber);
         }
     }
 
@@ -93,24 +93,15 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
         return true;
     }
 
-    private CharSequence getFirstPhoneNumber() {
-        final List<SubscriptionInfo> subscriptionInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList();
-        if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
-            return mContext.getText(R.string.device_info_default);
-        }
-
-        // For now, We only return first result for slice view.
-        return getFormattedPhoneNumber(subscriptionInfoList.get(0));
-    }
-
-    private CharSequence getPhoneNumber(int simSlot) {
+    private void setPhoneNumber(int simSlot) {
+        final Preference simStatusPreference = mPreferenceList.get(simSlot);
         final SubscriptionInfo subscriptionInfo = getSubscriptionInfo(simSlot);
+        simStatusPreference.setEnabled(subscriptionInfo != null);
         if (subscriptionInfo == null) {
-            return mContext.getText(R.string.device_info_default);
+            simStatusPreference.setSummary(mContext.getString(R.string.device_info_not_available));
+        } else {
+            simStatusPreference.setSummary(getFormattedPhoneNumber(subscriptionInfo));
         }
-
-        return getFormattedPhoneNumber(subscriptionInfo);
     }
 
     private CharSequence getPreferenceTitle(int simSlot) {
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 50b60973d5b..e209d85f543 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -25,6 +25,9 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFragment;
@@ -211,6 +214,11 @@ public class MyDeviceInfoFragment extends DashboardFragment
         controller.updateDeviceName(confirm);
     }
 
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return MyDeviceInfoScreen.KEY;
+    }
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreen.kt b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreen.kt
new file mode 100644
index 00000000000..254a91e5ab3
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreen.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.aboutphone
+
+import android.content.Context
+import android.os.Build
+import android.provider.Settings
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class MyDeviceInfoScreen :
+    PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.about_settings
+
+    override fun getSummary(context: Context): CharSequence? {
+        return Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME)
+            ?: Build.MODEL
+    }
+
+    override fun getIcon(context: Context): Int {
+        return when (Flags.homepageRevamp()) {
+            true -> R.drawable.ic_settings_about_device_filled
+            false -> R.drawable.ic_settings_about_device
+        }
+    }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystMyDeviceInfoPrefScreen()
+
+    override fun fragmentClass() = MyDeviceInfoFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    override fun hasCompleteHierarchy() = false
+
+    companion object {
+        const val KEY = "my_device_info_pref_screen"
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreference.kt b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreference.kt
new file mode 100644
index 00000000000..a039a3a4e82
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreference.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.SystemClock
+import android.os.UserHandle
+import android.os.UserManager
+import androidx.preference.Preference
+import com.android.internal.app.PlatLogoActivity
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settingslib.RestrictedLockUtils
+import com.android.settingslib.RestrictedLockUtilsInternal
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+class FirmwareVersionDetailPreference :
+    PreferenceMetadata,
+    PreferenceSummaryProvider,
+    PreferenceBinding,
+    Preference.OnPreferenceClickListener {
+
+    private val hits = LongArray(ACTIVITY_TRIGGER_COUNT)
+
+    override val key: String
+        get() = "os_firmware_version"
+
+    override val title: Int
+        get() = R.string.firmware_version
+
+    override fun isIndexable(context: Context) = false
+
+    override fun intent(context: Context): Intent? =
+        Intent(Intent.ACTION_MAIN)
+            .setClassName("android", PlatLogoActivity::class.java.name)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+    override fun getSummary(context: Context): CharSequence? =
+        Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.isCopyingEnabled = true
+        preference.onPreferenceClickListener = this
+    }
+
+    // return true swallows the click event, while return false will start the intent
+    override fun onPreferenceClick(preference: Preference): Boolean {
+        if (Utils.isMonkeyRunning()) return true
+
+        // remove oldest hit and check whether there are 3 clicks within 500ms
+        for (index in 1..<ACTIVITY_TRIGGER_COUNT) hits[index - 1] = hits[index]
+        hits[ACTIVITY_TRIGGER_COUNT - 1] = SystemClock.uptimeMillis()
+        if (hits[ACTIVITY_TRIGGER_COUNT - 1] - hits[0] > DELAY_TIMER_MILLIS) return true
+
+        val context = preference.context
+        val userManager = context.getSystemService(Context.USER_SERVICE) as? UserManager
+        if (userManager?.hasUserRestriction(UserManager.DISALLOW_FUN) != true) return false
+
+        // Sorry, no fun for you!
+        val myUserId = UserHandle.myUserId()
+        val enforcedAdmin =
+            RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                context,
+                UserManager.DISALLOW_FUN,
+                myUserId,
+            ) ?: return true
+        val disallowedBySystem =
+            RestrictedLockUtilsInternal.hasBaseUserRestriction(
+                context,
+                UserManager.DISALLOW_FUN,
+                myUserId,
+            )
+        if (!disallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context, enforcedAdmin)
+        }
+        return true
+    }
+
+    companion object {
+        const val DELAY_TIMER_MILLIS = 500L
+        const val ACTIVITY_TRIGGER_COUNT = 3
+    }
+}
+// LINT.ThenChange(FirmwareVersionDetailPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
index e6ac6069d9a..7b0b2a67c63 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
@@ -33,6 +33,7 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+// LINT.IfChange
 public class FirmwareVersionDetailPreferenceController extends BasePreferenceController {
 
     private static final String TAG = "firmwareDialogCtrl";
@@ -125,3 +126,4 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon
                 mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
     }
 }
+// LINT.ThenChange(FirmwareVersionDetailPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt
index 0908f9eaa85..fbc749bb1ec 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.os.Build
 import com.android.settings.R
 import com.android.settings.flags.Flags
-import com.android.settingslib.metadata.PreferenceMetadata
 import com.android.settingslib.metadata.PreferenceSummaryProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
@@ -47,17 +46,14 @@ class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider
 
     override fun getPreferenceHierarchy(context: Context) =
         preferenceHierarchy(this) {
-            +PreferenceWidget("os_firmware_version", R.string.firmware_version)
-            +PreferenceWidget("security_key", R.string.security_patch)
-            +PreferenceWidget("module_version", R.string.module_version)
+            +FirmwareVersionDetailPreference()
+            +SecurityPatchLevelPreference()
+            +MainlineModuleVersionPreference()
             +BasebandVersionPreference()
             +KernelVersionPreference()
             +SimpleBuildNumberPreference()
         }
 
-    private class PreferenceWidget(override val key: String, override val title: Int) :
-        PreferenceMetadata
-
     companion object {
         const val KEY = "firmware_version"
     }
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt
new file mode 100644
index 00000000000..a310a206b27
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.text.format.DateFormat
+import android.util.Log
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.utils.getLocale
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.preference.PreferenceBinding
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.TimeZone
+
+// LINT.IfChange
+class MainlineModuleVersionPreference :
+    PreferenceMetadata,
+    PreferenceSummaryProvider,
+    PreferenceAvailabilityProvider,
+    PreferenceBinding {
+
+    private var moduleVersion: String? = null
+
+    override val key: String
+        get() = "module_version"
+
+    override val title: Int
+        get() = R.string.module_version
+
+    override fun getSummary(context: Context): CharSequence? {
+        val version = getModuleVersion(context)
+        if (version.isEmpty()) return null
+
+        val locale = context.getLocale()
+        fun parseDate(pattern: String): Date? {
+            val simpleDateFormat = SimpleDateFormat(pattern, locale)
+            simpleDateFormat.timeZone = TimeZone.getDefault()
+            return try {
+                simpleDateFormat.parse(version)
+            } catch (e: ParseException) {
+                null
+            }
+        }
+
+        val date = parseDate("yyyy-MM-dd") ?: parseDate("yyyy-MM")
+        return if (date == null) {
+            Log.w(TAG, "Cannot parse mainline versionName ($version) as date")
+            version
+        } else {
+            DateFormat.format(DateFormat.getBestDateTimePattern(locale, "dMMMMyyyy"), date)
+        }
+    }
+
+    override fun intent(context: Context): Intent? {
+        val packageManager = context.packageManager
+        val intentPackage =
+            if (Flags.mainlineModuleExplicitIntent()) {
+                context.getString(R.string.config_mainline_module_update_package)
+            } else {
+                null
+            }
+        fun String.resolveIntent() =
+            Intent(this).let {
+                if (intentPackage != null) it.setPackage(intentPackage)
+                if (packageManager.resolveActivity(it, 0) != null) it else null
+            }
+
+        return MODULE_UPDATE_ACTION_V2.resolveIntent() ?: MODULE_UPDATE_ACTION.resolveIntent()
+    }
+
+    override fun isAvailable(context: Context) = getModuleVersion(context).isNotEmpty()
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        // This seems unnecessary, just follow existing behavior to pass test
+        if (preference.intent == null) preference.setSummary(R.string.summary_placeholder)
+        preference.isCopyingEnabled = true
+    }
+
+    private fun getModuleVersion(context: Context): String =
+        moduleVersion ?: context.getVersion().also { moduleVersion = it }
+
+    private fun Context.getVersion(): String {
+        val moduleProvider =
+            getString(com.android.internal.R.string.config_defaultModuleMetadataProvider)
+        if (moduleProvider.isEmpty()) return ""
+        return try {
+            packageManager.getPackageInfo(moduleProvider, 0)?.versionName ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            Log.e(TAG, "Failed to get mainline version.", e)
+            ""
+        }
+    }
+
+    companion object {
+        private const val TAG = "MainlineModulePreference"
+        const val MODULE_UPDATE_ACTION = "android.settings.MODULE_UPDATE_SETTINGS"
+        const val MODULE_UPDATE_ACTION_V2 = "android.settings.MODULE_UPDATE_VERSIONS"
+    }
+}
+// LINT.ThenChange(MainlineModuleVersionPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
index 4c02feb044f..b65497f6808 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
@@ -39,6 +39,7 @@ import java.util.Locale;
 import java.util.Optional;
 import java.util.TimeZone;
 
+// LINT.IfChange
 public class MainlineModuleVersionPreferenceController extends BasePreferenceController {
 
     @VisibleForTesting
@@ -141,3 +142,4 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
         return Optional.empty();
     }
 }
+// LINT.ThenChange(MainlineModuleVersionPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreference.kt b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreference.kt
new file mode 100644
index 00000000000..7af389ec6ac
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreference.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.utils.getLocale
+import com.android.settingslib.DeviceInfoUtils
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+class SecurityPatchLevelPreference :
+    PreferenceMetadata,
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceBinding {
+
+    private var currentPatch: String? = null
+
+    override val key: String
+        get() = "security_key"
+
+    override val title: Int
+        get() = R.string.security_patch
+
+    override fun intent(context: Context): Intent? =
+        Intent(Intent.ACTION_VIEW)
+            .setData(Uri.parse("https://source.android.com/docs/security/bulletin/"))
+
+    override fun isAvailable(context: Context) = context.getPatch().isNotEmpty()
+
+    override fun getSummary(context: Context) = context.getPatch()
+
+    private fun Context.getPatch(): String =
+        currentPatch
+            ?: (DeviceInfoUtils.getSecurityPatch(getLocale()) ?: "").also { currentPatch = it }
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.isCopyingEnabled = true
+    }
+}
+// LINT.ThenChange(SecurityPatchLevelPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceController.java
index dcb5a37ffa0..b4648ee19f8 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.deviceinfo.firmwareversion;
 
+// LINT.IfChange
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -73,3 +74,4 @@ public class SecurityPatchLevelPreferenceController extends BasePreferenceContro
         return true;
     }
 }
+// LINT.ThenChange(SecurityPatchLevelPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
index e9866d73263..4b2666f1de1 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
@@ -27,5 +27,5 @@ interface HardwareInfoFeatureProvider {
     /**
      * The country of origin label.
      */
-    val countryIfOriginLabel: String
+    val countryOfOriginLabel: String
 }
diff --git a/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceController.java b/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceController.java
index 68e51f40df7..4c2413a8c23 100644
--- a/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.legal;
 import android.content.Context;
 import android.content.Intent;
 
+// LINT.IfChange
 public class CopyrightPreferenceController extends LegalPreferenceController {
 
     private static final Intent INTENT = new Intent("android.settings.COPYRIGHT");
@@ -30,3 +31,4 @@ public class CopyrightPreferenceController extends LegalPreferenceController {
         return INTENT;
     }
 }
+// LINT.ThenChange(LegalPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreference.kt b/src/com/android/settings/deviceinfo/legal/LegalPreference.kt
new file mode 100644
index 00000000000..af3537bebb0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/legal/LegalPreference.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.ResolveInfo
+import androidx.annotation.StringRes
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceTitleProvider
+
+// LINT.IfChange
+class LegalPreference(
+    override val key: String,
+    @StringRes val defaultTitle: Int = 0,
+    val intentAction: String,
+) : PreferenceMetadata, PreferenceTitleProvider, PreferenceAvailabilityProvider {
+
+    override fun getTitle(context: Context): CharSequence? {
+        val resolveInfo =
+            findMatchingSpecificActivity(context) ?: return context.getText(defaultTitle)
+        return resolveInfo.loadLabel(context.packageManager)
+    }
+
+    override fun isAvailable(context: Context) = (findMatchingSpecificActivity(context) != null)
+
+    override fun intent(context: Context) =
+        findMatchingSpecificActivity(context)?.let {
+            Intent()
+                .setClassName(it.activityInfo.packageName, it.activityInfo.name)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+
+    private fun findMatchingSpecificActivity(context: Context): ResolveInfo? {
+        val intent = Intent(intentAction)
+        // Find the activity that is in the system image
+        val list: List<ResolveInfo> = context.packageManager.queryIntentActivities(intent, 0)
+        return list.firstOrNull {
+            (it.activityInfo.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) != 0
+        }
+    }
+}
+// LINT.ThenChange(LegalPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
index fe45923d60b..adbc2d75a3c 100644
--- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
@@ -27,6 +27,7 @@ import com.android.settings.core.BasePreferenceController;
 
 import java.util.List;
 
+// LINT.IfChange
 public abstract class LegalPreferenceController extends BasePreferenceController {
     private final PackageManager mPackageManager;
     private Preference mPreference;
@@ -94,3 +95,4 @@ public abstract class LegalPreferenceController extends BasePreferenceController
         mPreference.setTitle(resolveInfo.loadLabel(mPackageManager));
     }
 }
+// LINT.ThenChange(LegalPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/LegalSettingsScreen.kt b/src/com/android/settings/deviceinfo/legal/LegalSettingsScreen.kt
new file mode 100644
index 00000000000..f990b5dbeb0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/legal/LegalSettingsScreen.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import com.android.settings.LegalSettings
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+open class LegalSettingsScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.legal_information
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystLegalInformation()
+
+    override fun fragmentClass() = LegalSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +LegalPreference("copyright", R.string.copyright_title, "android.settings.COPYRIGHT")
+            +LegalPreference("license", R.string.license_title, "android.settings.LICENSE")
+            +LegalPreference("terms", R.string.terms_title, "android.settings.TERMS")
+            +ModuleLicensesScreen.KEY // Use screen key in case it is overlaid.
+            +LegalPreference(
+                "webview_license",
+                R.string.webview_license_title,
+                "android.settings.WEBVIEW_LICENSE",
+            )
+            +WallpaperAttributionsPreference()
+        }
+
+    companion object {
+        const val KEY = "legal_information"
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/legal/LicensePreferenceController.java b/src/com/android/settings/deviceinfo/legal/LicensePreferenceController.java
index 67af15b4fc6..9bd74fd3a8d 100644
--- a/src/com/android/settings/deviceinfo/legal/LicensePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/LicensePreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.legal;
 import android.content.Context;
 import android.content.Intent;
 
+// LINT.IfChange
 public class LicensePreferenceController extends LegalPreferenceController {
 
     private static final Intent INTENT = new Intent("android.settings.LICENSE");
@@ -30,3 +31,4 @@ public class LicensePreferenceController extends LegalPreferenceController {
         return INTENT;
     }
 }
+// LINT.ThenChange(LegalPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/ModuleLicensesListPreferenceController.java b/src/com/android/settings/deviceinfo/legal/ModuleLicensesListPreferenceController.java
index 9faff856074..7b6ca460cbe 100644
--- a/src/com/android/settings/deviceinfo/legal/ModuleLicensesListPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/ModuleLicensesListPreferenceController.java
@@ -24,6 +24,7 @@ import com.android.settings.core.BasePreferenceController;
 
 import java.util.List;
 
+// LINT.IfChange
 public class ModuleLicensesListPreferenceController extends BasePreferenceController {
     public ModuleLicensesListPreferenceController(Context context,
             String preferenceKey) {
@@ -39,3 +40,4 @@ public class ModuleLicensesListPreferenceController extends BasePreferenceContro
                 : CONDITIONALLY_UNAVAILABLE;
     }
 }
+// LINT.ThenChange(ModuleLicensesScreen.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/ModuleLicensesScreen.kt b/src/com/android/settings/deviceinfo/legal/ModuleLicensesScreen.kt
new file mode 100644
index 00000000000..c7f5e9c05d6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/legal/ModuleLicensesScreen.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import com.android.settings.R
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+// LINT.IfChange
+@ProvidePreferenceScreen
+class ModuleLicensesScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.module_license_title
+
+    // We need to avoid directly assign fragment attribute in the bind() API. So we need to create
+    // a screen and provide it to its parent screen LegalSettingsScreen.
+    // By the way, we also need to set the isFlagEnabled() as false. Let system render the legacy
+    // UI. The hierarchy will be added while migrating this page.
+    override fun isFlagEnabled(context: Context) = false
+
+    override fun fragmentClass() = ModuleLicensesDashboard::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    override fun isAvailable(context: Context): Boolean {
+        val modules = context.packageManager.getInstalledModules(/* flags= */ 0)
+        return modules.any {
+            try {
+                ModuleLicenseProvider.getPackageAssetManager(context.packageManager, it.packageName)
+                    .list("")
+                    ?.contains(ModuleLicenseProvider.GZIPPED_LICENSE_FILE_NAME) == true
+            } catch (e: Exception) {
+                false
+            }
+        }
+    }
+
+    companion object {
+        const val KEY = "module_license"
+    }
+}
+// LINT.ThenChange(ModuleLicensesListPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/legal/TermsPreferenceController.java b/src/com/android/settings/deviceinfo/legal/TermsPreferenceController.java
index bccc44579b9..764bde44a04 100644
--- a/src/com/android/settings/deviceinfo/legal/TermsPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/TermsPreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.legal;
 import android.content.Context;
 import android.content.Intent;
 
+// LINT.IfChange
 public class TermsPreferenceController extends LegalPreferenceController {
 
     private static final Intent INTENT = new Intent("android.settings.TERMS");
@@ -30,3 +31,4 @@ public class TermsPreferenceController extends LegalPreferenceController {
         return INTENT;
     }
 }
+// LINT.ThenChange(LegalPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreference.kt b/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreference.kt
new file mode 100644
index 00000000000..7a934c29058
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreference.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+class WallpaperAttributionsPreference :
+    PreferenceMetadata, PreferenceBinding, PreferenceAvailabilityProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.wallpaper_attributions
+
+    override val summary: Int
+        get() = R.string.wallpaper_attributions_values
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.isSelectable = false
+    }
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_wallpaper_attribution)
+
+    companion object {
+        const val KEY = "wallpaper_attributions"
+    }
+}
+// LINT.ThenChange(WallpaperAttributionsPreferenceController.java)
diff --git a/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java b/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
index caa5afcdc58..cc9c0928df9 100644
--- a/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
+// LINT.IfChange
 public class WallpaperAttributionsPreferenceController extends BasePreferenceController {
 
     public WallpaperAttributionsPreferenceController(Context context, String key) {
@@ -33,3 +34,4 @@ public class WallpaperAttributionsPreferenceController extends BasePreferenceCon
                 : UNSUPPORTED_ON_DEVICE;
     }
 }
+// LINT.ThenChange(WallpaperAttributionsPreference.kt)
diff --git a/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceController.java b/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceController.java
index 9d8b3f95027..ebb9152d80a 100644
--- a/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.legal;
 import android.content.Context;
 import android.content.Intent;
 
+// LINT.IfChange
 public class WebViewLicensePreferenceController extends LegalPreferenceController {
 
     private static final Intent INTENT = new Intent("android.settings.WEBVIEW_LICENSE");
@@ -30,3 +31,4 @@ public class WebViewLicensePreferenceController extends LegalPreferenceControlle
         return INTENT;
     }
 }
+// LINT.ThenChange(LegalPreference.kt)
diff --git a/src/com/android/settings/display/AdaptiveSleepPreference.kt b/src/com/android/settings/display/AdaptiveSleepPreference.kt
new file mode 100644
index 00000000000..a1600017c35
--- /dev/null
+++ b/src/com/android/settings/display/AdaptiveSleepPreference.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.SensorPrivacyManager
+import android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener
+import android.hardware.SensorPrivacyManager.Sensors.CAMERA
+import android.os.PowerManager
+import android.os.UserManager
+import android.provider.Settings
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settingslib.RestrictedSwitchPreference
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsSecureStore
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.TwoStatePreference
+import com.android.settingslib.preference.PreferenceBindingPlaceholder
+import com.android.settingslib.preference.SwitchPreferenceBinding
+
+// LINT.IfChange
+class AdaptiveSleepPreference :
+    TwoStatePreference,
+    SwitchPreferenceBinding,
+    PreferenceLifecycleProvider,
+    PreferenceBindingPlaceholder, // not needed once controller class is cleaned up
+    PreferenceAvailabilityProvider,
+    PreferenceRestrictionMixin {
+
+    private var broadcastReceiver: BroadcastReceiver? = null
+    private var sensorPrivacyChangedListener: OnSensorPrivacyChangedListener? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.adaptive_sleep_title
+
+    override val summary: Int
+        get() = R.string.adaptive_sleep_description
+
+    override fun isIndexable(context: Context) = false
+
+    override fun isEnabled(context: Context) =
+        super<PreferenceRestrictionMixin>.isEnabled(context) && context.canBeEnabled()
+
+    override val restrictionKeys: Array<String>
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT)
+
+    override fun isAvailable(context: Context) = context.isAdaptiveSleepSupported()
+
+    override fun createWidget(context: Context) = RestrictedSwitchPreference(context)
+
+    override fun storage(context: Context): KeyValueStore = Storage(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class Storage(
+        private val context: Context,
+        private val settingsStore: SettingsStore = SettingsSecureStore.get(context),
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(key)
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (context.canBeEnabled() && settingsStore.getBoolean(key) == true) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =
+            settingsStore.setBoolean(key, value as Boolean?)
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        val receiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(receiverContext: Context, intent: Intent) {
+                    context.notifyPreferenceChange(KEY)
+                }
+            }
+        context.registerReceiver(
+            receiver,
+            IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED),
+        )
+        broadcastReceiver = receiver
+
+        val listener = OnSensorPrivacyChangedListener { _, _ ->
+            context.notifyPreferenceChange(KEY)
+        }
+        SensorPrivacyManager.getInstance(context).addSensorPrivacyListener(CAMERA, listener)
+        sensorPrivacyChangedListener = listener
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        broadcastReceiver?.let { context.unregisterReceiver(it) }
+        sensorPrivacyChangedListener?.let {
+            SensorPrivacyManager.getInstance(context).removeSensorPrivacyListener(it)
+        }
+    }
+
+    companion object {
+        const val KEY = Settings.Secure.ADAPTIVE_SLEEP
+
+        @Suppress("DEPRECATION")
+        private fun Context.canBeEnabled() =
+            AdaptiveSleepPreferenceController.hasSufficientPermission(packageManager) &&
+                getSystemService(PowerManager::class.java)?.isPowerSaveMode != true &&
+                !SensorPrivacyManager.getInstance(this).isSensorPrivacyEnabled(CAMERA)
+    }
+}
+// LINT.ThenChange(AdaptiveSleepPreferenceController.java)
diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index 725b956a60b..82a8709df5e 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -20,19 +20,16 @@ import static android.hardware.SensorPrivacyManager.Sensors.CAMERA;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.display.UtilsKt.isAdaptiveSleepSupported;
 
 import android.Manifest;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.hardware.SensorPrivacyManager;
 import android.os.PowerManager;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.service.attention.AttentionService;
-import android.text.TextUtils;
 
 import androidx.preference.PreferenceScreen;
 
@@ -45,9 +42,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import com.google.common.annotations.VisibleForTesting;
 
+// LINT.IfChange
 /** The controller for Screen attention switch preference. */
 public class AdaptiveSleepPreferenceController {
-    public static final String PREFERENCE_KEY = "adaptive_sleep";
+    public static final String PREFERENCE_KEY = Settings.Secure.ADAPTIVE_SLEEP;
     private static final int DEFAULT_VALUE = 0;
     private final SensorPrivacyManager mPrivacyManager;
     private final RestrictionUtils mRestrictionUtils;
@@ -144,28 +142,10 @@ public class AdaptiveSleepPreferenceController {
                 : UNSUPPORTED_ON_DEVICE;
     }
 
-    static boolean isAdaptiveSleepSupported(Context context) {
-        return context.getResources().getBoolean(
-                com.android.internal.R.bool.config_adaptive_sleep_available)
-                && isAttentionServiceAvailable(context);
-    }
-
-    private static boolean isAttentionServiceAvailable(Context context) {
-        final PackageManager packageManager = context.getPackageManager();
-        final String resolvePackage = packageManager.getAttentionServicePackageName();
-        if (TextUtils.isEmpty(resolvePackage)) {
-            return false;
-        }
-        final Intent intent = new Intent(AttentionService.SERVICE_INTERFACE).setPackage(
-                resolvePackage);
-        final ResolveInfo resolveInfo = packageManager.resolveService(intent,
-                PackageManager.MATCH_SYSTEM_ONLY);
-        return resolveInfo != null && resolveInfo.serviceInfo != null;
-    }
-
     static boolean hasSufficientPermission(PackageManager packageManager) {
         final String attentionPackage = packageManager.getAttentionServicePackageName();
         return attentionPackage != null && packageManager.checkPermission(
                 Manifest.permission.CAMERA, attentionPackage) == PackageManager.PERMISSION_GRANTED;
     }
 }
+// LINT.ThenChange(AdaptiveSleepPreference.kt)
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt
new file mode 100644
index 00000000000..e50b00b6345
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.AmbientDisplayConfiguration
+import android.os.SystemProperties
+import android.os.UserHandle
+import android.os.UserManager
+import android.provider.Settings.Secure.DOZE_ALWAYS_ON
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.datastore.SettingsSecureStore
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+
+// LINT.IfChange
+class AmbientDisplayAlwaysOnPreference :
+    SwitchPreference(KEY, R.string.doze_always_on_title, R.string.doze_always_on_summary),
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider,
+    PreferenceRestrictionMixin {
+
+    private var keyMappingObserver: KeyedObserver<String>? = null
+
+    override val keywords: Int
+        get() = R.string.keywords_always_show_time_info
+
+    override val restrictionKeys: Array<String>
+        get() = arrayOf(UserManager.DISALLOW_AMBIENT_DISPLAY)
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override fun isAvailable(context: Context) =
+        !SystemProperties.getBoolean(PROP_AWARE_AVAILABLE, false) &&
+            AmbientDisplayConfiguration(context).alwaysOnAvailableForUser(UserHandle.myUserId())
+
+    override fun getSummary(context: Context): CharSequence? =
+        context.getText(
+            when {
+                isAodSuppressedByBedtime(context) -> R.string.aware_summary_when_bedtime_on
+                else -> R.string.doze_always_on_summary
+            }
+        )
+
+    override fun storage(context: Context): KeyValueStore = Storage(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        val storage = SettingsSecureStore.get(context)
+        keyMappingObserver =
+            KeyedObserver<String> { _, reason -> storage.notifyChange(KEY, reason) }
+                .also { storage.addObserver(DOZE_ALWAYS_ON, it, HandlerExecutor.main) }
+    }
+
+    override fun onDestroy(context: PreferenceLifecycleContext) {
+        keyMappingObserver?.let {
+            SettingsSecureStore.get(context).removeObserver(DOZE_ALWAYS_ON, it)
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    class Storage(
+        private val context: Context,
+        private val settingsStore: SettingsStore = SettingsSecureStore.get(context),
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(DOZE_ALWAYS_ON)
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            context.resources.getBoolean(com.android.internal.R.bool.config_dozeAlwaysOnEnabled)
+                as T
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            settingsStore.getValue(DOZE_ALWAYS_ON, valueType) ?: getDefaultValue(key, valueType)
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =
+            settingsStore.setValue(DOZE_ALWAYS_ON, valueType, value)
+    }
+
+    companion object {
+        const val KEY = "ambient_display_always_on"
+        private const val PROP_AWARE_AVAILABLE = "ro.vendor.aware_available"
+    }
+}
+// LINT.ThenChange(AmbientDisplayAlwaysOnPreferenceController.java)
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 245803493e2..17cecad0810 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -29,6 +29,7 @@ import androidx.preference.Preference;
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 
+// LINT.IfChange
 public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
 
     private final int ON = 1;
@@ -130,3 +131,4 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
         return powerManager.isAmbientDisplaySuppressedForTokenByApp(AOD_SUPPRESSED_TOKEN, uid);
     }
 }
+// LINT.ThenChange(AmbientDisplayAlwaysOnPreference.kt)
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 3014f62b0a6..5635a9b8e50 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -22,28 +22,26 @@ import android.os.Process;
 import android.os.UserManager;
 import android.provider.Settings;
 
+import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.Flags;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.PrimarySwitchPreference;
 
+/**
+ * The top-level preference controller that updates the adaptive brightness.
+ */
+// LINT.IfChange
 public class AutoBrightnessPreferenceController extends TogglePreferenceController {
 
     private final String SYSTEM_KEY = SCREEN_BRIGHTNESS_MODE;
     private final int DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL;
 
-    private boolean mInSetupWizard;
-
-    public AutoBrightnessPreferenceController(Context context, String key) {
+    public AutoBrightnessPreferenceController(@NonNull Context context, @NonNull String key) {
         super(context, key);
     }
 
-    public void setInSetupWizard(boolean inSetupWizard) {
-        mInSetupWizard = inSetupWizard;
-    }
-
     @Override
     public boolean isChecked() {
         return Settings.System.getInt(mContext.getContentResolver(),
@@ -60,14 +58,10 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_automatic_brightness_available)) {
-            return UNSUPPORTED_ON_DEVICE;
-        }
-        if (mInSetupWizard && !Flags.addBrightnessSettingsInSuw()) {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
-        return AVAILABLE_UNSEARCHABLE;
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_automatic_brightness_available)
+                ? AVAILABLE_UNSEARCHABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -97,3 +91,4 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
         return R.string.menu_key_display;
     }
 }
+// LINT.ThenChange(AutoBrightnessScreen.kt)
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizard.java b/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizard.java
new file mode 100644
index 00000000000..7afe3ea9d8b
--- /dev/null
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizard.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.annotation.NonNull;
+
+import com.android.settings.accessibility.Flags;
+
+/**
+ * The top-level preference controller that updates the adaptive brightness in the SetupWizard.
+ */
+public class AutoBrightnessPreferenceControllerForSetupWizard
+        extends AutoBrightnessPreferenceController {
+
+    public AutoBrightnessPreferenceControllerForSetupWizard(@NonNull Context context,
+            @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        if (!Flags.addBrightnessSettingsInSuw()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return super.getAvailabilityStatus();
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return "";
+    }
+}
diff --git a/src/com/android/settings/display/AutoBrightnessScreen.kt b/src/com/android/settings/display/AutoBrightnessScreen.kt
new file mode 100644
index 00000000000..32d70adabee
--- /dev/null
+++ b/src/com/android/settings/display/AutoBrightnessScreen.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.UserManager
+import android.provider.Settings
+import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
+import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.PrimarySwitchPreference
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.BooleanValue
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenBinding
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class AutoBrightnessScreen :
+    PreferenceScreenCreator,
+    PreferenceScreenBinding,
+    PreferenceAvailabilityProvider,
+    PreferenceRestrictionMixin,
+    PersistentPreference<Boolean>,
+    BooleanValue {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.auto_brightness_title
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystScreenBrightnessMode()
+
+    override fun fragmentClass() = AutoBrightnessSettings::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    override fun storage(context: Context): KeyValueStore =
+        AutoBrightnessDataStore(SettingsSystemStore.get(context))
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(
+            com.android.internal.R.bool.config_automatic_brightness_available
+        )
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_BRIGHTNESS)
+
+    override val useAdminDisabledSummary: Boolean
+        get() = true
+
+    override fun createWidget(context: Context) = PrimarySwitchPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as PrimarySwitchPreference).apply {
+            isSwitchEnabled = isEnabled
+            // "true" is not the real default value (it is provided by AutoBrightnessDataStore)
+            isChecked = preferenceDataStore!!.getBoolean(key, true)
+        }
+    }
+
+    /**
+     * The datastore for brightness, which is persisted as integer but the external type is boolean.
+     */
+    @Suppress("UNCHECKED_CAST")
+    private class AutoBrightnessDataStore(private val settingsStore: SettingsStore) :
+        KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(key)
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            DEFAULT_VALUE.toBoolean() as T
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (settingsStore.getInt(key) ?: DEFAULT_VALUE).toBoolean() as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =
+            settingsStore.setInt(key, (value as? Boolean)?.toBrightnessMode())
+
+        /** Converts brightness mode integer to boolean. */
+        private fun Int.toBoolean() = this == SCREEN_BRIGHTNESS_MODE_AUTOMATIC
+
+        /** Converts boolean value to brightness mode integer. */
+        private fun Boolean.toBrightnessMode() =
+            if (this) SCREEN_BRIGHTNESS_MODE_AUTOMATIC else SCREEN_BRIGHTNESS_MODE_MANUAL
+    }
+
+    companion object {
+        const val KEY = Settings.System.SCREEN_BRIGHTNESS_MODE
+        private const val DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL
+    }
+}
diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
index a7113b3d490..b859c78af5f 100644
--- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java
+++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
@@ -35,6 +35,7 @@ import com.android.settings.overlay.FeatureFactory;
  * A controller to manage the switch for showing battery percentage in the status bar.
  */
 
+// LINT.IfChange
 public class BatteryPercentagePreferenceController extends BasePreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
@@ -69,7 +70,7 @@ public class BatteryPercentagePreferenceController extends BasePreferenceControl
         int setting = Settings.System.getInt(mContext.getContentResolver(),
                 SHOW_BATTERY_PERCENT,
                 mContext.getResources().getBoolean(
-                R.bool.config_defaultBatteryPercentageSetting) ? 1 : 0);
+                        R.bool.config_defaultBatteryPercentageSetting) ? 1 : 0);
 
         ((TwoStatePreference) preference).setChecked(setting == 1);
     }
@@ -84,3 +85,4 @@ public class BatteryPercentagePreferenceController extends BasePreferenceControl
         return true;
     }
 }
+// LINT.ThenChange(BatteryPercentageSwitchPreference.kt)
diff --git a/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt
new file mode 100644
index 00000000000..25623b37681
--- /dev/null
+++ b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.settings.SettingsEnums
+import android.content.Context
+import android.provider.Settings
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import com.android.settingslib.preference.SwitchPreferenceBinding
+
+// LINT.IfChange
+class BatteryPercentageSwitchPreference :
+    SwitchPreference(KEY, R.string.battery_percentage, R.string.battery_percentage_description),
+    SwitchPreferenceBinding,
+    PreferenceAvailabilityProvider,
+    Preference.OnPreferenceChangeListener {
+
+    override fun storage(context: Context): KeyValueStore =
+        BatteryPercentageStorage(context, SettingsSystemStore.get(context))
+
+    override fun isAvailable(context: Context): Boolean =
+        Utils.isBatteryPresent(context) &&
+            context.resources.getBoolean(
+                com.android.internal.R.bool.config_battery_percentage_setting_available
+            )
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.onPreferenceChangeListener = this
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+        val showPercentage = newValue as Boolean
+
+        featureFactory.metricsFeatureProvider.action(
+            preference.context,
+            SettingsEnums.OPEN_BATTERY_PERCENTAGE,
+            showPercentage,
+        )
+        return true
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private class BatteryPercentageStorage(
+        private val context: Context,
+        private val settingsStore: SettingsStore,
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(KEY)
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (settingsStore.getBoolean(key) ?: getDefaultValue(key, valueType)) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            settingsStore.setBoolean(key, value as Boolean)
+        }
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            context.resources.getBoolean(
+                com.android.internal.R.bool.config_defaultBatteryPercentageSetting
+            ) as T
+    }
+
+    companion object {
+        const val KEY = Settings.System.SHOW_BATTERY_PERCENT
+    }
+}
+// LINT.ThenChange(BatteryPercentagePreferenceController.java)
diff --git a/src/com/android/settings/display/BrightnessLevelPreference.kt b/src/com/android/settings/display/BrightnessLevelPreference.kt
new file mode 100644
index 00000000000..5e2f6f218d0
--- /dev/null
+++ b/src/com/android/settings/display/BrightnessLevelPreference.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.ActivityOptions
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.ACTION_SHOW_BRIGHTNESS_DIALOG
+import android.content.Intent.EXTRA_BRIGHTNESS_DIALOG_IS_FULL_WIDTH
+import android.hardware.display.BrightnessInfo
+import android.hardware.display.DisplayManager
+import android.hardware.display.DisplayManager.DisplayListener
+import android.os.UserManager
+import android.provider.Settings.System
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settings.core.SettingsBaseActivity
+import com.android.settingslib.RestrictedPreference
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX
+import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN
+import com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.preference.PreferenceBinding
+import com.android.settingslib.transition.SettingsTransitionHelper
+import java.text.NumberFormat
+
+// LINT.IfChange
+class BrightnessLevelPreference :
+    PreferenceMetadata,
+    PreferenceBinding,
+    PreferenceRestrictionMixin,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider,
+    Preference.OnPreferenceClickListener {
+
+    private var brightnessObserver: KeyedObserver<String>? = null
+    private var displayListener: DisplayListener? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.brightness
+
+    override val keywords: Int
+        get() = R.string.keywords_display_brightness_level
+
+    override fun getSummary(context: Context): CharSequence? =
+        NumberFormat.getPercentInstance().format(getCurrentBrightness(context))
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_BRIGHTNESS)
+
+    override val useAdminDisabledSummary: Boolean
+        get() = true
+
+    override fun createWidget(context: Context) = RestrictedPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.onPreferenceClickListener = this
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        val observer = KeyedObserver<String> { _, _ -> context.notifyPreferenceChange(KEY) }
+        brightnessObserver = observer
+        SettingsSystemStore.get(context)
+            .addObserver(System.SCREEN_AUTO_BRIGHTNESS_ADJ, observer, HandlerExecutor.main)
+
+        val listener =
+            object : DisplayListener {
+                override fun onDisplayAdded(displayId: Int) {}
+
+                override fun onDisplayRemoved(displayId: Int) {}
+
+                override fun onDisplayChanged(displayId: Int) {
+                    context.notifyPreferenceChange(KEY)
+                }
+            }
+        displayListener = listener
+        context.displayManager.registerDisplayListener(
+            listener,
+            HandlerExecutor.main,
+            /* eventFlags= */ 0,
+            DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS,
+        )
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        brightnessObserver?.let {
+            SettingsSystemStore.get(context).removeObserver(System.SCREEN_AUTO_BRIGHTNESS_ADJ, it)
+            brightnessObserver = null
+        }
+
+        displayListener?.let {
+            context.displayManager.unregisterDisplayListener(it)
+            displayListener = null
+        }
+    }
+
+    private val Context.displayManager: DisplayManager
+        get() = getSystemService(DisplayManager::class.java)!!
+
+    override fun onPreferenceClick(preference: Preference): Boolean {
+        val context = preference.context
+        val intent =
+            Intent(ACTION_SHOW_BRIGHTNESS_DIALOG)
+                .setPackage(Utils.SYSTEMUI_PACKAGE_NAME)
+                .putExtra(
+                    SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,
+                    SettingsTransitionHelper.TransitionType.TRANSITION_NONE,
+                )
+                .putExtra(EXTRA_BRIGHTNESS_DIALOG_IS_FULL_WIDTH, true)
+        val options =
+            ActivityOptions.makeCustomAnimation(
+                context,
+                android.R.anim.fade_in,
+                android.R.anim.fade_out,
+            )
+        context.startActivityForResult(preference.key, intent, 0, options.toBundle())
+        return true
+    }
+
+    private fun getCurrentBrightness(context: Context): Double {
+        val info: BrightnessInfo? = context.display.brightnessInfo
+        val value =
+            info?.run {
+                convertLinearToGammaFloat(brightness, brightnessMinimum, brightnessMaximum)
+            }
+        return getPercentage(value?.toDouble() ?: 0.0)
+    }
+
+    private fun getPercentage(value: Double): Double =
+        when {
+            value > GAMMA_SPACE_MAX -> 1.0
+            value < GAMMA_SPACE_MIN -> 0.0
+            else -> (value - GAMMA_SPACE_MIN) / (GAMMA_SPACE_MAX - GAMMA_SPACE_MIN)
+        }
+
+    companion object {
+        const val KEY = "brightness"
+    }
+}
+// LINT.ThenChange(BrightnessLevelPreferenceController.java)
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index a32c965cb29..269114643fb 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -20,7 +20,6 @@ import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;
 import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN;
 import static com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat;
 
-import android.annotation.Nullable;
 import android.app.ActivityOptions;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -37,12 +36,13 @@ import android.os.UserManager;
 import android.provider.Settings.System;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.accessibility.Flags;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SettingsBaseActivity;
@@ -54,18 +54,18 @@ import com.android.settingslib.transition.SettingsTransitionHelper;
 
 import java.text.NumberFormat;
 
+/**
+ * The top-level preference controller that updates the adaptive brightness level.
+ */
+// LINT.IfChange
 public class BrightnessLevelPreferenceController extends BasePreferenceController implements
         PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
-
-    private static final String TAG = "BrightnessPrefCtrl";
-
     private static final Uri BRIGHTNESS_ADJ_URI;
     private final ContentResolver mContentResolver;
     private final Handler mHandler = new Handler(Looper.getMainLooper());
     private final DisplayManager mDisplayManager;
     @Nullable
     private Preference mPreference;
-    private boolean mInSetupWizard;
 
     static {
         BRIGHTNESS_ADJ_URI = System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ);
@@ -94,11 +94,13 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle
         }
     };
 
-    public BrightnessLevelPreferenceController(Context context, Lifecycle lifecycle) {
+    public BrightnessLevelPreferenceController(@NonNull Context context,
+            @Nullable Lifecycle lifecycle) {
         this(context, context.getString(R.string.preference_key_brightness_level), lifecycle);
     }
 
-    private BrightnessLevelPreferenceController(Context context, String key, Lifecycle lifecycle) {
+    private BrightnessLevelPreferenceController(@NonNull Context context, @NonNull String key,
+            @Nullable Lifecycle lifecycle) {
         super(context, key);
         mDisplayManager = context.getSystemService(DisplayManager.class);
 
@@ -108,15 +110,8 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle
         mContentResolver = mContext.getContentResolver();
     }
 
-    public void setInSetupWizard(boolean inSetupWizard) {
-        mInSetupWizard = inSetupWizard;
-    }
-
     @Override
     public int getAvailabilityStatus() {
-        if (mInSetupWizard && !Flags.addBrightnessSettingsInSuw()) {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
         return AVAILABLE;
     }
 
@@ -138,8 +133,8 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle
     @Override
     public void onStart() {
         mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver);
-        mDisplayManager.registerDisplayListener(mDisplayListener, mHandler,
-                DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);
+        mDisplayManager.registerDisplayListener(mDisplayListener, mHandler, /* eventFlags= */ 0,
+                DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS);
         updatedSummary(mPreference);
     }
 
@@ -193,3 +188,4 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle
         return (value - min) / (max - min);
     }
 }
+// LINT.ThenChange(BrightnessLevelPreference.kt)
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizard.java b/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizard.java
new file mode 100644
index 00000000000..6e002aed5fa
--- /dev/null
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizard.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.accessibility.Flags;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * The top-level preference controller that updates the adaptive brightness level in the
+ * SetupWizard.
+ */
+public class BrightnessLevelPreferenceControllerForSetupWizard extends
+        BrightnessLevelPreferenceController {
+
+    public BrightnessLevelPreferenceControllerForSetupWizard(@NonNull Context context,
+            @Nullable Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        if (!Flags.addBrightnessSettingsInSuw()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return super.getAvailabilityStatus();
+    }
+}
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index f1bbfcd47b7..26b33da3729 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -34,6 +34,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
+// LINT.IfChange
 public class DarkUIPreferenceController extends TogglePreferenceController implements
         LifecycleObserver, OnStart, OnStop {
 
@@ -123,3 +124,4 @@ public class DarkUIPreferenceController extends TogglePreferenceController imple
         return AVAILABLE;
     }
 }
+// LINT.ThenChange(darkmode/DarkModeScreen.kt)
diff --git a/src/com/android/settings/display/DisplayScreen.kt b/src/com/android/settings/display/DisplayScreen.kt
new file mode 100644
index 00000000000..d8a6be11e21
--- /dev/null
+++ b/src/com/android/settings/display/DisplayScreen.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.DisplaySettings
+import com.android.settings.R
+import com.android.settings.Settings.DisplaySettingsActivity
+import com.android.settings.display.darkmode.DarkModeScreen
+import com.android.settings.flags.Flags
+import com.android.settings.security.LockScreenPreferenceScreen
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+open class DisplayScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.display_settings
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_display_filled
+            else -> R.drawable.ic_settings_display_white
+        }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystDisplaySettingsScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = DisplaySettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +BrightnessLevelPreference()
+            +AutoBrightnessScreen.KEY
+            +LockScreenPreferenceScreen.KEY
+            +DarkModeScreen.KEY
+            +PeakRefreshRateSwitchPreference()
+        }
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, DisplaySettingsActivity::class.java, metadata?.key)
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_top_level_display)
+
+    companion object {
+        const val KEY = "display_settings_screen"
+    }
+}
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 261eaf1316e..740a726a5f8 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -40,6 +40,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
 
 import java.util.concurrent.Executor;
 
+// LINT.IfChange
 public class PeakRefreshRatePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnStop {
 
@@ -196,3 +197,4 @@ public class PeakRefreshRatePreferenceController extends TogglePreferenceControl
         return defaultPeakRefreshRate;
     }
 }
+// LINT.ThenChange(PeakRefreshRateSwitchPreference.kt)
diff --git a/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt
new file mode 100644
index 00000000000..3240616cab7
--- /dev/null
+++ b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.DisplayManager
+import android.provider.DeviceConfig
+import android.provider.Settings.System.PEAK_REFRESH_RATE
+import com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE
+import com.android.internal.display.RefreshRateSettingsUtils.findHighestRefreshRateAmongAllDisplays
+import com.android.internal.display.RefreshRateSettingsUtils.findHighestRefreshRateForDefaultDisplay
+import com.android.server.display.feature.flags.Flags
+import com.android.settings.R
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import kotlin.math.roundToInt
+
+// LINT.IfChange
+class PeakRefreshRateSwitchPreference :
+    SwitchPreference(KEY, R.string.peak_refresh_rate_title),
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider {
+
+    private var propertiesChangedListener: DeviceConfig.OnPropertiesChangedListener? = null
+
+    override fun storage(context: Context): KeyValueStore =
+        PeakRefreshRateStore(context, SettingsSystemStore.get(context))
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_smooth_display) &&
+            context.peakRefreshRate > DEFAULT_REFRESH_RATE
+
+    override fun getSummary(context: Context): CharSequence? =
+        context.getString(R.string.peak_refresh_rate_summary, context.peakRefreshRate.roundToInt())
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        val listener =
+            DeviceConfig.OnPropertiesChangedListener {
+                // Got notified if any property has been changed in NAMESPACE_DISPLAY_MANAGER. The
+                // KEY_PEAK_REFRESH_RATE_DEFAULT value could be added, changed, removed or
+                // unchanged.
+                // Just force a UI update for any case.
+                context.notifyPreferenceChange(KEY)
+            }
+
+        propertiesChangedListener = listener
+
+        DeviceConfig.addOnPropertiesChangedListener(
+            DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
+            HandlerExecutor.main,
+            listener,
+        )
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        propertiesChangedListener?.let {
+            DeviceConfig.removeOnPropertiesChangedListener(it)
+            propertiesChangedListener = null
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private class PeakRefreshRateStore(
+        private val context: Context,
+        private val settingsStore: SettingsStore,
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(key)
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>): T? {
+            if (key != KEY) return super.getDefaultValue(key, valueType)
+            return context.defaultPeakRefreshRate.refreshRateAsBoolean(context) as T
+        }
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
+            if (key != KEY) return null
+            val refreshRate = settingsStore.getFloat(KEY) ?: context.defaultPeakRefreshRate
+            return refreshRate.refreshRateAsBoolean(context) as T
+        }
+
+        private fun Float.refreshRateAsBoolean(context: Context) =
+            this.isInfinite() || roundToInt() == context.peakRefreshRate.roundToInt()
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =
+            when {
+                key != KEY -> {}
+                value == null -> settingsStore.setFloat(KEY, null)
+                else -> {
+                    val peakRefreshRate =
+                        if (value as Boolean) context.refreshRateIfON() else DEFAULT_REFRESH_RATE
+                    settingsStore.setFloat(KEY, peakRefreshRate)
+                }
+            }
+
+        private fun Context.refreshRateIfON() =
+            when {
+                Flags.backUpSmoothDisplayAndForcePeakRefreshRate() -> Float.POSITIVE_INFINITY
+                else -> peakRefreshRate
+            }
+    }
+
+    companion object {
+        const val KEY = PEAK_REFRESH_RATE
+        private const val INVALIDATE_REFRESH_RATE: Float = -1f
+
+        private val Context.peakRefreshRate: Float
+            get() =
+                Math.round(
+                        when {
+                            Flags.backUpSmoothDisplayAndForcePeakRefreshRate() ->
+                                findHighestRefreshRateAmongAllDisplays(this)
+                            else -> findHighestRefreshRateForDefaultDisplay(this)
+                        }
+                    )
+                    .toFloat()
+
+        private val Context.defaultPeakRefreshRate: Float
+            get() {
+                val defaultPeakRefreshRate =
+                    DeviceConfig.getFloat(
+                        DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
+                        DisplayManager.DeviceConfig.KEY_PEAK_REFRESH_RATE_DEFAULT,
+                        INVALIDATE_REFRESH_RATE,
+                    )
+                if (defaultPeakRefreshRate != INVALIDATE_REFRESH_RATE) return defaultPeakRefreshRate
+                return resources
+                    .getInteger(com.android.internal.R.integer.config_defaultPeakRefreshRate)
+                    .toFloat()
+            }
+    }
+}
+// LINT.ThenChange(PeakRefreshRatePreferenceController.java)
diff --git a/src/com/android/settings/display/ScreenResolutionFragment.java b/src/com/android/settings/display/ScreenResolutionFragment.java
index a2ad25ff96d..d9718f66f93 100644
--- a/src/com/android/settings/display/ScreenResolutionFragment.java
+++ b/src/com/android/settings/display/ScreenResolutionFragment.java
@@ -325,11 +325,10 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
             }
 
             final DisplayDensityUtils density = new DisplayDensityUtils(mContext);
-            final int currentIndex = density.getCurrentIndexForDefaultDisplay();
-            final int defaultDensity = density.getDefaultDensityForDefaultDisplay();
+            final int currentIndex = density.getCurrentIndex();
+            final int defaultDensity = density.getDefaultDensity();
 
-            if (density.getDefaultDisplayDensityValues()[mCurrentIndex]
-                    == density.getDefaultDensityForDefaultDisplay()) {
+            if (density.getValues()[mCurrentIndex] == density.getDefaultDensity()) {
                 return;
             }
 
@@ -373,20 +372,19 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
             /* If current density is the same as a default density of other resolutions,
              * then mCurrentIndex may be out of boundary.
              */
-            if (density.getDefaultDisplayDensityValues().length <= mCurrentIndex) {
-                mCurrentIndex = density.getCurrentIndexForDefaultDisplay();
+            if (density.getValues().length <= mCurrentIndex) {
+                mCurrentIndex = density.getCurrentIndex();
             }
-            if (density.getDefaultDisplayDensityValues()[mCurrentIndex]
-                    != density.getDefaultDensityForDefaultDisplay()) {
+            if (density.getValues()[mCurrentIndex] != density.getDefaultDensity()) {
                 density.setForcedDisplayDensity(mCurrentIndex);
             }
 
-            mDefaultDensity = density.getDefaultDensityForDefaultDisplay();
+            mDefaultDensity = density.getDefaultDensity();
         }
 
         private boolean isDensityChanged() {
             final DisplayDensityUtils density = new DisplayDensityUtils(mContext);
-            if (density.getDefaultDensityForDefaultDisplay() == mDefaultDensity) {
+            if (density.getDefaultDensity() == mDefaultDensity) {
                 return false;
             }
 
diff --git a/src/com/android/settings/display/ScreenTimeoutScreen.kt b/src/com/android/settings/display/ScreenTimeoutScreen.kt
new file mode 100644
index 00000000000..9dcd1021621
--- /dev/null
+++ b/src/com/android/settings/display/ScreenTimeoutScreen.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.Settings.ScreenTimeoutActivity
+import com.android.settings.flags.Flags
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+// TODO(b/368359967): The entry point logic is not yet migrated
+@ProvidePreferenceScreen
+class ScreenTimeoutScreen : PreferenceScreenCreator {
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.screen_timeout
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystScreenTimeout()
+
+    override fun fragmentClass() = ScreenTimeoutSettings::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) { +AdaptiveSleepPreference() }
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, ScreenTimeoutActivity::class.java, metadata?.key)
+
+    companion object {
+        const val KEY = "screen_timeout"
+    }
+}
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index 2d229a3cfe7..d4ca48ebfb7 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -20,6 +20,8 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.OTHER_OPT
 import static android.hardware.SensorPrivacyManager.Sensors.CAMERA;
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
+import static com.android.settings.display.UtilsKt.isAdaptiveSleepSupported;
+
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.BroadcastReceiver;
@@ -34,7 +36,9 @@ import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -80,7 +84,9 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
                 @Override
                 public void onReceive(Context context, Intent intent) {
                     mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
-                    mAdaptiveSleepController.updatePreference();
+                    if (!isCatalystEnabled()) {
+                        mAdaptiveSleepController.updatePreference();
+                    }
                 }
             };
 
@@ -123,7 +129,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         mDevicePolicyManager = mContext.getSystemService(DevicePolicyManager.class);
         mInitialEntries = getResources().getStringArray(R.array.screen_timeout_entries);
         mInitialValues = getResources().getStringArray(R.array.screen_timeout_values);
-        mAdaptiveSleepController = new AdaptiveSleepPreferenceController(context);
         mAdaptiveSleepPermissionController =
                 new AdaptiveSleepPermissionPreferenceController(context);
         mAdaptiveSleepCameraStatePreferenceController =
@@ -136,8 +141,12 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         mPrivacyPreference.setSelectable(false);
         mPrivacyPreference.setLayoutResource(
                 com.android.settingslib.widget.preference.footer.R.layout.preference_footer);
-        mPrivacyManager = SensorPrivacyManager.getInstance(context);
-        mPrivacyChangedListener = (sensor, enabled) -> mAdaptiveSleepController.updatePreference();
+        if (!isCatalystEnabled()) {
+            mPrivacyManager = SensorPrivacyManager.getInstance(context);
+            mAdaptiveSleepController = new AdaptiveSleepPreferenceController(context);
+            mPrivacyChangedListener =
+                    (sensor, enabled) -> mAdaptiveSleepController.updatePreference();
+        }
         mAdditionalTogglePreferenceController = FeatureFactory.getFeatureFactory()
                 .getDisplayFeatureProvider().createAdditionalPreference(context);
     }
@@ -166,10 +175,12 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         mAdaptiveSleepPermissionController.updateVisibility();
         mAdaptiveSleepCameraStatePreferenceController.updateVisibility();
         mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
-        mAdaptiveSleepController.updatePreference();
         mContext.registerReceiver(
                 mReceiver, new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
-        mPrivacyManager.addSensorPrivacyListener(CAMERA, mPrivacyChangedListener);
+        if (!isCatalystEnabled()) {
+            mAdaptiveSleepController.updatePreference();
+            mPrivacyManager.addSensorPrivacyListener(CAMERA, mPrivacyChangedListener);
+        }
         mIsUserAuthenticated = false;
         FeatureFactory.getFeatureFactory().getDisplayFeatureProvider().updatePreference(
                 mAdditionalTogglePreferenceController);
@@ -179,13 +190,17 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
     public void onStop() {
         super.onStop();
         mContext.unregisterReceiver(mReceiver);
-        mPrivacyManager.removeSensorPrivacyListener(CAMERA, mPrivacyChangedListener);
+        if (!isCatalystEnabled()) {
+            mPrivacyManager.removeSensorPrivacyListener(CAMERA, mPrivacyChangedListener);
+        }
     }
 
     @Override
     public void updateCandidates() {
         final String defaultKey = getDefaultKey();
         final PreferenceScreen screen = getPreferenceScreen();
+        // Adaptive sleep preference is added to the screen when catalyst is enabled
+        Preference adaptiveSleepPreference = screen.findPreference(AdaptiveSleepPreference.KEY);
         screen.removeAll();
 
         final List<? extends CandidateInfo> candidateList = getCandidates();
@@ -222,10 +237,16 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         FeatureFactory.getFeatureFactory().getDisplayFeatureProvider()
                 .addToScreen(mAdditionalTogglePreferenceController, screen);
 
-        if (isScreenAttentionAvailable(getContext())) {
+        if (isAdaptiveSleepSupported(getContext())) {
             mAdaptiveSleepPermissionController.addToScreen(screen);
             mAdaptiveSleepCameraStatePreferenceController.addToScreen(screen);
-            mAdaptiveSleepController.addToScreen(screen);
+            if (adaptiveSleepPreference != null) {
+                // reset order for appending
+                adaptiveSleepPreference.setOrder(Preference.DEFAULT_ORDER);
+                screen.addPreference(adaptiveSleepPreference);
+            } else {
+                mAdaptiveSleepController.addToScreen(screen);
+            }
             mAdaptiveSleepBatterySaverPreferenceController.addToScreen(screen);
             screen.addPreference(mPrivacyPreference);
         }
@@ -307,6 +328,11 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         return R.xml.screen_timeout_settings;
     }
 
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return ScreenTimeoutScreen.KEY;
+    }
+
     @Override
     public int getHelpResource() {
         return R.string.help_url_adaptive_sleep;
@@ -352,10 +378,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
         }
     }
 
-    private static boolean isScreenAttentionAvailable(Context context) {
-        return AdaptiveSleepPreferenceController.isAdaptiveSleepSupported(context);
-    }
-
     private static long getTimeoutFromKey(String key) {
         return Long.parseLong(key);
     }
@@ -423,7 +445,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
             new BaseSearchIndexProvider(R.xml.screen_timeout_settings) {
                 public List<SearchIndexableRaw> getRawDataToIndex(
                         Context context, boolean enabled) {
-                    if (!isScreenAttentionAvailable(context)) {
+                    if (!isAdaptiveSleepSupported(context)) {
                         return null;
                     }
                     final Resources res = context.getResources();
diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java
index af77a0edb98..f47d7da4384 100644
--- a/src/com/android/settings/display/ScreenZoomPreference.java
+++ b/src/com/android/settings/display/ScreenZoomPreference.java
@@ -36,13 +36,13 @@ public class ScreenZoomPreference extends Preference {
                 android.R.attr.preferenceStyle));
 
         final DisplayDensityUtils density = new DisplayDensityUtils(context);
-        final int defaultIndex = density.getCurrentIndexForDefaultDisplay();
+        final int defaultIndex = density.getCurrentIndex();
         if (defaultIndex < 0) {
             setVisible(false);
             setEnabled(false);
         } else if (TextUtils.isEmpty(getSummary())) {
-            final String[] entries = density.getDefaultDisplayDensityEntries();
-            final int currentIndex = density.getCurrentIndexForDefaultDisplay();
+            final String[] entries = density.getEntries();
+            final int currentIndex = density.getCurrentIndex();
             setSummary(entries[currentIndex]);
         }
     }
diff --git a/src/com/android/settings/display/Utils.kt b/src/com/android/settings/display/Utils.kt
new file mode 100644
index 00000000000..7ee63cd9511
--- /dev/null
+++ b/src/com/android/settings/display/Utils.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Intent
+import android.content.pm.PackageManager
+import android.service.attention.AttentionService
+
+fun Context.isAdaptiveSleepSupported() =
+    resources.getBoolean(com.android.internal.R.bool.config_adaptive_sleep_available) &&
+        isAttentionServiceAvailable()
+
+private fun Context.isAttentionServiceAvailable(): Boolean {
+    val packageManager = getPackageManager()
+    val packageName = packageManager.attentionServicePackageName
+    if (packageName.isNullOrEmpty()) return false
+    val intent = Intent(AttentionService.SERVICE_INTERFACE).setPackage(packageName)
+    val resolveInfo = packageManager.resolveService(intent, PackageManager.MATCH_SYSTEM_ONLY)
+    return resolveInfo != null && resolveInfo.serviceInfo != null
+}
diff --git a/src/com/android/settings/display/darkmode/DarkModePreference.java b/src/com/android/settings/display/darkmode/DarkModePreference.java
index a1440eec9c9..ff211317b12 100644
--- a/src/com/android/settings/display/darkmode/DarkModePreference.java
+++ b/src/com/android/settings/display/darkmode/DarkModePreference.java
@@ -14,7 +14,6 @@
 
 package com.android.settings.display.darkmode;
 
-import android.app.UiModeManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.PowerManager;
@@ -28,39 +27,44 @@ import com.android.settingslib.PrimarySwitchPreference;
  */
 public class DarkModePreference extends PrimarySwitchPreference {
 
-    private UiModeManager mUiModeManager;
     private DarkModeObserver mDarkModeObserver;
-    private PowerManager mPowerManager;
-    private Runnable mCallback;
-
-    private TimeFormatter mFormat;
+    private boolean isCatalystEnabled;
 
     public DarkModePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mDarkModeObserver = new DarkModeObserver(context);
-        mUiModeManager = context.getSystemService(UiModeManager.class);
-        mPowerManager = context.getSystemService(PowerManager.class);
-        mFormat = new TimeFormatter(context);
-        mCallback = () -> {
-            final boolean batterySaver = mPowerManager.isPowerSaveMode();
-            final boolean active = (getContext().getResources().getConfiguration().uiMode
-                    & Configuration.UI_MODE_NIGHT_YES) != 0;
-            setSwitchEnabled(!batterySaver);
-            updateSummary(batterySaver, active);
-        };
-        mDarkModeObserver.subscribe(mCallback);
+    }
+
+    /**
+     * Sets if catalyst is enabled on the preference.
+     */
+    public void setCatalystEnabled(boolean catalystEnabled) {
+        isCatalystEnabled = catalystEnabled;
     }
 
     @Override
     public void onAttached() {
         super.onAttached();
-        mDarkModeObserver.subscribe(mCallback);
+        if (!isCatalystEnabled) {
+            Context context = getContext();
+            mDarkModeObserver = new DarkModeObserver(context);
+            Runnable callback = () -> {
+                PowerManager powerManager = context.getSystemService(PowerManager.class);
+                final boolean batterySaver = powerManager.isPowerSaveMode();
+                final boolean active = (context.getResources().getConfiguration().uiMode
+                        & Configuration.UI_MODE_NIGHT_YES) != 0;
+                setSwitchEnabled(!batterySaver);
+                updateSummary(batterySaver, active);
+            };
+            mDarkModeObserver.subscribe(callback);
+        }
     }
 
     @Override
     public void onDetached() {
         super.onDetached();
-        mDarkModeObserver.unsubscribe();
+        if (!isCatalystEnabled) {
+            mDarkModeObserver.unsubscribe();
+        }
     }
 
     private void updateSummary(boolean batterySaver, boolean active) {
diff --git a/src/com/android/settings/display/darkmode/DarkModeScreen.kt b/src/com/android/settings/display/darkmode/DarkModeScreen.kt
new file mode 100644
index 00000000000..7f8087a4928
--- /dev/null
+++ b/src/com/android/settings/display/darkmode/DarkModeScreen.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.darkmode
+
+import android.app.UiModeManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.res.Configuration
+import android.os.PowerManager
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.PrimarySwitchPreference
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.BooleanValue
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenBinding
+import com.android.settingslib.preference.PreferenceScreenCreator
+import java.util.WeakHashMap
+
+// LINT.IfChange
+@ProvidePreferenceScreen
+class DarkModeScreen :
+    PreferenceScreenCreator,
+    PreferenceScreenBinding,
+    PersistentPreference<Boolean>,
+    BooleanValue,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider {
+
+    /**
+     * States for different screens.
+     *
+     * The "Dark mode" appears in several screens. And in Android split-screen mode, more than one
+     * "Dark mode" settings could be displayed at the same time. As [PreferenceScreenCreator] works
+     * like singleton, we need to register different broadcast receivers for different screens.
+     */
+    private val fragmentStates = WeakHashMap<PreferenceLifecycleContext, FragmentState>()
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.dark_ui_mode
+
+    override val keywords: Int
+        get() = R.string.keywords_dark_ui_mode
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystDarkUiMode()
+
+    override fun fragmentClass() = DarkModeSettingsFragment::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    override fun storage(context: Context): KeyValueStore = DarkModeStorage(context)
+
+    override fun createWidget(context: Context) = PrimarySwitchPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        if (preference is DarkModePreference) preference.setCatalystEnabled(true)
+        val context = preference.context
+        val primarySwitchPreference = preference as PrimarySwitchPreference
+        primarySwitchPreference.isSwitchEnabled = !context.isPowerSaveMode()
+        primarySwitchPreference.isChecked = context.isDarkMode()
+    }
+
+    override fun isEnabled(context: Context) = !context.isPowerSaveMode()
+
+    override fun getSummary(context: Context): CharSequence? {
+        val active = context.isDarkMode()
+        return when {
+            !context.isPowerSaveMode() -> AutoDarkTheme.getStatus(context, active)
+            active -> context.getString(R.string.dark_ui_mode_disabled_summary_dark_theme_on)
+            else -> context.getString(R.string.dark_ui_mode_disabled_summary_dark_theme_off)
+        }
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        val broadcastReceiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(receiverContext: Context, intent: Intent) {
+                    context.notifyPreferenceChange(KEY)
+                }
+            }
+        context.registerReceiver(
+            broadcastReceiver,
+            IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED),
+        )
+
+        val darkModeObserver = DarkModeObserver(context)
+        darkModeObserver.subscribe { context.notifyPreferenceChange(KEY) }
+
+        fragmentStates[context] = FragmentState(broadcastReceiver, darkModeObserver)
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        fragmentStates.remove(context)?.run {
+            context.unregisterReceiver(broadcastReceiver)
+            darkModeObserver.unsubscribe()
+        }
+    }
+
+    private class FragmentState(
+        val broadcastReceiver: BroadcastReceiver,
+        val darkModeObserver: DarkModeObserver,
+    )
+
+    /**
+     * Abstract storage for dark mode settings.
+     *
+     * The underlying storage is manipulated by [UiModeManager] but we do not need to worry about
+     * the details. Additionally, the observer is for UI purpose only right now, so use
+     * [NoOpKeyedObservable].
+     */
+    @Suppress("UNCHECKED_CAST")
+    private class DarkModeStorage(private val context: Context) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            when {
+                key == KEY && valueType == Boolean::class.javaObjectType ->
+                    context.isDarkMode() as T
+                else -> null
+            }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (key == KEY && value is Boolean) {
+                context.getSystemService(UiModeManager::class.java)?.setNightModeActivated(value)
+            }
+        }
+    }
+
+    companion object {
+        const val KEY = "dark_ui_mode"
+
+        private fun Context.isPowerSaveMode() =
+            getSystemService(PowerManager::class.java)?.isPowerSaveMode == true
+
+        private fun Context.isDarkMode() =
+            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) != 0
+    }
+}
+// LINT.ThenChange(../DarkUIPreferenceController.java)
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
index c4bef25b1cc..e05ae71a05a 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
@@ -16,12 +16,18 @@
 
 package com.android.settings.enterprise;
 
+import static android.security.advancedprotection.AdvancedProtectionManager.ADVANCED_PROTECTION_SYSTEM_ENTITY;
+
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
+import android.app.admin.EnforcingAdmin;
+import android.app.admin.UnknownAuthority;
+import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.security.advancedprotection.AdvancedProtectionManager;
 
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -53,37 +59,67 @@ public class ActionDisabledByAdminDialog extends Activity
 
     @androidx.annotation.VisibleForTesting
     EnforcedAdmin getAdminDetailsFromIntent(Intent intent) {
-        final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.of(UserHandle.myUserId()));
+        final EnforcedAdmin enforcedAdmin = new EnforcedAdmin(null, UserHandle.of(
+                UserHandle.myUserId()));
         if (intent == null) {
-            return admin;
+            return enforcedAdmin;
         }
-        admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+        enforcedAdmin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN,
+                ComponentName.class);
         int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
 
         Bundle adminDetails = null;
-        if (admin.component == null) {
-            DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
-            adminDetails = devicePolicyManager.getEnforcingAdminAndUserDetails(userId,
-                    getRestrictionFromIntent(intent));
-            if (adminDetails != null) {
-                admin.component = adminDetails.getParcelable(
-                        DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+        if (enforcedAdmin.component == null) {
+            DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
+            final String restriction = getRestrictionFromIntent(intent);
+            if (android.security.Flags.aapmApi() && dpm != null && restriction != null) {
+                // TODO(b/381025131): Move advanced protection logic to DevicePolicyManager or
+                //  elsewhere.
+                launchAdvancedProtectionDialogOrTryToSetAdminComponent(dpm, userId, restriction,
+                        enforcedAdmin);
+            } else {
+                adminDetails = dpm.getEnforcingAdminAndUserDetails(userId, restriction);
+                if (adminDetails != null) {
+                    enforcedAdmin.component = adminDetails.getParcelable(
+                            DevicePolicyManager.EXTRA_DEVICE_ADMIN, ComponentName.class);
+                }
             }
         }
 
         if (intent.hasExtra(Intent.EXTRA_USER)) {
-            admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
+            enforcedAdmin.user = intent.getParcelableExtra(Intent.EXTRA_USER, UserHandle.class);
         } else {
             if (adminDetails != null) {
                 userId = adminDetails.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
             }
             if (userId == UserHandle.USER_NULL) {
-                admin.user = null;
+                enforcedAdmin.user = null;
             } else {
-                admin.user = UserHandle.of(userId);
+                enforcedAdmin.user = UserHandle.of(userId);
             }
         }
-        return admin;
+        return enforcedAdmin;
+    }
+
+    private void launchAdvancedProtectionDialogOrTryToSetAdminComponent(DevicePolicyManager dpm,
+            int userId, String restriction, EnforcedAdmin enforcedAdmin) {
+        EnforcingAdmin enforcingAdmin = dpm.getEnforcingAdmin(userId, restriction);
+        if (enforcingAdmin == null) {
+            return;
+        }
+        if (enforcingAdmin.getAuthority() instanceof UnknownAuthority authority
+                && ADVANCED_PROTECTION_SYSTEM_ENTITY.equals(authority.getName())) {
+            AdvancedProtectionManager apm = getSystemService(AdvancedProtectionManager.class);
+            if (apm == null) {
+                return;
+            }
+            Intent apmSupportIntent = apm.createSupportIntentForPolicyIdentifierOrRestriction(
+                    restriction, /* type */ null);
+            startActivityAsUser(apmSupportIntent, UserHandle.of(userId));
+            finish();
+        } else {
+            enforcedAdmin.component = enforcingAdmin.getComponentName();
+        }
     }
 
     @androidx.annotation.VisibleForTesting
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index e922f7058be..288ec20a458 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -26,17 +26,12 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
 import com.android.settings.applications.appinfo.AppButtonsPreferenceController;
 import com.android.settings.applications.appinfo.ButtonActionDialogFragment;
 import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -47,13 +42,11 @@ import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUt
 import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.Utils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,9 +60,7 @@ import java.util.concurrent.Executors;
  * 2. Battery related controls for app(i.e uninstall, force stop)
  */
 public class AdvancedPowerUsageDetail extends DashboardFragment
-        implements ButtonActionDialogFragment.AppButtonsDialogListener,
-                Preference.OnPreferenceClickListener,
-                Preference.OnPreferenceChangeListener {
+        implements ButtonActionDialogFragment.AppButtonsDialogListener {
     public static final String TAG = "AdvancedPowerDetail";
     public static final String EXTRA_UID = "extra_uid";
     public static final String EXTRA_PACKAGE_NAME = "extra_package_name";
@@ -86,7 +77,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
 
     private static final String KEY_PREF_HEADER = "header_view";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
+    private static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_CATEGORY =
+            "background_usage_allowability_category";
 
     private static final int REQUEST_UNINSTALL = 0;
     private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
@@ -96,11 +88,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
     private PowerUsageTimeController mPowerUsageTimeController;
 
-    @VisibleForTesting LayoutPreference mHeaderPreference;
     @VisibleForTesting ApplicationsState mState;
     @VisibleForTesting ApplicationsState.AppEntry mAppEntry;
     @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @VisibleForTesting PrimarySwitchPreference mAllowBackgroundUsagePreference;
 
     @VisibleForTesting @BatteryOptimizeUtils.OptimizationMode
     int mOptimizationMode = BatteryOptimizeUtils.MODE_UNKNOWN;
@@ -242,17 +232,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
+        final Bundle bundle = getArguments();
+        final int uid = bundle.getInt(EXTRA_UID, 0);
+        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
+        mBatteryOptimizeUtils = new BatteryOptimizeUtils(getContext(), uid, packageName);
         mState = ApplicationsState.getInstance(getActivity().getApplication());
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        onCreateBackgroundUsageState(packageName);
-        mHeaderPreference = findPreference(KEY_PREF_HEADER);
-
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, UserHandle.myUserId());
         }
@@ -264,7 +248,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
 
         initHeader();
         mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
-        initFooter();
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 
@@ -299,29 +282,26 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
 
     @VisibleForTesting
     void initHeader() {
-        final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
+        final IntroPreference introPreference = findPreference(KEY_PREF_HEADER);
+        if (introPreference == null) {
+            return;
+        }
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
-        EntityHeaderController controller =
-                EntityHeaderController.newInstance(context, this, appSnippet)
-                        .setButtonActions(
-                                EntityHeaderController.ActionType.ACTION_NONE,
-                                EntityHeaderController.ActionType.ACTION_NONE);
 
         if (mAppEntry == null) {
-            controller.setLabel(bundle.getString(EXTRA_LABEL));
+            introPreference.setTitle(bundle.getString(EXTRA_LABEL));
 
             final int iconId = bundle.getInt(EXTRA_ICON_ID, 0);
             if (iconId == 0) {
-                controller.setIcon(context.getPackageManager().getDefaultActivityIcon());
+                introPreference.setIcon(context.getPackageManager().getDefaultActivityIcon());
             } else {
-                controller.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
+                introPreference.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
             }
         } else {
             mState.ensureIcon(mAppEntry);
-            controller.setLabel(mAppEntry);
-            controller.setIcon(mAppEntry);
-            controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
+            introPreference.setTitle(mAppEntry.label);
+            introPreference.setIcon(Utils.getBadgedIcon(context, mAppEntry.info));
         }
 
         if (mPowerUsageTimeController != null) {
@@ -337,32 +317,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
                     anomalyHintPrefKey,
                     anomalyHintText);
         }
-        controller.done(true /* rebindActions */);
-    }
-
-    @VisibleForTesting
-    void initFooter() {
-        final String stateString;
-        final String detailInfoString;
-        final Context context = getContext();
-
-        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
-            // Present optimized only string when the package name is invalid.
-            stateString = context.getString(R.string.manager_battery_usage_optimized_only);
-            detailInfoString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
-            // Present unrestricted only string when the package is system or default active app.
-            stateString = context.getString(R.string.manager_battery_usage_unrestricted_only);
-            detailInfoString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else {
-            // Present default string to normal app.
-            detailInfoString =
-                    context.getString(
-                            R.string.manager_battery_usage_allow_background_usage_summary);
-        }
-        mAllowBackgroundUsagePreference.setSummary(detailInfoString);
     }
 
     @Override
@@ -384,7 +338,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Bundle bundle = getArguments();
-        final int uid = bundle.getInt(EXTRA_UID, 0);
         final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
 
         mAppButtonsPreferenceController =
@@ -401,7 +354,12 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
             controllers.add(mPowerUsageTimeController);
         }
         controllers.add(mAppButtonsPreferenceController);
-        controllers.add(new AllowBackgroundPreferenceController(context, uid, packageName));
+        controllers.add(
+                new BackgroundUsageAllowabilityPreferenceController(
+                        context,
+                        /* dashboardFragment= */ this,
+                        KEY_BACKGROUND_USAGE_ALLOWABILITY_CATEGORY,
+                        mBatteryOptimizeUtils));
 
         return controllers;
     }
@@ -421,34 +379,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
         }
     }
 
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (!(preference instanceof PrimarySwitchPreference)
-                || !TextUtils.equals(preference.getKey(), KEY_ALLOW_BACKGROUND_USAGE)) {
-            return false;
-        }
-        PowerBackgroundUsageDetail.startPowerBackgroundUsageDetailPage(
-                getContext(), getArguments());
-        return true;
-    }
-
-    @Override
-    public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
-        if (!(preference instanceof PrimarySwitchPreference)
-                || !TextUtils.equals(preference.getKey(), KEY_ALLOW_BACKGROUND_USAGE)) {
-            return false;
-        }
-        if (newValue instanceof Boolean) {
-            final boolean isAllowBackgroundUsage = (boolean) newValue;
-            mBatteryOptimizeUtils.setAppUsageState(
-                    isAllowBackgroundUsage
-                            ? BatteryOptimizeUtils.MODE_OPTIMIZED
-                            : BatteryOptimizeUtils.MODE_RESTRICTED,
-                    Action.APPLY);
-        }
-        return true;
-    }
-
     private void logMetricCategory(int currentOptimizeMode) {
         if (currentOptimizeMode == mOptimizationMode) {
             return;
@@ -482,16 +412,4 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
                                     getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
                 });
     }
-
-    private void onCreateBackgroundUsageState(String packageName) {
-        mAllowBackgroundUsagePreference = findPreference(KEY_ALLOW_BACKGROUND_USAGE);
-        if (mAllowBackgroundUsagePreference != null) {
-            mAllowBackgroundUsagePreference.setOnPreferenceClickListener(this);
-            mAllowBackgroundUsagePreference.setOnPreferenceChangeListener(this);
-        }
-
-        mBatteryOptimizeUtils =
-                new BatteryOptimizeUtils(
-                        getContext(), getArguments().getInt(EXTRA_UID), packageName);
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java b/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java
deleted file mode 100644
index 52cec79599a..00000000000
--- a/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.MainSwitchPreference;
-
-/** Controller to update the app background usage state */
-public class AllowBackgroundPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "AllowBackgroundPreferenceController";
-
-    @VisibleForTesting static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
-
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public AllowBackgroundPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    private void setChecked(Preference preference, boolean checked) {
-        if (preference instanceof PrimarySwitchPreference) {
-            ((PrimarySwitchPreference) preference).setChecked(checked);
-        } else if (preference instanceof MainSwitchPreference) {
-            ((MainSwitchPreference) preference).setChecked(checked);
-        }
-    }
-
-    private void setEnabled(Preference preference, boolean enabled) {
-        if (preference instanceof PrimarySwitchPreference) {
-            ((PrimarySwitchPreference) preference).setEnabled(enabled);
-            ((PrimarySwitchPreference) preference).setSwitchEnabled(enabled);
-        } else if (preference instanceof MainSwitchPreference) {
-            ((MainSwitchPreference) preference).setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        setEnabled(preference, mBatteryOptimizeUtils.isOptimizeModeMutable());
-
-        final boolean isAllowBackground =
-                mBatteryOptimizeUtils.getAppOptimizationMode()
-                        != BatteryOptimizeUtils.MODE_RESTRICTED;
-        setChecked(preference, isAllowBackground);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_ALLOW_BACKGROUND_USAGE;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java
new file mode 100644
index 00000000000..bce439bad1f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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.PreferenceControllerMixin;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.PrimarySwitchPreference;
+
+/** Controller to update the manage battery usage preference in App Battery Usage page */
+public class BackgroundUsageAllowabilityPreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH =
+            "background_usage_allowability_switch";
+
+    private final BatteryOptimizeUtils mBatteryOptimizeUtils;
+    private final DashboardFragment mDashboardFragment;
+    @Nullable @VisibleForTesting PrimarySwitchPreference mBackgroundUsageAllowabilityPreference;
+
+    public BackgroundUsageAllowabilityPreferenceController(
+            @NonNull Context context,
+            @NonNull DashboardFragment dashboardFragment,
+            @NonNull String preferenceKey,
+            @NonNull BatteryOptimizeUtils batteryOptimizeUtils) {
+        super(context, preferenceKey);
+        mDashboardFragment = dashboardFragment;
+        mBatteryOptimizeUtils = batteryOptimizeUtils;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        updatePreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBackgroundUsageAllowabilityPreference =
+                screen.findPreference(KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH);
+        initPreferences();
+    }
+
+    @VisibleForTesting
+    void initPreferences() {
+        if (mBackgroundUsageAllowabilityPreference == null) {
+            return;
+        }
+        final String stateString;
+        final String detailInfoString;
+        boolean isPreferenceEnabled = true;
+        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
+            // Present "Optimized" only string if the package name is invalid.
+            stateString = mContext.getString(R.string.manager_battery_usage_optimized_only);
+            detailInfoString =
+                    mContext.getString(R.string.manager_battery_usage_footer_limited, stateString);
+            isPreferenceEnabled = false;
+        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
+            // Present "Unrestricted" only string if the package is system important apps.
+            stateString = mContext.getString(R.string.manager_battery_usage_unrestricted_only);
+            detailInfoString =
+                    mContext.getString(R.string.manager_battery_usage_footer_limited, stateString);
+            isPreferenceEnabled = false;
+        } else {
+            // Present default string to normal app.
+            detailInfoString =
+                    mContext.getString(
+                            R.string.manager_battery_usage_allow_background_usage_summary);
+        }
+        mBackgroundUsageAllowabilityPreference.setEnabled(isPreferenceEnabled);
+        mBackgroundUsageAllowabilityPreference.setSwitchEnabled(isPreferenceEnabled);
+        mBackgroundUsageAllowabilityPreference.setSummary(detailInfoString);
+        if (isPreferenceEnabled) {
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        PowerBackgroundUsageDetail.startPowerBackgroundUsageDetailPage(
+                                mContext, mDashboardFragment.getArguments());
+                        return true;
+                    });
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceChangeListener(
+                    (preference, isAllowBackground) -> {
+                        handleBatteryOptimizeModeUpdated(
+                                (boolean) isAllowBackground
+                                        ? BatteryOptimizeUtils.MODE_OPTIMIZED
+                                        : BatteryOptimizeUtils.MODE_RESTRICTED);
+                        return true;
+                    });
+        }
+    }
+
+    @VisibleForTesting
+    void handleBatteryOptimizeModeUpdated(int newBatteryOptimizeMode) {
+        if (mBatteryOptimizeUtils.getAppOptimizationMode() == newBatteryOptimizeMode) {
+            Log.w(TAG, "ignore same mode for: " + mBatteryOptimizeUtils.getPackageName());
+            return;
+        }
+        mBatteryOptimizeUtils.setAppUsageState(
+                newBatteryOptimizeMode, BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        updatePreferences(newBatteryOptimizeMode);
+    }
+
+    @VisibleForTesting
+    void updatePreferences(int optimizationMode) {
+        if (mBackgroundUsageAllowabilityPreference == null) {
+            return;
+        }
+        mBackgroundUsageAllowabilityPreference.setChecked(
+                optimizationMode != BatteryOptimizeUtils.MODE_RESTRICTED);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
index 582239731c4..651a1b258eb 100644
--- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
@@ -196,7 +196,9 @@ public final class BatteryBackupHelper implements BackupHelper {
                     appOptModeMap.containsKey(info.uid)
                             ? (int) appOptModeMap.get(info.uid).getResetOptimizationMode()
                             : BatteryOptimizeUtils.getAppOptimizationMode(
-                                    mode, allowlistedApps.contains(info.packageName));
+                                    mode,
+                                    allowlistedApps.contains(info.packageName),
+                                    /* ignoreUnknownMode= */ false);
             // Ignores default optimized/unknown state or system/default apps.
             if (optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED
                     || optimizationMode == BatteryOptimizeUtils.MODE_UNKNOWN
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
new file mode 100644
index 00000000000..95d73dda79c
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+import androidx.annotation.VisibleForTesting
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT
+import com.android.settingslib.Utils
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.fuelgauge.BatteryUtils
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.RangeValue
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.preference.PreferenceBinding
+import com.android.settingslib.widget.UsageProgressBarPreference
+
+// LINT.IfChange
+class BatteryHeaderPreference :
+    PersistentPreference<Int>,
+    PreferenceMetadata,
+    PreferenceBinding,
+    PreferenceLifecycleProvider,
+    RangeValue {
+
+    @VisibleForTesting var batteryBroadcastReceiver: BatteryBroadcastReceiver? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.summary_placeholder
+
+    override fun createWidget(context: Context) = UsageProgressBarPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.isSelectable = false
+        if (preference is UsageProgressBarPreference) {
+            quickUpdateHeaderPreference(preference)
+        }
+    }
+
+    override fun isIndexable(context: Context) = false
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        super.onCreate(context)
+        batteryBroadcastReceiver =
+            BatteryBroadcastReceiver(context).apply {
+                setBatteryChangedListener {
+                    if (it != BATTERY_NOT_PRESENT) {
+                        context.notifyPreferenceChange(KEY)
+                    }
+                }
+            }
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        super.onStart(context)
+        batteryBroadcastReceiver?.register()
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        super.onStop(context)
+        batteryBroadcastReceiver?.unRegister()
+    }
+
+    override fun storage(context: Context): KeyValueStore =
+        object : NoOpKeyedObservable<String>(), KeyValueStore {
+            override fun contains(key: String) = BatteryUtils.getBatteryIntent(context) != null
+
+            @Suppress("UNCHECKED_CAST")
+            override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
+                val batteryIntent = BatteryUtils.getBatteryIntent(context) ?: return null
+                return Utils.getBatteryLevel(batteryIntent) as T
+            }
+
+            override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =
+                throw UnsupportedOperationException()
+        }
+
+    override fun getMinValue(context: Context): Int = 0
+
+    override fun getMaxValue(context: Context): Int = 100
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.DISALLOW
+
+    companion object {
+        private const val KEY = "battery_header"
+        private const val BATTERY_MAX_LEVEL: Long = 100L
+
+        private fun quickUpdateHeaderPreference(preference: UsageProgressBarPreference) {
+            val batteryIntent = BatteryUtils.getBatteryIntent(preference.context) ?: return
+            val batteryLevel: Int = Utils.getBatteryLevel(batteryIntent)
+            preference.apply {
+                setUsageSummary(com.android.settings.Utils.formatPercentage(batteryLevel))
+                setPercent(batteryLevel.toLong(), BATTERY_MAX_LEVEL)
+                setBottomSummary("")
+            }
+        }
+    }
+}
+// LINT.ThenChange(BatteryHeaderPreferenceController.java)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 891a9977e8f..adcd7d15c20 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2024 The Android Open Source Project
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,59 +16,77 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT;
+
 import android.content.Context;
 import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.PowerManager;
-import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
 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.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.widget.UsageProgressBarPreference;
 
+// LINT.IfChange
 /** Controller that update the battery header view */
 public class BatteryHeaderPreferenceController extends BasePreferenceController
-        implements PreferenceControllerMixin, BatteryPreferenceController {
+        implements PreferenceControllerMixin, LifecycleEventObserver {
     private static final String TAG = "BatteryHeaderPreferenceController";
-
-    @VisibleForTesting static final String KEY_BATTERY_HEADER = "battery_header";
     private static final int BATTERY_MAX_LEVEL = 100;
 
-    @VisibleForTesting BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
-    @VisibleForTesting UsageProgressBarPreference mBatteryUsageProgressBarPref;
-
-    private final PowerManager mPowerManager;
-    private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
-
-    private BatteryTip mBatteryTip;
+    @Nullable @VisibleForTesting BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+    @Nullable @VisibleForTesting UsageProgressBarPreference mBatteryUsageProgressBarPreference;
 
     public BatteryHeaderPreferenceController(Context context, String key) {
         super(context, key);
-        mPowerManager = context.getSystemService(PowerManager.class);
-        mBatteryStatusFeatureProvider =
-                FeatureFactory.getFeatureFactory().getBatteryStatusFeatureProvider();
-        mBatterySettingsFeatureProvider =
-                FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        switch (event) {
+            case ON_CREATE:
+                mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
+                mBatteryBroadcastReceiver.setBatteryChangedListener(
+                        type -> {
+                            if (type != BATTERY_NOT_PRESENT) {
+                                quickUpdateHeaderPreference();
+                            }
+                        });
+                break;
+            case ON_START:
+                if (mBatteryBroadcastReceiver != null) {
+                    mBatteryBroadcastReceiver.register();
+                }
+                break;
+            case ON_STOP:
+                if (mBatteryBroadcastReceiver != null) {
+                    mBatteryBroadcastReceiver.unRegister();
+                }
+                break;
+            default:
+                break;
+        }
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
-        // Set up empty space text first to prevent layout flaky before info loaded.
-        mBatteryUsageProgressBarPref.setBottomSummary(" ");
+        mBatteryUsageProgressBarPreference = screen.findPreference(getPreferenceKey());
+        // Hide the bottom summary from the progress bar.
+        mBatteryUsageProgressBarPreference.setBottomSummary("");
 
         if (com.android.settings.Utils.isBatteryPresent(mContext)) {
             quickUpdateHeaderPreference();
         } else {
-            mBatteryUsageProgressBarPref.setVisible(false);
+            mBatteryUsageProgressBarPreference.setVisible(false);
         }
     }
 
@@ -76,105 +95,23 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
         return AVAILABLE_UNSEARCHABLE;
     }
 
-    private CharSequence generateLabel(BatteryInfo info) {
-        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_not_charging);
-        }
-        if (BatteryUtils.isBatteryDefenderOn(info)
-                || FeatureFactory.getFeatureFactory()
-                .getPowerUsageFeatureProvider()
-                .isExtraDefend()) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_charging_on_hold);
-        }
-        if (info.remainingLabel != null
-                && mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
-            return info.remainingLabel;
-        }
-        if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
-            return info.statusLabel;
-        }
-        if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
-            final CharSequence wirelessChargingLabel =
-                    mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
-            if (wirelessChargingLabel != null) {
-                mBatteryUsageProgressBarPref.setBottomSummaryContentDescription(
-                        mBatterySettingsFeatureProvider
-                                .getWirelessChargingContentDescription(mContext, info));
-                return wirelessChargingLabel;
-            }
-        }
-        if (info.remainingLabel == null) {
-            return info.statusLabel;
-        }
-        if (info.statusLabel != null && !info.discharging) {
-            // Charging state
-            if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
-                return info.isFastCharging
-                        ? mContext.getString(
-                                R.string.battery_state_and_duration,
-                                info.statusLabel,
-                                info.remainingLabel)
-                        : info.remainingLabel;
-            }
-            return mContext.getString(
-                    R.string.battery_state_and_duration, info.statusLabel, info.remainingLabel);
-        } else if (mPowerManager.isPowerSaveMode()) {
-            // Power save mode is on
-            final String powerSaverOn =
-                    mContext.getString(R.string.battery_tip_early_heads_up_done_title);
-            return mContext.getString(
-                    R.string.battery_state_and_duration, powerSaverOn, info.remainingLabel);
-        } else if (mBatteryTip != null && mBatteryTip.getType() == BatteryTip.TipType.LOW_BATTERY) {
-            // Low battery state
-            final String lowBattery = mContext.getString(R.string.low_battery_summary);
-            return mContext.getString(
-                    R.string.battery_state_and_duration, lowBattery, info.remainingLabel);
-        } else {
-            // Discharging state
-            return info.remainingLabel;
-        }
-    }
-
-    public void updateHeaderPreference(BatteryInfo info) {
-        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
-            mBatteryUsageProgressBarPref.setBottomSummary(generateLabel(info));
-        }
-
-        mBatteryUsageProgressBarPref.setUsageSummary(
-                formatBatteryPercentageText(info.batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
-    }
-
-    /** Callback which receives text for the summary line. */
-    public void updateBatteryStatus(String label, BatteryInfo info) {
-        final CharSequence summary = label != null ? label : generateLabel(info);
-        mBatteryUsageProgressBarPref.setBottomSummary(summary);
-        Log.d(TAG, "updateBatteryStatus: " + label + " summary: " + summary);
-    }
-
+    /** Updates {@link UsageProgressBarPreference} information. */
     public void quickUpdateHeaderPreference() {
+        if (mBatteryUsageProgressBarPreference == null) {
+            return;
+        }
+
         Intent batteryBroadcast =
                 com.android.settingslib.fuelgauge.BatteryUtils.getBatteryIntent(mContext);
         final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
-        final boolean discharging =
-                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
 
-        mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
-    }
-
-    /** Update summary when battery tips changed. */
-    public void updateHeaderByBatteryTips(BatteryTip batteryTip, BatteryInfo batteryInfo) {
-        mBatteryTip = batteryTip;
-
-        if (mBatteryTip != null && batteryInfo != null) {
-            updateHeaderPreference(batteryInfo);
-        }
+        mBatteryUsageProgressBarPreference.setUsageSummary(
+                formatBatteryPercentageText(batteryLevel));
+        mBatteryUsageProgressBarPreference.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
     }
 
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
         return com.android.settings.Utils.formatPercentage(batteryLevel);
     }
 }
+// LINT.ThenChange(BatteryHeaderPreference.kt)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
new file mode 100644
index 00000000000..a809a5682c8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.GroupSectionDividerMixin;
+
+/** A preference for battery header text. */
+public class BatteryHeaderTextPreference extends Preference implements GroupSectionDividerMixin {
+    private static final String TAG = "BatteryHeaderTextPreference";
+
+    @Nullable private CharSequence mText;
+    @Nullable private CharSequence mContentDescription;
+
+    public BatteryHeaderTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_battery_header_text);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        final TextView textView = (TextView) view.findViewById(R.id.text);
+        textView.setText(mText);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
+        if (!TextUtils.isEmpty(mContentDescription)) {
+            textView.setContentDescription(mContentDescription);
+        }
+    }
+
+    void setText(@Nullable CharSequence text) {
+        mText = text;
+        notifyChanged();
+    }
+
+    void setContentDescription(@Nullable CharSequence contentDescription) {
+        mContentDescription = contentDescription;
+        notifyChanged();
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java
new file mode 100644
index 00000000000..b6091740ef6
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+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.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.Utils;
+
+/** Controller that update the battery header view */
+public class BatteryHeaderTextPreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin, BatteryPreferenceController {
+    private static final String TAG = "BatteryHeaderTextPreferenceController";
+
+    private final PowerManager mPowerManager;
+    private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
+
+    @Nullable private BatteryTip mBatteryTip;
+
+    @VisibleForTesting BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+
+    @Nullable @VisibleForTesting BatteryHeaderTextPreference mBatteryHeaderTextPreference;
+
+    public BatteryHeaderTextPreferenceController(Context context, String key) {
+        super(context, key);
+        mPowerManager = context.getSystemService(PowerManager.class);
+        mBatteryStatusFeatureProvider =
+                FeatureFactory.getFeatureFactory().getBatteryStatusFeatureProvider();
+        mBatterySettingsFeatureProvider =
+                FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBatteryHeaderTextPreference = screen.findPreference(getPreferenceKey());
+
+        if (mBatteryHeaderTextPreference != null
+                && !com.android.settings.Utils.isBatteryPresent(mContext)) {
+            mBatteryHeaderTextPreference.setVisible(false);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+
+    @NonNull
+    private CharSequence generateLabel(@NonNull BatteryInfo info) {
+        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.battery_info_status_not_charging);
+        }
+        if (BatteryUtils.isBatteryDefenderOn(info)
+                || FeatureFactory.getFeatureFactory()
+                .getPowerUsageFeatureProvider()
+                .isExtraDefend()) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.battery_info_status_charging_on_hold);
+        }
+        if (info.remainingLabel != null
+                && mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
+            return info.remainingLabel;
+        }
+        if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
+            return info.statusLabel;
+        }
+        if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
+            final CharSequence wirelessChargingLabel =
+                    mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
+            if (mBatteryHeaderTextPreference != null && wirelessChargingLabel != null) {
+                mBatteryHeaderTextPreference.setContentDescription(
+                        mBatterySettingsFeatureProvider
+                                .getWirelessChargingContentDescription(mContext, info));
+                return wirelessChargingLabel;
+            }
+        }
+        if (info.remainingLabel == null) {
+            return info.statusLabel;
+        }
+        if (info.statusLabel != null && !info.discharging) {
+            // Charging state
+            if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
+                return info.isFastCharging
+                        ? mContext.getString(
+                                R.string.battery_state_and_duration,
+                                info.statusLabel,
+                                info.remainingLabel)
+                        : info.remainingLabel;
+            }
+            return mContext.getString(
+                    R.string.battery_state_and_duration, info.statusLabel, info.remainingLabel);
+        } else if (mPowerManager.isPowerSaveMode()) {
+            // Power save mode is on
+            final String powerSaverOn =
+                    mContext.getString(R.string.battery_tip_early_heads_up_done_title);
+            return mContext.getString(
+                    R.string.battery_state_and_duration, powerSaverOn, info.remainingLabel);
+        } else if (mBatteryTip != null && mBatteryTip.getType() == BatteryTip.TipType.LOW_BATTERY) {
+            // Low battery state
+            final String lowBattery = mContext.getString(R.string.low_battery_summary);
+            return mContext.getString(
+                    R.string.battery_state_and_duration, lowBattery, info.remainingLabel);
+        } else {
+            // Discharging state
+            return info.remainingLabel;
+        }
+    }
+
+    /** Updates the battery header text with the given BatteryInfo. */
+    public void updateHeaderPreference(@NonNull BatteryInfo info) {
+        if (mBatteryHeaderTextPreference != null
+                && !mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+            mBatteryHeaderTextPreference.setText(generateLabel(info));
+        }
+    }
+
+    /** Callback which updates the battery header text with the given label. */
+    @Override
+    public void updateBatteryStatus(String label, BatteryInfo info) {
+        if (mBatteryHeaderTextPreference == null) {
+            return;
+        }
+
+        final CharSequence summary = label != null ? label : generateLabel(info);
+        mBatteryHeaderTextPreference.setText(summary);
+        Log.d(TAG, "updateBatteryStatus: " + label + " summary: " + summary);
+    }
+
+    /** Update summary when battery tips are changed. */
+    public void updateHeaderByBatteryTips(
+            @Nullable BatteryTip batteryTip, @NonNull BatteryInfo batteryInfo) {
+        mBatteryTip = batteryTip;
+
+        if (mBatteryTip != null && batteryInfo != null) {
+            updateHeaderPreference(batteryInfo);
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java
new file mode 100644
index 00000000000..0a4cbac4dd6
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+/** Controller to update the app background usage mode state in Allow background usage page */
+public class BatteryOptimizationModePreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH =
+            "background_usage_allowability_switch";
+
+    @VisibleForTesting static final String KEY_OPTIMIZED_PREF = "optimized_preference";
+    @VisibleForTesting static final String KEY_UNRESTRICTED_PREF = "unrestricted_preference";
+
+    private final BatteryOptimizeUtils mBatteryOptimizeUtils;
+    @Nullable @VisibleForTesting MainSwitchPreference mBackgroundUsageAllowabilityPreference;
+    @Nullable @VisibleForTesting SelectorWithWidgetPreference mOptimizedPreference;
+    @Nullable @VisibleForTesting SelectorWithWidgetPreference mUnrestrictedPreference;
+
+    public BatteryOptimizationModePreferenceController(
+            @NonNull Context context,
+            @NonNull String preferenceKey,
+            @NonNull BatteryOptimizeUtils batteryOptimizeUtils) {
+        super(context, preferenceKey);
+        mBatteryOptimizeUtils = batteryOptimizeUtils;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        updatePreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBackgroundUsageAllowabilityPreference =
+                screen.findPreference(KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH);
+        mOptimizedPreference = screen.findPreference(KEY_OPTIMIZED_PREF);
+        mUnrestrictedPreference = screen.findPreference(KEY_UNRESTRICTED_PREF);
+        initPreferences();
+    }
+
+    @VisibleForTesting
+    void initPreferences() {
+        if (mBackgroundUsageAllowabilityPreference == null
+                || mOptimizedPreference == null
+                || mUnrestrictedPreference == null) {
+            return;
+        }
+        final boolean isEnabled = mBatteryOptimizeUtils.isOptimizeModeMutable();
+        mBackgroundUsageAllowabilityPreference.setEnabled(isEnabled);
+        mOptimizedPreference.setEnabled(isEnabled);
+        mUnrestrictedPreference.setEnabled(isEnabled);
+        if (isEnabled) {
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceChangeListener(
+                    (preference, isAllowBackground) -> {
+                        handleBatteryOptimizeModeUpdated(
+                                (boolean) isAllowBackground
+                                        ? BatteryOptimizeUtils.MODE_OPTIMIZED
+                                        : BatteryOptimizeUtils.MODE_RESTRICTED);
+                        return true;
+                    });
+            mOptimizedPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        handleBatteryOptimizeModeUpdated(BatteryOptimizeUtils.MODE_OPTIMIZED);
+                        return true;
+                    });
+            mUnrestrictedPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        handleBatteryOptimizeModeUpdated(BatteryOptimizeUtils.MODE_UNRESTRICTED);
+                        return true;
+                    });
+        }
+    }
+
+    @VisibleForTesting
+    void updatePreferences(int optimizationMode) {
+        if (mBackgroundUsageAllowabilityPreference == null
+                || mOptimizedPreference == null
+                || mUnrestrictedPreference == null) {
+            return;
+        }
+        final boolean isAllowBackground = optimizationMode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        mBackgroundUsageAllowabilityPreference.setChecked(isAllowBackground);
+        mOptimizedPreference.setEnabled(isAllowBackground);
+        mUnrestrictedPreference.setEnabled(isAllowBackground);
+        mOptimizedPreference.setChecked(optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED);
+        mUnrestrictedPreference.setChecked(
+                optimizationMode == BatteryOptimizeUtils.MODE_UNRESTRICTED);
+    }
+
+    @VisibleForTesting
+    void handleBatteryOptimizeModeUpdated(int newBatteryOptimizeMode) {
+        if (mBatteryOptimizeUtils.getAppOptimizationMode() == newBatteryOptimizeMode) {
+            Log.w(TAG, "ignore same mode for: " + mBatteryOptimizeUtils.getPackageName());
+            return;
+        }
+        mBatteryOptimizeUtils.setAppUsageState(
+                newBatteryOptimizeMode, BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        updatePreferences(newBatteryOptimizeMode);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index 3233f0d7aa9..6c95823853f 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -100,7 +100,8 @@ public class BatteryOptimizeUtils {
 
     /** Gets the {@link OptimizationMode} based on mode and allowed list. */
     @OptimizationMode
-    public static int getAppOptimizationMode(int mode, boolean isAllowListed) {
+    public static int getAppOptimizationMode(
+            int mode, boolean isAllowListed, boolean ignoreUnknownMode) {
         if (!isAllowListed && mode == AppOpsManager.MODE_IGNORED) {
             return MODE_RESTRICTED;
         } else if (isAllowListed && mode == AppOpsManager.MODE_ALLOWED) {
@@ -108,13 +109,15 @@ public class BatteryOptimizeUtils {
         } else if (!isAllowListed && mode == AppOpsManager.MODE_ALLOWED) {
             return MODE_OPTIMIZED;
         } else {
-            return MODE_UNKNOWN;
+            // MODE_UNKNOWN = isAllowListed + AppOpsManager.MODE_IGNORED
+            // Return Unrestricted mode for Unknown mode since it is in allowlist.
+            return ignoreUnknownMode ? MODE_UNRESTRICTED : MODE_UNKNOWN;
         }
     }
 
     /** Gets the {@link OptimizationMode} for associated app. */
     @OptimizationMode
-    public int getAppOptimizationMode(boolean refreshList) {
+    public int getAppOptimizationMode(boolean refreshList, boolean ignoreUnknownMode) {
         if (refreshList) {
             mPowerAllowListBackend.refreshList();
         }
@@ -127,13 +130,13 @@ public class BatteryOptimizeUtils {
                 String.format(
                         "refresh %s state, allowlisted = %s, mode = %d",
                         mPackageName, mAllowListed, mMode));
-        return getAppOptimizationMode(mMode, mAllowListed);
+        return getAppOptimizationMode(mMode, mAllowListed, ignoreUnknownMode);
     }
 
     /** Gets the {@link OptimizationMode} for associated app. */
     @OptimizationMode
     public int getAppOptimizationMode() {
-        return getAppOptimizationMode(true);
+        return getAppOptimizationMode(/* refreshList= */ true, /* ignoreUnknownMode= */ true);
     }
 
     /** Resets optimization mode for all applications. */
@@ -246,10 +249,11 @@ public class BatteryOptimizeUtils {
             @OptimizationMode
             final int optimizationMode =
                     getAppOptimizationMode(
-                            mode, allowlistBackend.isAllowlisted(info.packageName, info.uid));
-            // Ignores default optimized/unknown state or system/default apps.
+                            mode,
+                            allowlistBackend.isAllowlisted(info.packageName, info.uid),
+                            /* ignoreUnknownMode= */ false);
+            // Ignores default optimized state or system/default apps.
             if (optimizationMode == MODE_OPTIMIZED
-                    || optimizationMode == MODE_UNKNOWN
                     || isSystemOrDefaultApp(
                             context, allowlistBackend, info.packageName, info.uid)) {
                 continue;
@@ -374,7 +378,8 @@ public class BatteryOptimizeUtils {
                         "\tStandbyMode: %s, allowListed: %s, mode: %s",
                         appStandbyMode,
                         allowListed,
-                        getAppOptimizationMode(appStandbyMode, allowListed));
+                        getAppOptimizationMode(
+                                appStandbyMode, allowListed, /* ignoreUnknownMode= */ false));
     }
 
     private static @DataChangeReason int toChangeReason(Action action) {
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
index 066e0fc15b6..3714a11e36e 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
@@ -72,25 +72,22 @@ public final class BatterySettingsMigrateChecker extends BroadcastReceiver {
             Context context,
             @BatteryOptimizeUtils.OptimizationMode int optimizationMode,
             List<String> allowList) {
-        allowList.forEach(
-                packageName -> {
-                    final BatteryOptimizeUtils batteryOptimizeUtils =
-                            BatteryBackupHelper.newBatteryOptimizeUtils(
-                                    context,
-                                    packageName,
-                                    /* testOptimizeUtils */ sBatteryOptimizeUtils);
-                    if (batteryOptimizeUtils == null) {
-                        return;
-                    }
-                    if (batteryOptimizeUtils.getAppOptimizationMode() != optimizationMode) {
-                        Log.w(
-                                TAG,
-                                "Reset " + packageName + " battery mode into " + optimizationMode);
-                        batteryOptimizeUtils.setAppUsageState(
-                                optimizationMode,
-                                BatteryOptimizeHistoricalLogEntry.Action.FORCE_RESET);
-                    }
-                });
+        for (String packageName : allowList) {
+            final BatteryOptimizeUtils batteryOptimizeUtils =
+                    BatteryBackupHelper.newBatteryOptimizeUtils(
+                            context,
+                            packageName,
+                            /* testOptimizeUtils */ sBatteryOptimizeUtils);
+            if (batteryOptimizeUtils == null) {
+                continue;
+            }
+            if (batteryOptimizeUtils.getAppOptimizationMode() != optimizationMode) {
+                Log.w(TAG, "Reset " + packageName + " mode into " + optimizationMode);
+                batteryOptimizeUtils.setAppUsageState(
+                        optimizationMode,
+                        BatteryOptimizeHistoricalLogEntry.Action.FORCE_RESET);
+            }
+        }
     }
 
     static void verifySaverConfiguration(Context context) {
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
index 33a802586eb..eeebbec676e 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
@@ -347,7 +347,9 @@ public final class BatterySettingsStorage extends ObservableBackupRestoreStorage
                         appOptModeMap.containsKey(info.uid)
                                 ? (int) appOptModeMap.get(info.uid).getResetOptimizationMode()
                                 : BatteryOptimizeUtils.getAppOptimizationMode(
-                                        mode, mAllowlistedApps.contains(info.packageName));
+                                        mode,
+                                        mAllowlistedApps.contains(info.packageName),
+                                        /* ignoreUnknownMode= */ false);
                 // Ignores default optimized/unknown state or system/default apps.
                 if (optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED
                         || optimizationMode == BatteryOptimizeUtils.MODE_UNKNOWN
diff --git a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
deleted file mode 100644
index a26ab7a58e4..00000000000
--- a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-public class OptimizedPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "OPTIMIZED_PREF";
-
-    @VisibleForTesting static final String KEY_OPTIMIZED_PREF = "optimized_preference";
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public OptimizedPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setEnabled(mBatteryOptimizeUtils.isSelectorPreferenceEnabled());
-
-        final boolean isOptimized =
-                mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()
-                        || mBatteryOptimizeUtils.getAppOptimizationMode()
-                                == BatteryOptimizeUtils.MODE_OPTIMIZED;
-        ((SelectorWithWidgetPreference) preference).setChecked(isOptimized);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_OPTIMIZED_PREF;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
index e59cc4add46..90ced96f690 100644
--- a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
@@ -24,11 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -37,15 +33,12 @@ import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUtils;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.HelpUtils;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.Utils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
+import com.android.settingslib.widget.IntroPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,8 +46,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /** Allow background usage fragment for each app */
-public class PowerBackgroundUsageDetail extends DashboardFragment
-        implements SelectorWithWidgetPreference.OnClickListener, OnCheckedChangeListener {
+public class PowerBackgroundUsageDetail extends DashboardFragment {
     private static final String TAG = "PowerBackgroundUsageDetail";
 
     public static final String EXTRA_UID = "extra_uid";
@@ -63,21 +55,15 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
     public static final String EXTRA_ICON_ID = "extra_icon_id";
     private static final String KEY_PREF_HEADER = "header_view";
-    private static final String KEY_PREF_UNRESTRICTED = "unrestricted_preference";
-    private static final String KEY_PREF_OPTIMIZED = "optimized_preference";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
     private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
+    private static final String KEY_BATTERY_OPTIMIZATION_MODE_CATEGORY =
+            "battery_optimization_mode_category";
 
     private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
 
-    @VisibleForTesting LayoutPreference mHeaderPreference;
     @VisibleForTesting ApplicationsState mState;
     @VisibleForTesting ApplicationsState.AppEntry mAppEntry;
     @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @VisibleForTesting SelectorWithWidgetPreference mOptimizePreference;
-    @VisibleForTesting SelectorWithWidgetPreference mUnrestrictedPreference;
-    @VisibleForTesting MainSwitchPreference mMainSwitchPreference;
-    @VisibleForTesting FooterPreference mFooterPreference;
     @VisibleForTesting StringBuilder mLogStringBuilder;
 
     @VisibleForTesting @BatteryOptimizeUtils.OptimizationMode
@@ -87,17 +73,11 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
+        final Bundle bundle = getArguments();
+        final int uid = bundle.getInt(EXTRA_UID, 0);
+        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
+        mBatteryOptimizeUtils = new BatteryOptimizeUtils(getContext(), uid, packageName);
         mState = ApplicationsState.getInstance(getActivity().getApplication());
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        onCreateBackgroundUsageState(packageName);
-        mHeaderPreference = findPreference(KEY_PREF_HEADER);
-
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, UserHandle.myUserId());
         }
@@ -107,8 +87,8 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
     public void onResume() {
         super.onResume();
         initHeader();
-        mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         initFooter();
+        mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 
@@ -136,20 +116,6 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
         Log.d(TAG, "Leave with mode: " + currentOptimizeMode);
     }
 
-    @Override
-    public void onRadioButtonClicked(SelectorWithWidgetPreference selected) {
-        final String selectedKey = selected == null ? null : selected.getKey();
-        updateSelectorPreferenceState(mUnrestrictedPreference, selectedKey);
-        updateSelectorPreferenceState(mOptimizePreference, selectedKey);
-        mBatteryOptimizeUtils.setAppUsageState(getSelectedPreference(), Action.APPLY);
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        mMainSwitchPreference.setChecked(isChecked);
-        updateSelectorPreference(isChecked);
-    }
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND;
@@ -157,14 +123,10 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        final Bundle bundle = getArguments();
-        final int uid = bundle.getInt(EXTRA_UID, 0);
-        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
-
-        controllers.add(new AllowBackgroundPreferenceController(context, uid, packageName));
-        controllers.add(new OptimizedPreferenceController(context, uid, packageName));
-        controllers.add(new UnrestrictedPreferenceController(context, uid, packageName));
+        final List<AbstractPreferenceController> controllers = new ArrayList<>(1);
+        controllers.add(
+                new BatteryOptimizationModePreferenceController(
+                        context, KEY_BATTERY_OPTIMIZATION_MODE_CATEGORY, mBatteryOptimizeUtils));
 
         return controllers;
     }
@@ -179,26 +141,6 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
         return TAG;
     }
 
-    @VisibleForTesting
-    void updateSelectorPreference(boolean isEnabled) {
-        mOptimizePreference.setEnabled(isEnabled);
-        mUnrestrictedPreference.setEnabled(isEnabled);
-        onRadioButtonClicked(isEnabled ? mOptimizePreference : null);
-    }
-
-    @VisibleForTesting
-    int getSelectedPreference() {
-        if (!mMainSwitchPreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_RESTRICTED;
-        } else if (mUnrestrictedPreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_UNRESTRICTED;
-        } else if (mOptimizePreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_OPTIMIZED;
-        } else {
-            return BatteryOptimizeUtils.MODE_UNKNOWN;
-        }
-    }
-
     static void startPowerBackgroundUsageDetailPage(Context context, Bundle args) {
         new SubSettingLauncher(context)
                 .setDestination(PowerBackgroundUsageDetail.class.getName())
@@ -209,88 +151,50 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
 
     @VisibleForTesting
     void initHeader() {
-        final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
+        final IntroPreference introPreference = findPreference(KEY_PREF_HEADER);
+        if (introPreference == null) {
+            return;
+        }
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
-        EntityHeaderController controller =
-                EntityHeaderController.newInstance(context, this, appSnippet)
-                        .setButtonActions(
-                                EntityHeaderController.ActionType.ACTION_NONE,
-                                EntityHeaderController.ActionType.ACTION_NONE);
 
         if (mAppEntry == null) {
-            controller.setLabel(bundle.getString(EXTRA_LABEL));
+            introPreference.setTitle(bundle.getString(EXTRA_LABEL));
 
             final int iconId = bundle.getInt(EXTRA_ICON_ID, 0);
             if (iconId == 0) {
-                controller.setIcon(context.getPackageManager().getDefaultActivityIcon());
+                introPreference.setIcon(context.getPackageManager().getDefaultActivityIcon());
             } else {
-                controller.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
+                introPreference.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
             }
         } else {
             mState.ensureIcon(mAppEntry);
-            controller.setLabel(mAppEntry);
-            controller.setIcon(mAppEntry);
-            controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
+            introPreference.setTitle(mAppEntry.label);
+            introPreference.setIcon(Utils.getBadgedIcon(context, mAppEntry.info));
         }
-
-        controller.done(true /* rebindActions */);
     }
 
     @VisibleForTesting
     void initFooter() {
-        final String stateString;
-        final String footerString;
-        final Context context = getContext();
-
-        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
-            // Present optimized only string when the package name is invalid.
-            stateString = context.getString(R.string.manager_battery_usage_optimized_only);
-            footerString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
-            // Present unrestricted only string when the package is system or default active app.
-            stateString = context.getString(R.string.manager_battery_usage_unrestricted_only);
-            footerString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else {
-            // Present default string to normal app.
-            footerString = context.getString(R.string.manager_battery_usage_footer);
+        final FooterPreference footerPreference = findPreference(KEY_FOOTER_PREFERENCE);
+        if (footerPreference == null) {
+            return;
         }
-        mFooterPreference.setTitle(footerString);
+        final Context context = getContext();
+        footerPreference.setTitle(context.getString(R.string.manager_battery_usage_footer));
         final Intent helpIntent =
                 HelpUtils.getHelpIntent(
                         context,
                         context.getString(R.string.help_url_app_usage_settings),
                         /* backupContext= */ "");
         if (helpIntent != null) {
-            mFooterPreference.setLearnMoreAction(
+            footerPreference.setLearnMoreAction(
                     v -> startActivityForResult(helpIntent, /* requestCode= */ 0));
-            mFooterPreference.setLearnMoreText(
+            footerPreference.setLearnMoreText(
                     context.getString(R.string.manager_battery_usage_link_a11y));
         }
     }
 
-    private void onCreateBackgroundUsageState(String packageName) {
-        mOptimizePreference = findPreference(KEY_PREF_OPTIMIZED);
-        mUnrestrictedPreference = findPreference(KEY_PREF_UNRESTRICTED);
-        mMainSwitchPreference = findPreference(KEY_ALLOW_BACKGROUND_USAGE);
-        mFooterPreference = findPreference(KEY_FOOTER_PREFERENCE);
-
-        mOptimizePreference.setOnClickListener(this);
-        mUnrestrictedPreference.setOnClickListener(this);
-        mMainSwitchPreference.addOnSwitchChangeListener(this);
-
-        mBatteryOptimizeUtils =
-                new BatteryOptimizeUtils(
-                        getContext(), getArguments().getInt(EXTRA_UID), packageName);
-    }
-
-    private void updateSelectorPreferenceState(
-            SelectorWithWidgetPreference preference, String selectedKey) {
-        preference.setChecked(TextUtils.equals(selectedKey, preference.getKey()));
-    }
-
     private void logMetricCategory(int currentOptimizeMode) {
         if (currentOptimizeMode == mOptimizationMode) {
             return;
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index d948cc0f13a..9b070f99950 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
 import android.Manifest;
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
@@ -24,20 +26,20 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
-import android.os.PowerWhitelistManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 public class RequestIgnoreBatteryOptimizations extends AlertActivity
         implements DialogInterface.OnClickListener {
     private static final String TAG = "RequestIgnoreBatteryOptimizations";
     private static final boolean DEBUG = false;
 
-    private PowerWhitelistManager mPowerWhitelistManager;
-    private String mPackageName;
+    private ApplicationInfo mApplicationInfo;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -47,8 +49,6 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
                         android.view.WindowManager.LayoutParams
                                 .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
 
-        mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
-
         Uri data = getIntent().getData();
         if (data == null) {
             debugLog(
@@ -56,17 +56,18 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
             finish();
             return;
         }
-        mPackageName = data.getSchemeSpecificPart();
-        if (mPackageName == null) {
+        final String packageName = data.getSchemeSpecificPart();
+        if (TextUtils.isEmpty(packageName)) {
             debugLog(
                     "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: " + getIntent());
             finish();
             return;
         }
 
+        // Package in Unrestricted mode already ignoring the battery optimizations.
         PowerManager power = getSystemService(PowerManager.class);
-        if (power.isIgnoringBatteryOptimizations(mPackageName)) {
-            debugLog("Not should prompt, already ignoring optimizations: " + mPackageName);
+        if (power.isIgnoringBatteryOptimizations(packageName)) {
+            debugLog("Not should prompt, already ignoring optimizations: " + packageName);
             finish();
             return;
         }
@@ -74,29 +75,28 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
         if (getPackageManager()
                         .checkPermission(
                                 Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                                mPackageName)
+                                packageName)
                 != PackageManager.PERMISSION_GRANTED) {
             debugLog(
                     "Requested package "
-                            + mPackageName
+                            + packageName
                             + " does not hold permission "
                             + Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
             finish();
             return;
         }
 
-        ApplicationInfo ai;
         try {
-            ai = getPackageManager().getApplicationInfo(mPackageName, 0);
+            mApplicationInfo = getPackageManager().getApplicationInfo(packageName, 0);
         } catch (PackageManager.NameNotFoundException e) {
-            debugLog("Requested package doesn't exist: " + mPackageName);
+            debugLog("Requested package doesn't exist: " + packageName);
             finish();
             return;
         }
 
         final AlertController.AlertParams p = mAlertParams;
         final CharSequence appLabel =
-                ai.loadSafeLabel(
+                mApplicationInfo.loadSafeLabel(
                         getPackageManager(),
                         PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
                         PackageItemInfo.SAFE_LABEL_FLAG_TRIM
@@ -114,7 +114,12 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                mPowerWhitelistManager.addToWhitelist(mPackageName);
+                BatteryOptimizeUtils batteryOptimizeUtils =
+                        new BatteryOptimizeUtils(
+                                getApplicationContext(),
+                                mApplicationInfo.uid,
+                                mApplicationInfo.packageName);
+                batteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED, Action.APPLY);
                 break;
             case BUTTON_NEGATIVE:
                 break;
diff --git a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
deleted file mode 100644
index 652941b2544..00000000000
--- a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-public class UnrestrictedPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "UNRESTRICTED_PREF";
-
-    @VisibleForTesting static final String KEY_UNRESTRICTED_PREF = "unrestricted_preference";
-
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public UnrestrictedPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setEnabled(mBatteryOptimizeUtils.isSelectorPreferenceEnabled());
-
-        final boolean isUnrestricted =
-                mBatteryOptimizeUtils.getAppOptimizationMode()
-                        == BatteryOptimizeUtils.MODE_UNRESTRICTED;
-        ((SelectorWithWidgetPreference) preference).setChecked(isUnrestricted);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_UNRESTRICTED_PREF;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 5c57c0ca96d..d4b29b4e439 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -38,6 +38,7 @@ import com.android.settingslib.fuelgauge.BatterySaverUtils;
 import com.android.settingslib.widget.MainSwitchPreference;
 
 /** Controller to update the battery saver button */
+// LINT.IfChange
 public class BatterySaverButtonPreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
     private static final long SWITCH_ANIMATION_DURATION = 350L;
@@ -129,3 +130,4 @@ public class BatterySaverButtonPreferenceController extends TogglePreferenceCont
         }
     }
 }
+// LINT.ThenChange(BatterySaverPreference.kt)
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt
new file mode 100644
index 00000000000..93da40dc045
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import android.os.PowerManager
+import com.android.settings.R
+import com.android.settings.fuelgauge.BatterySaverReceiver
+import com.android.settings.fuelgauge.BatterySaverReceiver.BatterySaverListener
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_SETTINGS
+import com.android.settingslib.fuelgauge.BatterySaverUtils
+import com.android.settingslib.fuelgauge.BatteryStatus
+import com.android.settingslib.fuelgauge.BatteryUtils
+import com.android.settingslib.metadata.MainSwitchPreference
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+// LINT.IfChange
+class BatterySaverPreference :
+    MainSwitchPreference(KEY, R.string.battery_saver_master_switch_title),
+    PreferenceLifecycleProvider {
+
+    private var batterySaverReceiver: BatterySaverReceiver? = null
+
+    override fun storage(context: Context) = BatterySaverStore(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun isEnabled(context: Context) =
+        !BatteryStatus(BatteryUtils.getBatteryIntent(context)).isPluggedIn
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        BatterySaverReceiver(context).apply {
+            batterySaverReceiver = this
+            setBatterySaverListener(
+                object : BatterySaverListener {
+                    override fun onPowerSaveModeChanged() {
+                        context.lifecycleScope.launch {
+                            delay(SWITCH_ANIMATION_DURATION)
+                            context.notifyPreferenceChange(KEY)
+                        }
+                    }
+
+                    override fun onBatteryChanged(pluggedIn: Boolean) =
+                        context.notifyPreferenceChange(KEY)
+                }
+            )
+            setListening(true)
+        }
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        batterySaverReceiver?.setListening(false)
+        batterySaverReceiver = null
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    class BatterySaverStore(private val context: Context) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            context.isPowerSaveMode() as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            BatterySaverUtils.setPowerSaveMode(
+                context,
+                value as Boolean,
+                /* needFirstTimeWarning= */ false,
+                SAVER_ENABLED_SETTINGS,
+            )
+        }
+
+        private fun Context.isPowerSaveMode() =
+            getSystemService(PowerManager::class.java)?.isPowerSaveMode == true
+    }
+
+    companion object {
+        private const val KEY = "battery_saver"
+        private const val SWITCH_ANIMATION_DURATION: Long = 350L
+    }
+}
+// LINT.ThenChange(BatterySaverButtonPreferenceController.java)
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt
new file mode 100644
index 00000000000..d0220736612
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+open class BatterySaverScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.battery_saver
+
+    override val keywords: Int
+        get() = R.string.keywords_battery_saver
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystBatterySaverScreen()
+
+    override fun fragmentClass() = BatterySaverSettings::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) { +BatterySaverPreference() order -100 }
+
+    companion object {
+        const val KEY = "battery_saver_screen"
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index 8e281de7bed..df6c1d9729d 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -17,8 +17,11 @@
 package com.android.settings.fuelgauge.batterysaver;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -93,4 +96,9 @@ public class BatterySaverSettings extends DashboardFragment {
             pref.setLearnMoreText(getString(R.string.battery_saver_link_a11y));
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return BatterySaverScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index e6f622cf00b..74c9c68ec49 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.BadParcelableException;
 import android.os.Bundle;
@@ -27,7 +28,6 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
@@ -52,7 +52,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
     private BatteryTipListener mBatteryTipListener;
     private List<BatteryTip> mBatteryTips;
     private Map<String, BatteryTip> mBatteryTipMap;
-    private SettingsActivity mSettingsActivity;
+    private Activity mActivity;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private boolean mNeedUpdate;
     @VisibleForTesting TipCardPreference mCardPreference;
@@ -66,8 +66,8 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
         mNeedUpdate = true;
     }
 
-    public void setActivity(SettingsActivity activity) {
-        mSettingsActivity = activity;
+    public void setActivity(Activity activity) {
+        mActivity = activity;
     }
 
     public void setFragment(InstrumentedPreferenceFragment fragment) {
@@ -126,7 +126,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
             } else {
                 final BatteryTipAction action =
                         BatteryTipUtils.getActionForBatteryTip(
-                                batteryTip, mSettingsActivity, mFragment);
+                                batteryTip, mActivity, mFragment);
                 if (action != null) {
                     action.handlePositiveAction(mFragment.getMetricsCategory());
                 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index 7dc993c3b96..c6603d70c37 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -16,16 +16,15 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.app.Activity;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import androidx.annotation.NonNull;
 
 import com.android.internal.util.CollectionUtils;
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
 import com.android.settings.fuelgauge.batterytip.actions.OpenBatterySaverAction;
@@ -33,8 +32,6 @@ import com.android.settings.fuelgauge.batterytip.actions.OpenRestrictAppFragment
 import com.android.settings.fuelgauge.batterytip.actions.RestrictAppAction;
 import com.android.settings.fuelgauge.batterytip.actions.SmartBatteryAction;
 import com.android.settings.fuelgauge.batterytip.actions.UnrestrictAppAction;
-import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate;
-import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
@@ -52,7 +49,7 @@ public class BatteryTipUtils {
             AppOpsManager appOpsManager, UserManager userManager) {
         final List<UserHandle> userHandles = userManager.getUserProfiles();
         final List<AppOpsManager.PackageOps> packageOpsList =
-                appOpsManager.getPackagesForOps(new int[] {AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
+                appOpsManager.getPackagesForOps(new int[]{AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
         final List<AppInfo> appInfos = new ArrayList<>();
 
         for (int i = 0, size = CollectionUtils.size(packageOpsList); i < size; i++) {
@@ -65,7 +62,7 @@ public class BatteryTipUtils {
                 }
                 if (entry.getMode() != AppOpsManager.MODE_ALLOWED
                         && userHandles.contains(
-                                new UserHandle(UserHandle.getUserId(packageOps.getUid())))) {
+                            new UserHandle(UserHandle.getUserId(packageOps.getUid())))) {
                     appInfos.add(
                             new AppInfo.Builder()
                                     .setPackageName(packageOps.getPackageName())
@@ -82,34 +79,34 @@ public class BatteryTipUtils {
      * Get a corresponding action based on {@code batteryTip}
      *
      * @param batteryTip used to detect which action to choose
-     * @param settingsActivity used to populate {@link BatteryTipAction}
-     * @param fragment used to populate {@link BatteryTipAction}
+     * @param activity   used to populate {@link BatteryTipAction}
+     * @param fragment   used to populate {@link BatteryTipAction}
      * @return an action for {@code batteryTip}
      */
     public static BatteryTipAction getActionForBatteryTip(
             BatteryTip batteryTip,
-            SettingsActivity settingsActivity,
+            Activity activity,
             InstrumentedPreferenceFragment fragment) {
         switch (batteryTip.getType()) {
             case BatteryTip.TipType.SMART_BATTERY_MANAGER:
-                return new SmartBatteryAction(settingsActivity, fragment);
+                return new SmartBatteryAction(activity, fragment);
             case BatteryTip.TipType.BATTERY_SAVER:
             case BatteryTip.TipType.LOW_BATTERY:
-                return new OpenBatterySaverAction(settingsActivity);
+                return new OpenBatterySaverAction(activity);
             case BatteryTip.TipType.APP_RESTRICTION:
                 if (batteryTip.getState() == BatteryTip.StateType.HANDLED) {
                     return new OpenRestrictAppFragmentAction(fragment, (RestrictAppTip) batteryTip);
                 } else {
-                    return new RestrictAppAction(settingsActivity, (RestrictAppTip) batteryTip);
+                    return new RestrictAppAction(activity, (RestrictAppTip) batteryTip);
                 }
             case BatteryTip.TipType.REMOVE_APP_RESTRICTION:
-                return new UnrestrictAppAction(settingsActivity, (UnrestrictAppTip) batteryTip);
+                return new UnrestrictAppAction(activity, (UnrestrictAppTip) batteryTip);
             default:
                 return null;
         }
     }
 
-   /** Detect and return anomaly apps after {@code timeAfterMs} */
+    /** Detect and return anomaly apps after {@code timeAfterMs} */
     public static List<AppInfo> detectAnomalies(Context context, long timeAfterMs) {
         return new ArrayList<>();
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
index 55c00313040..b2d66476093 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -16,23 +16,23 @@
 
 package com.android.settings.fuelgauge.batterytip.actions;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.fuelgauge.SmartBatterySettings;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 
 public class SmartBatteryAction extends BatteryTipAction {
-    private SettingsActivity mSettingsActivity;
+    private Activity mActivity;
     private Fragment mFragment;
 
-    public SmartBatteryAction(SettingsActivity settingsActivity, Fragment fragment) {
-        super(settingsActivity.getApplicationContext());
-        mSettingsActivity = settingsActivity;
+    public SmartBatteryAction(Activity activity, Fragment fragment) {
+        super(activity.getApplicationContext());
+        mActivity = activity;
         mFragment = fragment;
     }
 
@@ -41,7 +41,7 @@ public class SmartBatteryAction extends BatteryTipAction {
     public void handlePositiveAction(int metricsKey) {
         mMetricsFeatureProvider.action(
                 mContext, SettingsEnums.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey);
-        new SubSettingLauncher(mSettingsActivity)
+        new SubSettingLauncher(mActivity)
                 .setSourceMetricsCategory(
                         mFragment instanceof Instrumentable
                                 ? ((Instrumentable) mFragment).getMetricsCategory()
diff --git a/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java b/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
index 2f139ecaabc..592d30833ed 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/AnomalyAppItemPreference.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge.batteryusage;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
@@ -37,7 +38,7 @@ class AnomalyAppItemPreference extends PowerGaugePreference {
         setLayoutResource(R.layout.anomaly_app_item_preference);
     }
 
-    void setAnomalyHint(CharSequence anomalyHintText) {
+    void setAnomalyHint(@Nullable CharSequence anomalyHintText) {
         if (!TextUtils.equals(mAnomalyHintText, anomalyHintText)) {
             mAnomalyHintText = anomalyHintText;
             notifyChanged();
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
index 4acaeeaf5bb..88f99c3beaf 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
@@ -332,9 +332,8 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
         setBackgroundColor(Color.TRANSPARENT);
         mTrapezoidSolidColor = Utils.getColorAccentDefaultColor(context);
         mTrapezoidColor = Utils.getDisabled(context, mTrapezoidSolidColor);
-        mTrapezoidHoverColor =
-                Utils.getColorAttrDefaultColor(
-                        context, com.android.internal.R.attr.materialColorSecondaryContainer);
+        mTrapezoidHoverColor = context.getColor(
+                com.android.internal.R.color.materialColorSecondaryContainer);
         // Initializes the divider line paint.
         final Resources resources = getContext().getResources();
         mDividerWidth = resources.getDimensionPixelSize(R.dimen.chartview_divider_width);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
index b5d50994ed7..fb5a9f36dbd 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
@@ -169,6 +169,7 @@ public class BatteryDiffData {
             }
             if (packageName != null && hideBackgroundUsageTimeSet.contains(packageName)) {
                 entry.mBackgroundUsageTimeInMs = 0;
+                entry.mForegroundServiceUsageTimeInMs = 0;
             }
         }
     }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
index 2084b660b06..076676d0eab 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
@@ -51,7 +51,8 @@ final class BatteryOptimizationModeCache {
                     Pair.create(
                             BatteryOptimizationMode.forNumber(
                                     batteryOptimizeUtils.getAppOptimizationMode(
-                                            /* refreshList= */ false)),
+                                            /* refreshList= */ false,
+                                            /* ignoreUnknownMode= */ false)),
                             batteryOptimizeUtils.isOptimizeModeMutable()));
         }
         final Pair<BatteryOptimizationMode, Boolean> batteryOptimizeModeInfo =
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
index 09940b3d7f5..6fd4eb5449f 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
@@ -31,7 +31,6 @@ import android.view.View;
 import android.widget.AdapterView;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
@@ -68,11 +67,11 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     private static final String ROOT_PREFERENCE_KEY = "battery_usage_breakdown";
     private static final String FOOTER_PREFERENCE_KEY = "battery_usage_footer";
     private static final String SPINNER_PREFERENCE_KEY = "battery_usage_spinner";
-    private static final String APP_LIST_PREFERENCE_KEY = "app_list";
     private static final String PACKAGE_NAME_NONE = "none";
     private static final String SLOT_TIMESTAMP = "slot_timestamp";
     private static final String ANOMALY_KEY = "anomaly_key";
     private static final String KEY_SPINNER_POSITION = "spinner_position";
+    private static final int ENTRY_PREF_ORDER_OFFSET = 100;
     private static final List<BatteryDiffEntry> EMPTY_ENTRY_LIST = new ArrayList<>();
 
     private static int sUiMode = Configuration.UI_MODE_NIGHT_UNDEFINED;
@@ -89,8 +88,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     private SettingsSpinnerAdapter<CharSequence> mSpinnerAdapter;
 
     @VisibleForTesting Context mPrefContext;
-    @VisibleForTesting PreferenceCategory mRootPreference;
-    @VisibleForTesting PreferenceGroup mAppListPreferenceGroup;
+    @VisibleForTesting PreferenceGroup mRootPreferenceGroup;
     @VisibleForTesting FooterPreference mFooterPreference;
     @VisibleForTesting BatteryDiffData mBatteryDiffData;
     @VisibleForTesting String mBatteryUsageBreakdownTitleLastFullChargeText;
@@ -143,7 +141,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     public void onDestroy() {
         mHandler.removeCallbacksAndMessages(/* token= */ null);
         mPreferenceCache.clear();
-        mAppListPreferenceGroup.removeAll();
+        mRootPreferenceGroup.removeAll();
     }
 
     @Override
@@ -226,9 +224,8 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPrefContext = screen.getContext();
-        mRootPreference = screen.findPreference(ROOT_PREFERENCE_KEY);
+        mRootPreferenceGroup = screen.findPreference(ROOT_PREFERENCE_KEY);
         mSpinnerPreference = screen.findPreference(SPINNER_PREFERENCE_KEY);
-        mAppListPreferenceGroup = screen.findPreference(APP_LIST_PREFERENCE_KEY);
         mFooterPreference = screen.findPreference(FOOTER_PREFERENCE_KEY);
         mBatteryUsageBreakdownTitleLastFullChargeText =
                 mPrefContext.getString(
@@ -242,7 +239,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
                         R.string.battery_usage_less_than_percent_content_description,
                         formatPercentage);
 
-        mAppListPreferenceGroup.setOrderingAsAdded(false);
+        mRootPreferenceGroup.setOrderingAsAdded(false);
         mSpinnerAdapter = new SettingsSpinnerAdapter<>(mPrefContext);
         mSpinnerAdapter.addAll(
                 new String[] {
@@ -328,8 +325,9 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
                         : mPrefContext.getString(
                                 R.string.battery_usage_breakdown_title_for_slot,
                                 accessibilitySlotTimestamp);
-        mRootPreference.setTitle(Utils.createAccessibleSequence(displayTitle, accessibilityTitle));
-        mRootPreference.setVisible(true);
+        mRootPreferenceGroup.setTitle(
+                Utils.createAccessibleSequence(displayTitle, accessibilityTitle));
+        mRootPreferenceGroup.setVisible(true);
     }
 
     private void showFooterPreference(boolean isAllBatteryUsageEmpty) {
@@ -350,7 +348,6 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
             return;
         }
         mSpinnerPreference.setVisible(true);
-        mAppListPreferenceGroup.setVisible(true);
         mHandler.post(
                 () -> {
                     removeAndCacheAllUnusedPreferences();
@@ -374,7 +371,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
         }
         final long start = System.currentTimeMillis();
         final List<BatteryDiffEntry> entries = getBatteryDiffEntries();
-        int prefIndex = mAppListPreferenceGroup.getPreferenceCount();
+        int preferenceOrder = ENTRY_PREF_ORDER_OFFSET;
         for (BatteryDiffEntry entry : entries) {
             boolean isAdded = false;
             final String appLabel = entry.getAppLabel();
@@ -384,33 +381,32 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
                 continue;
             }
             final String prefKey = entry.getKey();
-            AnomalyAppItemPreference pref = mAppListPreferenceGroup.findPreference(prefKey);
-            if (pref != null) {
+            AnomalyAppItemPreference preference = mRootPreferenceGroup.findPreference(prefKey);
+            if (preference != null) {
                 isAdded = true;
             } else {
-                pref = (AnomalyAppItemPreference) mPreferenceCache.get(prefKey);
+                preference = (AnomalyAppItemPreference) mPreferenceCache.get(prefKey);
             }
             // Creates new instance if cached preference is not found.
-            if (pref == null) {
-                pref = new AnomalyAppItemPreference(mPrefContext);
-                pref.setKey(prefKey);
-                mPreferenceCache.put(prefKey, pref);
+            if (preference == null) {
+                preference = new AnomalyAppItemPreference(mPrefContext);
+                preference.setKey(prefKey);
+                mPreferenceCache.put(prefKey, preference);
             }
-            pref.setIcon(appIcon);
-            pref.setTitle(appLabel);
-            pref.setOrder(prefIndex);
-            pref.setSingleLineTitle(true);
+            preference.setIcon(appIcon);
+            preference.setTitle(appLabel);
+            preference.setOrder(++preferenceOrder);
+            preference.setSingleLineTitle(true);
             // Updates App item preference style
-            pref.setAnomalyHint(isAnomalyBatteryDiffEntry(entry) ? mAnomalyHintString : null);
+            preference.setAnomalyHint(isAnomalyBatteryDiffEntry(entry) ? mAnomalyHintString : null);
             // Sets the BatteryDiffEntry to preference for launching detailed page.
-            pref.setBatteryDiffEntry(entry);
-            pref.setSelectable(entry.validForRestriction());
-            setPreferencePercentage(pref, entry);
-            setPreferenceSummary(pref, entry);
+            preference.setBatteryDiffEntry(entry);
+            preference.setSelectable(entry.validForRestriction());
+            setPreferencePercentage(preference, entry);
+            setPreferenceSummary(preference, entry);
             if (!isAdded) {
-                mAppListPreferenceGroup.addPreference(pref);
+                mRootPreferenceGroup.addPreference(preference);
             }
-            prefIndex++;
         }
         Log.d(
                 TAG,
@@ -424,17 +420,22 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
         List<BatteryDiffEntry> entries = getBatteryDiffEntries();
         Set<String> entryKeySet = new ArraySet<>(entries.size());
         entries.forEach(entry -> entryKeySet.add(entry.getKey()));
-        final int prefsCount = mAppListPreferenceGroup.getPreferenceCount();
-        for (int index = prefsCount - 1; index >= 0; index--) {
-            final Preference pref = mAppListPreferenceGroup.getPreference(index);
-            if (entryKeySet.contains(pref.getKey())) {
-                // The pref is still used, don't remove.
+        final int preferenceCount = mRootPreferenceGroup.getPreferenceCount();
+        for (int index = preferenceCount - 1; index >= 0; index--) {
+            final Preference preference = mRootPreferenceGroup.getPreference(index);
+            if ((preference instanceof SettingsSpinnerPreference)
+                    || (preference instanceof FooterPreference)) {
+                // Consider the app preference only and skip others
                 continue;
             }
-            if (!TextUtils.isEmpty(pref.getKey())) {
-                mPreferenceCache.put(pref.getKey(), pref);
+            if (entryKeySet.contains(preference.getKey())) {
+                // Don't remove the preference if it is still in use
+                continue;
             }
-            mAppListPreferenceGroup.removePreference(pref);
+            if (!TextUtils.isEmpty(preference.getKey())) {
+                mPreferenceCache.put(preference.getKey(), preference);
+            }
+            mRootPreferenceGroup.removePreference(preference);
         }
     }
 
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
index 08369127b6d..df84aba2d89 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -20,8 +20,6 @@ import android.app.usage.UsageEvents;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.BatteryUsageStats;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -117,11 +115,9 @@ public final class BatteryUsageDataLoader {
     private static void preprocessBatteryUsageSlots(
             final Context context, final UserIdsSeries userIdsSeries) {
         final long start = System.currentTimeMillis();
-        final Handler handler = new Handler(Looper.getMainLooper());
         final BatteryLevelData batteryLevelData =
                 DataProcessManager.getBatteryLevelData(
                         context,
-                        handler,
                         userIdsSeries,
                         /* isFromPeriodJob= */ true,
                         batteryDiffDataMap -> {
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
index 0a1a547ecc2..fd548abd274 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
@@ -19,8 +19,6 @@ package com.android.settings.fuelgauge.batteryusage;
 import android.app.usage.UsageEvents;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.ArrayMap;
 import android.util.Log;
 
@@ -82,7 +80,6 @@ public class DataProcessManager {
     private final long mLastFullChargeTimestamp;
     private final boolean mIsFromPeriodJob;
     private final Context mContext;
-    private final Handler mHandler;
     private final UserIdsSeries mUserIdsSeries;
     private final OnBatteryDiffDataMapLoadedListener mCallbackFunction;
     private final List<AppUsageEvent> mAppUsageEventList = new ArrayList<>();
@@ -123,7 +120,6 @@ public class DataProcessManager {
     /** Constructor when there exists battery level data. */
     DataProcessManager(
             Context context,
-            Handler handler,
             final UserIdsSeries userIdsSeries,
             final boolean isFromPeriodJob,
             final long rawStartTimestamp,
@@ -132,7 +128,6 @@ public class DataProcessManager {
             @NonNull final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay,
             @NonNull final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap) {
         mContext = context.getApplicationContext();
-        mHandler = handler;
         mUserIdsSeries = userIdsSeries;
         mIsFromPeriodJob = isFromPeriodJob;
         mRawStartTimestamp = rawStartTimestamp;
@@ -145,11 +140,9 @@ public class DataProcessManager {
     /** Constructor when there is no battery level data. */
     DataProcessManager(
             Context context,
-            Handler handler,
             final UserIdsSeries userIdsSeries,
             @NonNull final OnBatteryDiffDataMapLoadedListener callbackFunction) {
         mContext = context.getApplicationContext();
-        mHandler = handler;
         mUserIdsSeries = userIdsSeries;
         mCallbackFunction = callbackFunction;
         mIsFromPeriodJob = false;
@@ -444,12 +437,8 @@ public class DataProcessManager {
 
             @Override
             protected void onPostExecute(final Map<Long, BatteryDiffData> batteryDiffDataMap) {
-                // Post results back to main thread to refresh UI.
-                if (mHandler != null && mCallbackFunction != null) {
-                    mHandler.post(
-                            () -> {
-                                mCallbackFunction.onBatteryDiffDataMapLoaded(batteryDiffDataMap);
-                            });
+                if (mCallbackFunction != null) {
+                    mCallbackFunction.onBatteryDiffDataMapLoaded(batteryDiffDataMap);
                 }
             }
         }.execute();
@@ -534,12 +523,8 @@ public class DataProcessManager {
 
             @Override
             protected void onPostExecute(final Map<Long, BatteryDiffData> batteryDiffDataMap) {
-                // Post results back to main thread to refresh UI.
-                if (mHandler != null && mCallbackFunction != null) {
-                    mHandler.post(
-                            () -> {
-                                mCallbackFunction.onBatteryDiffDataMapLoaded(batteryDiffDataMap);
-                            });
+                if (mCallbackFunction != null) {
+                    mCallbackFunction.onBatteryDiffDataMapLoaded(batteryDiffDataMap);
                 }
             }
         }.execute();
@@ -581,7 +566,6 @@ public class DataProcessManager {
     @Nullable
     public static BatteryLevelData getBatteryLevelData(
             Context context,
-            @Nullable Handler handler,
             final UserIdsSeries userIdsSeries,
             final boolean isFromPeriodJob,
             final OnBatteryDiffDataMapLoadedListener onBatteryUsageMapLoadedListener) {
@@ -601,7 +585,6 @@ public class DataProcessManager {
         final BatteryLevelData batteryLevelData =
                 getPeriodBatteryLevelData(
                         context,
-                        handler,
                         userIdsSeries,
                         startTimestamp,
                         lastFullChargeTime,
@@ -621,7 +604,6 @@ public class DataProcessManager {
 
     private static BatteryLevelData getPeriodBatteryLevelData(
             Context context,
-            @Nullable Handler handler,
             final UserIdsSeries userIdsSeries,
             final long startTimestamp,
             final long lastFullChargeTime,
@@ -639,7 +621,6 @@ public class DataProcessManager {
             return null;
         }
 
-        handler = handler != null ? handler : new Handler(Looper.getMainLooper());
         final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
                 sFakeBatteryHistoryMap != null
                         ? sFakeBatteryHistoryMap
@@ -650,8 +631,7 @@ public class DataProcessManager {
                                 lastFullChargeTime);
         if (batteryHistoryMap == null || batteryHistoryMap.isEmpty()) {
             Log.d(TAG, "batteryHistoryMap is null in getPeriodBatteryLevelData()");
-            new DataProcessManager(
-                            context, handler, userIdsSeries, onBatteryDiffDataMapLoadedListener)
+            new DataProcessManager(context, userIdsSeries, onBatteryDiffDataMapLoadedListener)
                     .start();
             return null;
         }
@@ -680,8 +660,7 @@ public class DataProcessManager {
                 DataProcessor.getLevelDataThroughProcessedHistoryMap(
                         context, processedBatteryHistoryMap);
         if (batteryLevelData == null) {
-            new DataProcessManager(
-                            context, handler, userIdsSeries, onBatteryDiffDataMapLoadedListener)
+            new DataProcessManager(context, userIdsSeries, onBatteryDiffDataMapLoadedListener)
                     .start();
             Log.d(TAG, "getBatteryLevelData() returns null");
             return null;
@@ -690,7 +669,6 @@ public class DataProcessManager {
         // Start the async task to compute diff usage data and load labels and icons.
         new DataProcessManager(
                         context,
-                        handler,
                         userIdsSeries,
                         isFromPeriodJob,
                         startTimestamp,
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
index ad487ef7489..0998e2d3444 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
@@ -31,8 +31,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.BatteryUsageStats;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserManager;
@@ -66,12 +64,6 @@ import java.util.stream.Collectors;
 public final class DatabaseUtils {
     private static final String TAG = "DatabaseUtils";
     private static final String SHARED_PREFS_FILE = "battery_usage_shared_prefs";
-    private static final boolean EXPLICIT_CLEAR_MEMORY_ENABLED = false;
-
-    /** Clear memory threshold for device booting phase. */
-    private static final long CLEAR_MEMORY_THRESHOLD_MS = Duration.ofMinutes(5).toMillis();
-
-    private static final long CLEAR_MEMORY_DELAYED_MS = Duration.ofSeconds(2).toMillis();
     private static final long INVALID_TIMESTAMP = 0L;
 
     static final int DATA_RETENTION_INTERVAL_DAY = 9;
@@ -593,7 +585,6 @@ public final class DatabaseUtils {
                 String.format(
                         "sendAppUsageEventData() size=%d in %d/ms",
                         size, (System.currentTimeMillis() - startTime)));
-        clearMemory();
         return valuesList;
     }
 
@@ -613,7 +604,6 @@ public final class DatabaseUtils {
                 String.format(
                         "sendBatteryEventData() in %d/ms",
                         (System.currentTimeMillis() - startTime)));
-        clearMemory();
         return contentValues;
     }
 
@@ -647,7 +637,6 @@ public final class DatabaseUtils {
                 String.format(
                         "sendBatteryEventData() size=%d in %d/ms",
                         size, (System.currentTimeMillis() - startTime)));
-        clearMemory();
         return valuesList;
     }
 
@@ -681,7 +670,6 @@ public final class DatabaseUtils {
                 String.format(
                         "sendBatteryUsageSlotData() size=%d in %d/ms",
                         size, (System.currentTimeMillis() - startTime)));
-        clearMemory();
         return valuesList;
     }
 
@@ -695,7 +683,6 @@ public final class DatabaseUtils {
         final Intent intent = BatteryUtils.getBatteryIntent(context);
         if (intent == null) {
             Log.e(TAG, "sendBatteryEntryData(): cannot fetch battery intent");
-            clearMemory();
             return null;
         }
         final int batteryLevel = BatteryStatus.getBatteryLevel(intent);
@@ -796,7 +783,6 @@ public final class DatabaseUtils {
         if (isFullChargeStart) {
             recordDateTime(context, KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
         }
-        clearMemory();
         return valuesList;
     }
 
@@ -992,20 +978,4 @@ public final class DatabaseUtils {
             writer.println(String.format("\t\t%s: %s", prefix, results.toString()));
         }
     }
-
-    private static void clearMemory() {
-        if (!EXPLICIT_CLEAR_MEMORY_ENABLED
-                || SystemClock.uptimeMillis() > CLEAR_MEMORY_THRESHOLD_MS) {
-            return;
-        }
-        final Handler mainHandler = new Handler(Looper.getMainLooper());
-        mainHandler.postDelayed(
-                () -> {
-                    System.gc();
-                    System.runFinalization();
-                    System.gc();
-                    Log.w(TAG, "invoke clearMemory()");
-                },
-                CLEAR_MEMORY_DELAYED_MS);
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index a9c23328114..1ed6a747592 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -214,20 +214,22 @@ public class PowerUsageAdvanced extends PowerUsageBase {
         if (!isResumed() || mBatteryLevelData == null) {
             return;
         }
-        mBatteryUsageMap =
-                DataProcessor.generateBatteryUsageMap(
-                        getContext(), batteryDiffDataMap, mBatteryLevelData.orElse(null));
-        Log.d(TAG, "onBatteryDiffDataMapUpdate: " + mBatteryUsageMap);
-        DataProcessor.loadLabelAndIcon(mBatteryUsageMap);
-        onSelectedSlotDataUpdated();
-        detectAnomaly();
-        logScreenUsageTime();
-        if (mBatteryChartPreferenceController != null
-                && mBatteryLevelData.isEmpty()
-                && isBatteryUsageMapNullOrEmpty()) {
-            // No available battery usage and battery level data.
-            mBatteryChartPreferenceController.showEmptyChart();
-        }
+        mHandler.post(() -> {
+            mBatteryUsageMap =
+                    DataProcessor.generateBatteryUsageMap(
+                            getContext(), batteryDiffDataMap, mBatteryLevelData.orElse(null));
+            Log.d(TAG, "onBatteryDiffDataMapUpdate: " + mBatteryUsageMap);
+            DataProcessor.loadLabelAndIcon(mBatteryUsageMap);
+            onSelectedSlotDataUpdated();
+            detectAnomaly();
+            logScreenUsageTime();
+            if (mBatteryChartPreferenceController != null
+                    && mBatteryLevelData.isEmpty()
+                    && isBatteryUsageMapNullOrEmpty()) {
+                // No available battery usage and battery level data.
+                mBatteryChartPreferenceController.showEmptyChart();
+            }
+        });
     }
 
     private void onSelectedSlotDataUpdated() {
@@ -503,7 +505,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
                 public BatteryLevelData loadInBackground() {
                     return DataProcessManager.getBatteryLevelData(
                             getContext(),
-                            mHandler,
                             new UserIdsSeries(getContext(), /* isNonUIRequest= */ false),
                             /* isFromPeriodJob= */ false,
                             PowerUsageAdvanced.this::onBatteryDiffDataMapUpdate);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
index 5ef820cad27..66c2ee9b37a 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batteryusage;
 
 import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -26,15 +27,16 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings.Global;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
-import com.android.settings.fuelgauge.BatteryHeaderPreferenceController;
+import com.android.settings.fuelgauge.BatteryHeaderTextPreferenceController;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryInfoLoader;
 import com.android.settings.fuelgauge.BatteryUtils;
@@ -65,7 +67,7 @@ public class PowerUsageSummary extends PowerUsageBase
     @VisibleForTesting BatteryUtils mBatteryUtils;
     @VisibleForTesting BatteryInfo mBatteryInfo;
 
-    @VisibleForTesting BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
+    @VisibleForTesting BatteryHeaderTextPreferenceController mBatteryHeaderTextPreferenceController;
     @VisibleForTesting BatteryTipPreferenceController mBatteryTipPreferenceController;
     @VisibleForTesting boolean mNeedUpdateBatteryTip;
     @VisibleForTesting Preference mHelpPreference;
@@ -91,8 +93,8 @@ public class PowerUsageSummary extends PowerUsageBase
 
                 @Override
                 public void onLoadFinished(Loader<BatteryInfo> loader, BatteryInfo batteryInfo) {
-                    mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
-                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                    mBatteryHeaderTextPreferenceController.updateHeaderPreference(batteryInfo);
+                    mBatteryHeaderTextPreferenceController.updateHeaderByBatteryTips(
                             mBatteryTipPreferenceController.getCurrentBatteryTip(), batteryInfo);
                     mBatteryInfo = batteryInfo;
                 }
@@ -114,7 +116,7 @@ public class PowerUsageSummary extends PowerUsageBase
                 @Override
                 public void onLoadFinished(Loader<List<BatteryTip>> loader, List<BatteryTip> data) {
                     mBatteryTipPreferenceController.updateBatteryTips(data);
-                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                    mBatteryHeaderTextPreferenceController.updateHeaderByBatteryTips(
                             mBatteryTipPreferenceController.getCurrentBatteryTip(), mBatteryInfo);
                 }
 
@@ -125,9 +127,9 @@ public class PowerUsageSummary extends PowerUsageBase
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        final SettingsActivity activity = (SettingsActivity) getActivity();
+        final Activity activity = getActivity();
 
-        mBatteryHeaderPreferenceController = use(BatteryHeaderPreferenceController.class);
+        mBatteryHeaderTextPreferenceController = use(BatteryHeaderTextPreferenceController.class);
 
         mBatteryTipPreferenceController = use(BatteryTipPreferenceController.class);
         mBatteryTipPreferenceController.setActivity(activity);
@@ -248,15 +250,6 @@ public class PowerUsageSummary extends PowerUsageBase
         mNeedUpdateBatteryTip = icicle == null || mBatteryTipPreferenceController.needUpdate();
     }
 
-    @Override
-    protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
-        super.restartBatteryStatsLoader(refreshType);
-        // Update battery header if battery is present.
-        if (mIsBatteryPresent) {
-            mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
-        }
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -270,4 +263,9 @@ public class PowerUsageSummary extends PowerUsageBase
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.power_usage_summary);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return PowerUsageSummaryScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
new file mode 100644
index 00000000000..9ff46b92663
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batteryusage
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.display.BatteryPercentageSwitchPreference
+import com.android.settings.flags.Flags
+import com.android.settings.fuelgauge.BatteryHeaderPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class PowerUsageSummaryScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.power_usage_summary_title
+
+    override val keywords: Int
+        get() = R.string.keywords_battery
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystPowerUsageSummaryScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = PowerUsageSummary::class.java
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_top_level_battery)
+
+    override fun getIcon(context: Context): Int =
+        if (Flags.homepageRevamp()) {
+            R.drawable.ic_settings_battery_filled
+        } else {
+            R.drawable.ic_settings_battery_white
+        }
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +BatteryHeaderPreference()
+        +BatteryPercentageSwitchPreference()
+    }
+
+    companion object {
+        const val KEY = "power_usage_summary_screen"
+    }
+}
diff --git a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
index 4c5e28c9d89..72f8339c509 100644
--- a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
+++ b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.gestures;
 
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 
@@ -50,6 +51,11 @@ public class ButtonNavigationSettingsAssistController extends TogglePreferenceCo
 
     @Override
     public int getAvailabilityStatus() {
+        // Hide the existing assistant UI elements when contextual search is available.
+        if (mContext.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
         if (SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
                 NAV_BAR_MODE_2BUTTON_OVERLAY)
                 || SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
diff --git a/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java
new file mode 100644
index 00000000000..0c7c65a7ffa
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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.SelectorWithWidgetPreference;
+
+public class DoubleTapPowerForCameraPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    @Nullable private Preference mPreference;
+    private final ContentObserver mSettingsObserver =
+            new ContentObserver(new Handler(Looper.getMainLooper())) {
+                @Override
+                public void onChange(boolean selfChange, @Nullable Uri uri) {
+                    if (mPreference == null || uri == null) {
+                        return;
+                    }
+                    if (uri.equals(
+                            DoubleTapPowerSettingsUtils
+                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI)) {
+                        mPreference.setEnabled(
+                                DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(
+                                        mContext));
+                    } else if (uri.equals(
+                            DoubleTapPowerSettingsUtils
+                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI)) {
+                        updateState(mPreference);
+                    }
+                }
+            };
+
+    public DoubleTapPowerForCameraPreferenceController(
+            @NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)
+                ? AVAILABLE
+                : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        if (preference instanceof SelectorWithWidgetPreference) {
+            ((SelectorWithWidgetPreference) preference)
+                    .setChecked(
+                            DoubleTapPowerSettingsUtils
+                                    .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext));
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!getPreferenceKey().equals(preference.getKey())) {
+            return false;
+        }
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+        if (preference instanceof SelectorWithWidgetPreference) {
+            ((SelectorWithWidgetPreference) preference).setChecked(true);
+        }
+        return true;
+    }
+
+    @Override
+    public void onStart() {
+        DoubleTapPowerSettingsUtils.registerObserver(mContext, mSettingsObserver);
+    }
+
+    @Override
+    public void onStop() {
+        DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+    }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java
new file mode 100644
index 00000000000..56dda4d4953
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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.SelectorWithWidgetPreference;
+
+public class DoubleTapPowerForWalletPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    @Nullable private Preference mPreference;
+    private final ContentObserver mSettingsObserver =
+            new ContentObserver(new Handler(Looper.getMainLooper())) {
+                @Override
+                public void onChange(boolean selfChange, @Nullable Uri uri) {
+                    if (mPreference == null || uri == null) {
+                        return;
+                    }
+                    if (uri.equals(
+                            DoubleTapPowerSettingsUtils
+                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI)) {
+                        mPreference.setEnabled(
+                                DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(
+                                        mContext));
+                    } else if (uri.equals(
+                            DoubleTapPowerSettingsUtils
+                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI)) {
+                        updateState(mPreference);
+                    }
+                }
+            };
+
+    public DoubleTapPowerForWalletPreferenceController(
+            @NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)
+                ? AVAILABLE
+                : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        if (preference instanceof SelectorWithWidgetPreference) {
+            ((SelectorWithWidgetPreference) preference)
+                    .setChecked(
+                            !DoubleTapPowerSettingsUtils
+                                    .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext));
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!getPreferenceKey().equals(preference.getKey())) {
+            return false;
+        }
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+        if (preference instanceof SelectorWithWidgetPreference) {
+            ((SelectorWithWidgetPreference) preference).setChecked(true);
+        }
+        return true;
+    }
+
+    @Override
+    public void onStart() {
+        DoubleTapPowerSettingsUtils.registerObserver(mContext, mSettingsObserver);
+    }
+
+    @Override
+    public void onStop() {
+        DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+    }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java
new file mode 100644
index 00000000000..75af16845dc
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI;
+
+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 androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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.widget.IllustrationPreference;
+
+/** Configures the behaviour of the double tap power illustration. */
+public class DoubleTapPowerIllustrationPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    @Nullable
+    private IllustrationPreference mIllustrationPreference;
+    private final ContentObserver mSettingsObserver =
+            new ContentObserver(new Handler(Looper.getMainLooper())) {
+                @Override
+                public void onChange(boolean selfChange, @Nullable Uri uri) {
+                    if (mIllustrationPreference != null && uri != null) {
+                        updateState(mIllustrationPreference);
+                    }
+                }
+            };
+
+    public DoubleTapPowerIllustrationPreferenceController(
+            @NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mIllustrationPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+
+        ((IllustrationPreference) preference)
+                .setLottieAnimationResId(
+                        DoubleTapPowerSettingsUtils
+                                .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+                                        mContext)
+                                ? R.drawable.quickly_open_camera
+                                : R.drawable.double_tap_power_for_wallet);
+    }
+
+    @Override
+    public void onStart() {
+        final ContentResolver resolver = mContext.getContentResolver();
+        resolver.registerContentObserver(
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI, true, mSettingsObserver);
+    }
+
+    @Override
+    public void onStop() {
+        DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+    }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java
new file mode 100644
index 00000000000..3eb18eb931d
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI;
+
+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 androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+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 double tap power button main switch enable or disable state. */
+public class DoubleTapPowerMainSwitchPreferenceController
+        extends SettingsMainSwitchPreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    private final ContentObserver mSettingsObserver =
+            new ContentObserver(new Handler(Looper.getMainLooper())) {
+                @Override
+                public void onChange(boolean selfChange, @Nullable Uri uri) {
+                    if (mSwitchPreference == null || uri == null) {
+                        return;
+                    }
+                    updateState(mSwitchPreference);
+                }
+            };
+
+    public DoubleTapPowerMainSwitchPreferenceController(
+            @NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(
+                mContext, isChecked);
+    }
+
+    @Override
+    public void onStart() {
+        final ContentResolver resolver = mContext.getContentResolver();
+        resolver.registerContentObserver(
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI, true, mSettingsObserver);
+    }
+
+    @Override
+    public void onStop() {
+        DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index 3d2e1768b2e..686d64cf1f5 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -21,22 +21,17 @@ import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_D
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
-import android.text.TextUtils;
 
-import androidx.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
-public class DoubleTapPowerPreferenceController extends GesturePreferenceController {
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
 
-    @VisibleForTesting
-    static final int ON = 0;
-    @VisibleForTesting
-    static final int OFF = 1;
+public class DoubleTapPowerPreferenceController extends BasePreferenceController {
 
-    private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
-
-    private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
-
-    public DoubleTapPowerPreferenceController(Context context, String key) {
+    public DoubleTapPowerPreferenceController(@NonNull Context context, @NonNull String key) {
         super(context, key);
     }
 
@@ -45,9 +40,13 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
                 || prefs.getBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
     }
 
-    private static boolean isGestureAvailable(Context context) {
-        return context.getResources()
-                .getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    private static boolean isGestureAvailable(@NonNull Context context) {
+        if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+            return context.getResources()
+                    .getBoolean(
+                            com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+        }
+        return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(context);
     }
 
     @Override
@@ -56,30 +55,41 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
     }
 
     @Override
-    public boolean isSliceable() {
-        return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+            final Preference preference = screen.findPreference(getPreferenceKey());
+            if (preference != null) {
+                preference.setTitle(R.string.double_tap_power_for_camera_title);
+            }
+        }
+        super.displayPreference(screen);
     }
 
     @Override
-    public boolean isPublicSlice() {
-        return true;
-    }
-
-    @Override
-    protected String getVideoPrefKey() {
-        return PREF_KEY_VIDEO;
-    }
-
-    @Override
-    public boolean isChecked() {
-        final int cameraDisabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                SECURE_KEY, ON);
-        return cameraDisabled == ON;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
-                isChecked ? ON : OFF);
+    @NonNull
+    public CharSequence getSummary() {
+        if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+            final boolean isCameraDoubleTapPowerGestureEnabled =
+                    Settings.Secure.getInt(
+                                    mContext.getContentResolver(),
+                                    CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                                    DoubleTapPowerToOpenCameraPreferenceController.ON)
+                            == DoubleTapPowerToOpenCameraPreferenceController.ON;
+            return mContext.getText(
+                    isCameraDoubleTapPowerGestureEnabled
+                            ? R.string.gesture_setting_on
+                            : R.string.gesture_setting_off);
+        }
+        if (DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)) {
+            final CharSequence onString =
+                    mContext.getText(com.android.settings.R.string.gesture_setting_on);
+            final CharSequence actionString =
+                    DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+                                    mContext)
+                            ? mContext.getText(R.string.double_tap_power_camera_action_summary)
+                            : mContext.getText(R.string.double_tap_power_wallet_action_summary);
+            return mContext.getString(R.string.double_tap_power_summary, onString, actionString);
+        }
+        return mContext.getText(com.android.settings.R.string.gesture_setting_off);
     }
 }
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 577758df396..076f23fa660 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -19,6 +19,9 @@ package com.android.settings.gestures;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.provider.SearchIndexableResource;
+
+import androidx.annotation.NonNull;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -27,6 +30,8 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.List;
+
 @SearchIndexable
 public class DoubleTapPowerSettings extends DashboardFragment {
 
@@ -56,9 +61,24 @@ public class DoubleTapPowerSettings extends DashboardFragment {
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.double_tap_power_settings;
+        return android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()
+                ? R.xml.double_tap_power_settings
+                : R.xml.double_tap_power_to_open_camera_settings;
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.double_tap_power_settings);
+            new BaseSearchIndexProvider() {
+                @Override
+                @NonNull
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        @NonNull Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId =
+                            android.service.quickaccesswallet.Flags
+                                            .launchWalletOptionOnPowerDoubleTap()
+                                    ? R.xml.double_tap_power_settings
+                                    : R.xml.double_tap_power_to_open_camera_settings;
+                    return List.of(sir);
+                }
+            };
 }
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java b/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java
new file mode 100644
index 00000000000..a1bf9cbd48c
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java
@@ -0,0 +1,149 @@
+/*
+ * 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.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.R;
+
+/** Common code for double tap power settings shared between controllers. */
+final class DoubleTapPowerSettingsUtils {
+
+    /** Setting storing whether the double tap power button gesture is enabled. */
+    private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
+            Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
+
+    static final Uri DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI =
+            Settings.Secure.getUriFor(DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED);
+
+    /** Setting storing the target action of the double tap power button gesture. */
+    private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION =
+            Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE;
+
+    static final Uri DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI =
+            Settings.Secure.getUriFor(DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION);
+
+    private static final int DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE = 0;
+    private static final int DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE = 1;
+
+    static final int ON = 1;
+    static final int OFF = 0;
+
+    /**
+     * @return true if double tap power button gesture is available.
+     */
+    public static boolean isDoubleTapPowerButtonGestureAvailable(@NonNull Context context) {
+        return context.getResources().getBoolean(R.bool.config_doubleTapPowerGestureEnabled);
+    }
+
+    /**
+     * Gets double tap power button gesture enable or disable flag from Settings provider.
+     *
+     * @return true if double tap on the power button gesture is currently enabled.
+     * @param context App context
+     */
+    public static boolean isDoubleTapPowerButtonGestureEnabled(@NonNull Context context) {
+        return Settings.Secure.getInt(
+                        context.getContentResolver(), DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, ON)
+                == ON;
+    }
+
+    /**
+     * Sets double tap power button gesture enable or disable flag to Settings provider.
+     *
+     * @param context App context
+     * @param enable enable or disable double tap power button gesture.
+     * @return {@code true} if the setting is updated.
+     */
+    public static boolean setDoubleTapPowerButtonGestureEnabled(
+            @NonNull Context context, boolean enable) {
+        return Settings.Secure.putInt(
+                context.getContentResolver(),
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+                enable ? ON : OFF);
+    }
+
+    /**
+     * @return true if double tap on the power button gesture for camera launch is currently
+     *     enabled.
+     * @param context App context
+     */
+    public static boolean isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+            @NonNull Context context) {
+        return Settings.Secure.getInt(
+                        context.getContentResolver(),
+                        DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+                        context.getResources()
+                                .getInteger(
+                                        com.android.internal.R.integer
+                                                .config_defaultDoubleTapPowerGestureAction))
+                == DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE;
+    }
+
+    /**
+     * Sets double tap power button gesture behavior to launch the camera.
+     *
+     * @param context App context
+     * @return {@code true} if the setting is updated.
+     */
+    public static boolean setDoubleTapPowerButtonForCameraLaunch(@NonNull Context context) {
+        return Settings.Secure.putInt(
+                context.getContentResolver(),
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+                DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+    }
+
+    /**
+     * Sets double tap power button gesture behavior to launch the wallet.
+     *
+     * @param context App context
+     * @return {@code true} if the setting is updated.
+     */
+    public static boolean setDoubleTapPowerButtonForWalletLaunch(@NonNull Context context) {
+        return Settings.Secure.putInt(
+                context.getContentResolver(),
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+                DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+    }
+
+    /**
+     * Registers observer for settings state.
+     *
+     * @param observer Settings Content Observer
+     */
+    public static void registerObserver(
+            @NonNull Context context, @NonNull ContentObserver observer) {
+        final ContentResolver resolver = context.getContentResolver();
+        resolver.registerContentObserver(
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI, true, observer);
+        resolver.registerContentObserver(
+                DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI, true, observer);
+    }
+
+    /** Unregisters observer. */
+    public static void unregisterObserver(
+            @NonNull Context context, @NonNull ContentObserver observer) {
+        final ContentResolver resolver = context.getContentResolver();
+        resolver.unregisterContentObserver(observer);
+    }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java
new file mode 100644
index 00000000000..4362a661007
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class DoubleTapPowerToOpenCameraPreferenceController extends TogglePreferenceController {
+
+    static final int ON = 0;
+    static final int OFF = 1;
+
+    public DoubleTapPowerToOpenCameraPreferenceController(
+            @NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources()
+                .getBoolean(
+                        com.android.internal.R.bool
+                                .config_cameraDoubleTapPowerGestureEnabled)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(
+                mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON)
+                == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                isChecked ? ON : OFF);
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
+    }
+
+    @Override
+    public boolean isPublicSlice() {
+        return true;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+}
diff --git a/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java b/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java
new file mode 100644
index 00000000000..5938b5f906f
--- /dev/null
+++ b/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Configures behaviour of Contextual Search setting.
+ */
+public class NavigationSettingsContextualSearchController extends TogglePreferenceController {
+
+    public NavigationSettingsContextualSearchController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        boolean onByDefault = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_searchAllEntrypointsEnabledDefault);
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, onByDefault ? 1 : 0)
+                == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, isChecked ? 1 : 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mContext.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {
+            return AVAILABLE;
+        }
+        return UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedSettings.java b/src/com/android/settings/gestures/OneHandedSettings.java
index 0a1ab64360c..03788889e8b 100644
--- a/src/com/android/settings/gestures/OneHandedSettings.java
+++ b/src/com/android/settings/gestures/OneHandedSettings.java
@@ -29,15 +29,19 @@ import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.internal.accessibility.AccessibilityShortcutController;
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityFragmentUtils;
 import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.SearchIndexableRaw;
 import com.android.settingslib.widget.IllustrationPreference;
 import com.android.settingslib.widget.MainSwitchPreference;
 
+import java.util.List;
+
 /**
  * Fragment for One-handed mode settings
  *
@@ -48,7 +52,8 @@ import com.android.settingslib.widget.MainSwitchPreference;
 public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
 
     private static final String TAG = "OneHandedSettings";
-    private static final String ONE_HANDED_SHORTCUT_KEY = "one_handed_shortcuts_preference";
+    @VisibleForTesting
+    static final String ONE_HANDED_SHORTCUT_KEY = "one_handed_shortcuts_preference";
     private static final String ONE_HANDED_ILLUSTRATION_KEY = "one_handed_header";
     protected static final String ONE_HANDED_MAIN_SWITCH_KEY =
             "gesture_one_handed_mode_enabled_main_switch";
@@ -180,6 +185,25 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
                 protected boolean isPageSearchEnabled(Context context) {
                     return OneHandedSettingsUtils.isSupportOneHandedMode();
                 }
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final List<SearchIndexableRaw> rawData =
+                            super.getRawDataToIndex(context, enabled);
+                    if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+                        return rawData;
+                    }
+                    rawData.add(createShortcutPreferenceSearchData(context));
+                    return rawData;
+                }
+
+                private SearchIndexableRaw createShortcutPreferenceSearchData(Context context) {
+                    final SearchIndexableRaw raw = new SearchIndexableRaw(context);
+                    raw.key = ONE_HANDED_SHORTCUT_KEY;
+                    raw.title = context.getString(R.string.one_handed_mode_shortcut_title);
+                    return raw;
+                }
             };
 
     @Override
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index cfaee006d39..9b4da46a98d 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -243,7 +243,9 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
     protected boolean setDefaultKey(String key) {
         setCurrentSystemNavigationMode(mOverlayManager, key);
         setIllustrationVideo(mVideoPreference, key);
-        setGestureNavigationTutorialDialog(key);
+        if (!android.provider.Flags.a11yStandaloneGestureEnabled()) {
+            setGestureNavigationTutorialDialog(key);
+        }
         setIllustrationClickListener(mVideoPreference, key);
         return true;
     }
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
index 1beac9b87bf..fb3bbb2ed1a 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.homepage.contextualcards.conditional;
 
+import android.app.Flags;
 import android.content.Context;
 import android.util.Log;
 
@@ -153,7 +154,9 @@ public class ConditionManager {
                 new BackgroundDataConditionController(mAppContext, this /* manager */));
         mCardControllers.add(new BatterySaverConditionController(mAppContext, this /* manager */));
         mCardControllers.add(new CellularDataConditionController(mAppContext, this /* manager */));
-        mCardControllers.add(new DndConditionCardController(mAppContext, this /* manager */));
+        if (!Flags.modesUi()) {
+            mCardControllers.add(new DndConditionCardController(mAppContext, this /* manager */));
+        }
         mCardControllers.add(new HotspotConditionController(mAppContext, this /* manager */));
         mCardControllers.add(new NightDisplayConditionController(mAppContext, this /* manager */));
         mCardControllers.add(new RingerVibrateConditionController(mAppContext, this /* manager */));
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
index 63620688419..314ccec8a80 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -35,7 +35,7 @@ import com.android.settings.notification.zen.ZenModeSettings;
 
 import java.util.Objects;
 
-
+// TODO: b/368247671 - Remove entirely when inlining MODES_UI
 public class DndConditionCardController implements ConditionalCardController {
     static final int ID = Objects.hash("DndConditionCardController");
 
diff --git a/src/com/android/settings/inputmethod/InputDeviceSettingsController.java b/src/com/android/settings/inputmethod/InputDeviceSettingsController.java
new file mode 100644
index 00000000000..cbaad934363
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputDeviceSettingsController.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public abstract class InputDeviceSettingsController extends BasePreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
+        InputManager.InputDeviceListener {
+
+    private final InputManager mIm;
+
+    @Nullable
+    private Preference mPreference;
+
+    public InputDeviceSettingsController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+        mIm = context.getSystemService(InputManager.class);
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        updateEntry();
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        updateEntry();
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        updateEntry();
+    }
+
+    @Override
+    public void onStart() {
+        mIm.registerInputDeviceListener(this, null);
+    }
+
+    @Override
+    public void onStop() {
+        mIm.unregisterInputDeviceListener(this);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mPreference = preference;
+        updateEntry();
+    }
+
+    private void updateEntry() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.setVisible(isAvailable());
+    }
+}
diff --git a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java b/src/com/android/settings/inputmethod/InputPeripheralsSettingsUtils.java
similarity index 92%
rename from src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
rename to src/com/android/settings/inputmethod/InputPeripheralsSettingsUtils.java
index f7a9aca54d6..14f79bf93d1 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
+++ b/src/com/android/settings/inputmethod/InputPeripheralsSettingsUtils.java
@@ -36,19 +36,22 @@ import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.annotation.StringRes;
+
 import com.android.settings.R;
 
 import java.util.Arrays;
 import java.util.Comparator;
 
 /**
- * Utilities of keyboard settings
+ * Utilities of input peripherals settings
  */
-public class NewKeyboardSettingsUtils {
+public class InputPeripheralsSettingsUtils {
 
     static final String EXTRA_TITLE = "keyboard_layout_picker_title";
     static final String EXTRA_USER_ID = "user_id";
     static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
+    static final String EXTRA_INPUT_DEVICE = "input_device";
     static final String EXTRA_INPUT_METHOD_INFO = "input_method_info";
     static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";
 
@@ -80,6 +83,18 @@ public class NewKeyboardSettingsUtils {
         return false;
     }
 
+    static @StringRes int getTouchpadAndMouseTitleTitleResId() {
+        boolean isMouse = isMouse();
+        boolean isTouchpad = isTouchpad();
+        if (isMouse && isTouchpad) {
+            return R.string.trackpad_mouse_settings;
+        } else if (isMouse) {
+            return R.string.mouse_settings;
+        } else {
+            return R.string.trackpad_settings;
+        }
+    }
+
     @SuppressLint("MissingPermission")
     @Nullable
     static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,
diff --git a/src/com/android/settings/inputmethod/InputSettingPreferenceController.java b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
new file mode 100644
index 00000000000..8dda8c5cd51
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.keyboard.Flags;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Abstract class for toggle controllers of Keyboard input setting related function.
+ */
+public abstract class InputSettingPreferenceController extends TogglePreferenceController implements
+        LifecycleObserver {
+    private static final int CUSTOM_PROGRESS_INTERVAL = 100;
+    private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
+    private final ContentResolver mContentResolver;
+    private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (getSettingUri().equals(uri)) {
+                onInputSettingUpdated();
+            }
+        }
+    };
+    protected AlertDialog mAlertDialog;
+
+    protected abstract void onInputSettingUpdated();
+
+    protected abstract Uri getSettingUri();
+
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+    }
+
+    protected int getInputSettingKeysValue() {
+        return 0;
+    }
+
+    public InputSettingPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        refreshSummary(preference);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Flags.keyboardAndTouchpadA11yNewPageEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return 0;
+    }
+
+    /** Invoked when the panel is resumed. */
+    @OnLifecycleEvent(ON_RESUME)
+    public void onResume() {
+        registerSettingsObserver();
+    }
+
+    /** Invoked when the panel is paused. */
+    @OnLifecycleEvent(ON_PAUSE)
+    public void onPause() {
+        unregisterSettingsObserver();
+    }
+
+    private void registerSettingsObserver() {
+        unregisterSettingsObserver();
+        mContentResolver.registerContentObserver(
+                getSettingUri(),
+                false,
+                mContentObserver,
+                UserHandle.myUserId());
+        onInputSettingUpdated();
+    }
+
+    private void unregisterSettingsObserver() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    protected void constructDialog(Context context, int titleRes, int subtitleRes) {
+        mAlertDialog = new AlertDialog.Builder(context)
+                .setView(R.layout.dialog_keyboard_a11y_input_setting_keys)
+                .setPositiveButton(android.R.string.ok,
+                        (dialog, which) -> {
+                            RadioGroup radioGroup =
+                                    mAlertDialog.findViewById(
+                                            R.id.input_setting_keys_value_group);
+                            SeekBar seekbar = mAlertDialog.findViewById(
+                                    R.id.input_setting_keys_value_custom_slider);
+                            RadioButton customRadioButton = mAlertDialog.findViewById(
+                                    R.id.input_setting_keys_value_custom);
+                            int threshold;
+                            if (customRadioButton.isChecked()) {
+                                threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
+                            } else {
+                                int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
+                                if (checkedRadioButtonId == R.id.input_setting_keys_value_600) {
+                                    threshold = 600;
+                                } else if (checkedRadioButtonId
+                                        == R.id.input_setting_keys_value_400) {
+                                    threshold = 400;
+                                } else if (checkedRadioButtonId
+                                        == R.id.input_setting_keys_value_200) {
+                                    threshold = 200;
+                                } else {
+                                    threshold = 0;
+                                }
+                            }
+                            updateInputSettingKeysValue(threshold);
+                        })
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                .create();
+        mAlertDialog.setOnShowListener(dialog -> {
+            RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_group);
+            RadioButton customRadioButton = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom);
+            TextView customValueTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom_value);
+            SeekBar customProgressBar = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom_slider);
+            TextView titleTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_dialog_title);
+            TextView subTitleTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_dialog_subtitle);
+            titleTextView.setText(titleRes);
+            subTitleTextView.setText(subtitleRes);
+
+            customProgressBar.incrementProgressBy(CUSTOM_PROGRESS_INTERVAL);
+            customProgressBar.setProgress(1);
+            View customValueView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_custom_value_option);
+            customValueView.setOnClickListener(l -> customRadioButton.performClick());
+            customRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (isChecked) {
+                    cannedValueRadioGroup.clearCheck();
+                }
+                customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+                customValueTextView.setText(
+                        progressToThresholdInSecond(customProgressBar.getProgress()));
+                customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+                buttonView.setChecked(isChecked);
+            });
+            cannedValueRadioGroup.setOnCheckedChangeListener(
+                    (group, checkedId) -> customRadioButton.setChecked(false));
+            customProgressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    customValueTextView.setText(progressToThresholdInSecond(progress));
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                }
+            });
+            initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
+                    customProgressBar);
+        });
+    }
+
+    private static String progressToThresholdInSecond(int progress) {
+        return String.valueOf((double) progress * CUSTOM_PROGRESS_INTERVAL
+                / MILLISECOND_IN_SECONDS);
+    }
+
+    private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
+            RadioButton customRadioButton, TextView customValueTextView,
+            SeekBar customProgressBar) {
+        int inputSettingKeysThreshold = getInputSettingKeysValue();
+        switch (inputSettingKeysThreshold) {
+            case 600 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_600);
+            case 400 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_400);
+            case 0, 200 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_200);
+            default -> {
+                customValueTextView.setText(
+                        String.valueOf(
+                                (double) inputSettingKeysThreshold / MILLISECOND_IN_SECONDS));
+                customProgressBar.setProgress(inputSettingKeysThreshold / CUSTOM_PROGRESS_INTERVAL);
+                customRadioButton.setChecked(true);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
index 6dad8c08d35..6bd836feb08 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
@@ -20,20 +20,36 @@ import android.content.Context;
 import android.hardware.input.InputSettings;
 import android.net.Uri;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settingslib.PrimarySwitchPreference;
 
 public class KeyboardAccessibilityBounceKeysController extends
-        KeyboardAccessibilityController implements
+        InputSettingPreferenceController implements
         LifecycleObserver {
     public static final int BOUNCE_KEYS_THRESHOLD = 500;
 
+    @Nullable
+    private PrimarySwitchPreference mPrimaryPreference;
+
     public KeyboardAccessibilityBounceKeysController(@NonNull Context context,
             @NonNull String key) {
         super(context, key);
+        constructDialog(context, R.string.bounce_keys_dialog_title,
+                R.string.bounce_keys_dialog_subtitle);
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPrimaryPreference = screen.findPreference(getPreferenceKey());
     }
 
     @Override
@@ -43,6 +59,17 @@ public class KeyboardAccessibilityBounceKeysController extends
                 : UNSUPPORTED_ON_DEVICE;
     }
 
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        if (mAlertDialog != null) {
+            mAlertDialog.show();
+        }
+        return true;
+    }
+
     @Override
     public boolean isChecked() {
         return InputSettings.isAccessibilityBounceKeysEnabled(mContext);
@@ -50,21 +77,16 @@ public class KeyboardAccessibilityBounceKeysController extends
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilityBounceKeysThreshold(mContext,
-                isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
+        updateInputSettingKeysValue(isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
         return true;
     }
 
-    @NonNull
     @Override
-    public CharSequence getSummary() {
-        return mContext.getString(R.string.bounce_keys_summary, BOUNCE_KEYS_THRESHOLD);
-    }
-
-    @Override
-    protected void updateKeyboardAccessibilitySettings() {
-        setChecked(
-                InputSettings.isAccessibilityBounceKeysEnabled(mContext));
+    protected void onInputSettingUpdated() {
+        if (mPrimaryPreference != null) {
+            mPrimaryPreference.setChecked(
+                    InputSettings.isAccessibilityBounceKeysEnabled(mContext));
+        }
     }
 
     @Override
@@ -72,4 +94,14 @@ public class KeyboardAccessibilityBounceKeysController extends
         return Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS);
     }
+
+    @Override
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+        InputSettings.setAccessibilityBounceKeysThreshold(mContext, thresholdTimeMillis);
+    }
+
+    @Override
+    protected int getInputSettingKeysValue() {
+        return InputSettings.getAccessibilityBounceKeysThreshold(mContext);
+    }
 }
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityController.java
deleted file mode 100644
index 25a93b0b532..00000000000
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityController.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.UserHandle;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.Preference;
-
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.keyboard.Flags;
-
-/**
- * Abstract class for toggle controllers of Keyboard accessibility related function.
- */
-public abstract class KeyboardAccessibilityController extends TogglePreferenceController implements
-        LifecycleObserver {
-    private final ContentResolver mContentResolver;
-    private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (getSettingUri().equals(uri)) {
-                updateKeyboardAccessibilitySettings();
-            }
-        }
-    };
-
-    protected abstract void updateKeyboardAccessibilitySettings();
-
-    protected abstract Uri getSettingUri();
-
-    public KeyboardAccessibilityController(@NonNull Context context,
-            @NonNull String preferenceKey) {
-        super(context, preferenceKey);
-        mContentResolver = context.getContentResolver();
-    }
-
-    @Override
-    public void updateState(@NonNull Preference preference) {
-        super.updateState(preference);
-        refreshSummary(preference);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return Flags.keyboardAndTouchpadA11yNewPageEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return 0;
-    }
-
-    /** Invoked when the panel is resumed. */
-    @OnLifecycleEvent(ON_RESUME)
-    public void onResume() {
-        registerSettingsObserver();
-    }
-
-    /** Invoked when the panel is paused. */
-    @OnLifecycleEvent(ON_PAUSE)
-    public void onPause() {
-        unregisterSettingsObserver();
-    }
-
-    private void registerSettingsObserver() {
-        unregisterSettingsObserver();
-        mContentResolver.registerContentObserver(
-                getSettingUri(),
-                false,
-                mContentObserver,
-                UserHandle.myUserId());
-        updateKeyboardAccessibilitySettings();
-    }
-
-    private void unregisterSettingsObserver() {
-        mContentResolver.unregisterContentObserver(mContentObserver);
-    }
-}
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
index 7c7ad37a359..34f53c47dce 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
@@ -22,15 +22,38 @@ import android.net.Uri;
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
 
 public class KeyboardAccessibilityMouseKeysController extends
-        KeyboardAccessibilityController implements
+        InputSettingPreferenceController implements
         LifecycleObserver {
+    private static final String KEY_MOUSE_KEY = "accessibility_mouse_keys";
+    private static final String KEY_MOUSE_KEY_MAIN_PAGE = "mouse_keys_main_switch";
+
+    @Nullable
+    private PrimarySwitchPreference mPrimaryPreference;
+    @Nullable
+    private MainSwitchPreference mMainSwitchPreference;
+
     public KeyboardAccessibilityMouseKeysController(@NonNull Context context, @NonNull String key) {
         super(context, key);
     }
 
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (KEY_MOUSE_KEY.equals(getPreferenceKey())) {
+            mPrimaryPreference = screen.findPreference(getPreferenceKey());
+        } else if (KEY_MOUSE_KEY_MAIN_PAGE.equals(getPreferenceKey())) {
+            mMainSwitchPreference = screen.findPreference(getPreferenceKey());
+        }
+    }
+
     @Override
     public boolean isChecked() {
         return InputSettings.isAccessibilityMouseKeysEnabled(mContext);
@@ -51,9 +74,14 @@ public class KeyboardAccessibilityMouseKeysController extends
     }
 
     @Override
-    protected void updateKeyboardAccessibilitySettings() {
-        setChecked(
-                InputSettings.isAccessibilityMouseKeysEnabled(mContext));
+    protected void onInputSettingUpdated() {
+        if (mPrimaryPreference != null) {
+            mPrimaryPreference.setChecked(
+                    InputSettings.isAccessibilityMouseKeysEnabled(mContext));
+        } else if (mMainSwitchPreference != null) {
+            mMainSwitchPreference.setChecked(
+                    InputSettings.isAccessibilityMouseKeysEnabled(mContext));
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
index 5110663e4ad..857623a6839 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
@@ -20,19 +20,34 @@ import android.content.Context;
 import android.hardware.input.InputSettings;
 import android.net.Uri;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settingslib.PrimarySwitchPreference;
 
 public class KeyboardAccessibilitySlowKeysController extends
-        KeyboardAccessibilityController implements
+        InputSettingPreferenceController implements
         LifecycleObserver {
     public static final int SLOW_KEYS_THRESHOLD = 500;
 
+    @Nullable
+    private PrimarySwitchPreference mPrimarySwitchPreference;
+
     public KeyboardAccessibilitySlowKeysController(@NonNull Context context, @NonNull String key) {
         super(context, key);
+        constructDialog(context, R.string.slow_keys, R.string.slow_keys_summary);
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPrimarySwitchPreference = screen.findPreference(getPreferenceKey());
     }
 
     @Override
@@ -42,8 +57,7 @@ public class KeyboardAccessibilitySlowKeysController extends
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilitySlowKeysThreshold(mContext,
-                isChecked ? SLOW_KEYS_THRESHOLD : 0);
+        updateInputSettingKeysValue(isChecked ? SLOW_KEYS_THRESHOLD : 0);
         return true;
     }
 
@@ -54,16 +68,12 @@ public class KeyboardAccessibilitySlowKeysController extends
                 : UNSUPPORTED_ON_DEVICE;
     }
 
-    @NonNull
     @Override
-    public CharSequence getSummary() {
-        return mContext.getString(R.string.slow_keys_summary, SLOW_KEYS_THRESHOLD);
-    }
-
-    @Override
-    protected void updateKeyboardAccessibilitySettings() {
-        setChecked(
-                InputSettings.isAccessibilitySlowKeysEnabled(mContext));
+    protected void onInputSettingUpdated() {
+        if (mPrimarySwitchPreference != null) {
+            mPrimarySwitchPreference.setChecked(
+                    InputSettings.isAccessibilitySlowKeysEnabled(mContext));
+        }
     }
 
     @Override
@@ -71,4 +81,25 @@ public class KeyboardAccessibilitySlowKeysController extends
         return Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_SLOW_KEYS);
     }
+
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        if (mAlertDialog != null) {
+            mAlertDialog.show();
+        }
+        return true;
+    }
+
+    @Override
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+        InputSettings.setAccessibilitySlowKeysThreshold(mContext, thresholdTimeMillis);
+    }
+
+    @Override
+    protected int getInputSettingKeysValue() {
+        return InputSettings.getAccessibilitySlowKeysThreshold(mContext);
+    }
 }
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
index a62d80bee2c..fd2cb2e6e11 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
@@ -23,15 +23,26 @@ import android.provider.Settings;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
 
 public class KeyboardAccessibilityStickyKeysController extends
-        KeyboardAccessibilityController implements
+        InputSettingPreferenceController implements
         LifecycleObserver {
+
+    private TwoStatePreference mTwoStatePreference;
+
     public KeyboardAccessibilityStickyKeysController(@NonNull Context context,
             @NonNull String key) {
         super(context, key);
     }
 
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mTwoStatePreference = screen.findPreference(getPreferenceKey());
+    }
+
     @Override
     public boolean isChecked() {
         return InputSettings.isAccessibilityStickyKeysEnabled(mContext);
@@ -52,9 +63,11 @@ public class KeyboardAccessibilityStickyKeysController extends
     }
 
     @Override
-    protected void updateKeyboardAccessibilitySettings() {
-        setChecked(
-                InputSettings.isAccessibilityStickyKeysEnabled(mContext));
+    protected void onInputSettingUpdated() {
+        if (mTwoStatePreference != null) {
+            mTwoStatePreference.setChecked(
+                    InputSettings.isAccessibilityStickyKeysEnabled(mContext));
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
index 54c608cf309..a4baa917c84 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
@@ -308,7 +308,7 @@ public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment
         public Keyboards loadInBackground() {
             Keyboards keyboards = new Keyboards();
             InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE);
-            if (mInputDeviceIdentifier == null || NewKeyboardSettingsUtils.getInputDevice(
+            if (mInputDeviceIdentifier == null || InputPeripheralsSettingsUtils.getInputDevice(
                     im, mInputDeviceIdentifier) == null) {
                 keyboards.keyboardLayouts.add(null); // default layout
                 keyboards.current = 0;
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
index 1f29a2b153d..97d8ffcff84 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
@@ -68,11 +68,13 @@ public class KeyboardLayoutPickerController extends BasePreferenceController imp
     public void onStart() {
         mIm.registerInputDeviceListener(this, null);
         if (mInputDeviceIdentifier == null
-                || NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier) == null) {
+                || InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier)
+                == null) {
             return;
         }
         mInputDeviceId =
-                NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier).getId();
+                InputPeripheralsSettingsUtils.getInputDevice(mIm,
+                        mInputDeviceIdentifier).getId();
         updateCheckedState();
     }
 
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 8abde7e35b4..c21ac636f09 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -46,7 +46,7 @@ public class KeyboardLayoutPickerFragment extends DashboardFragment {
         final InputDeviceIdentifier inputDeviceIdentifier = getActivity().getIntent().
                 getParcelableExtra(EXTRA_INPUT_DEVICE_IDENTIFIER);
         final InputManager im = context.getSystemService(InputManager.class);
-        if (NewKeyboardSettingsUtils.getInputDevice(im, inputDeviceIdentifier) == null) {
+        if (InputPeripheralsSettingsUtils.getInputDevice(im, inputDeviceIdentifier) == null) {
             return;
         }
         use(KeyboardLayoutPickerController.class).initialize(this /*parent*/,
diff --git a/src/com/android/settings/inputmethod/KeyboardRepeatKeysController.java b/src/com/android/settings/inputmethod/KeyboardRepeatKeysController.java
new file mode 100644
index 00000000000..28392beb34a
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardRepeatKeysController.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+
+public class KeyboardRepeatKeysController extends
+        InputSettingPreferenceController implements
+        LifecycleObserver {
+    private static final String KEY_REPEAT_KEY = "physical_keyboard_repeat_keys";
+    private static final String KEY_REPEAT_KEY_MAIN_PAGE = "repeat_key_main_switch";
+
+    @Nullable
+    private PrimarySwitchPreference mPrimarySwitchPreference;
+    @Nullable
+    private MainSwitchPreference mMainSwitchPreference;
+
+    public KeyboardRepeatKeysController(@NonNull Context context,
+            @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (KEY_REPEAT_KEY.equals(getPreferenceKey())) {
+            mPrimarySwitchPreference = screen.findPreference(getPreferenceKey());
+        } else if (KEY_REPEAT_KEY_MAIN_PAGE.equals(getPreferenceKey())) {
+            mMainSwitchPreference = screen.findPreference(getPreferenceKey());
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return InputSettings.isRepeatKeysFeatureFlagEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return InputSettings.isRepeatKeysEnabled(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        InputSettings.setRepeatKeysEnabled(mContext, isChecked);
+        return true;
+    }
+
+    @Override
+    protected void onInputSettingUpdated() {
+        if (mPrimarySwitchPreference != null) {
+            mPrimarySwitchPreference.setChecked(InputSettings.isRepeatKeysEnabled(mContext));
+        } else if (mMainSwitchPreference != null) {
+            mMainSwitchPreference.setChecked(InputSettings.isRepeatKeysEnabled(mContext));
+        }
+    }
+
+    @Override
+    protected Uri getSettingUri() {
+        return Settings.Secure.getUriFor(
+                Settings.Secure.KEY_REPEAT_ENABLED);
+    }
+}
diff --git a/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceController.java b/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceController.java
new file mode 100644
index 00000000000..bb074fd94f7
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.SliderPreferenceController;
+
+import com.google.common.collect.ImmutableList;
+
+public class KeyboardRepeatKeysDelayPreferenceController extends SliderPreferenceController {
+    @VisibleForTesting
+    static final ImmutableList<Integer> REPEAT_KEY_DELAY_VALUE_LIST = ImmutableList.of(2000, 1000,
+            500, 300, 200, 100, 50, 30, 20);
+
+    public KeyboardRepeatKeysDelayPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return REPEAT_KEY_DELAY_VALUE_LIST.indexOf(InputSettings.getRepeatKeysDelay(mContext));
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        InputSettings.setRepeatKeysDelay(mContext, REPEAT_KEY_DELAY_VALUE_LIST.get(position));
+        return true;
+    }
+
+    @Override
+    public int getMax() {
+        return REPEAT_KEY_DELAY_VALUE_LIST.size() - 1;
+    }
+
+    @Override
+    public int getMin() {
+        return 0;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return InputSettings.isRepeatKeysFeatureFlagEnabled()
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/KeyboardRepeatKeysMainFragment.java b/src/com/android/settings/inputmethod/KeyboardRepeatKeysMainFragment.java
new file mode 100644
index 00000000000..39e605d1d59
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardRepeatKeysMainFragment.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.settings.inputmethod.PhysicalKeyboardFragment.getHardKeyboards;
+
+import android.app.settings.SettingsEnums;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.hardware.input.InputManager;
+import android.hardware.input.InputSettings;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.LabeledSeekBarPreference;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.List;
+
+public class KeyboardRepeatKeysMainFragment extends DashboardFragment
+        implements InputManager.InputDeviceListener {
+    private static final String TAG = "RepeatKeysMainFragment";
+    private static final String TIME_OUT_KEY = "repeat_keys_timeout_preference";
+    private static final String DELAY_KEY = "repeat_keys_delay_preference";
+
+    private final Uri mRepeatKeyUri = Settings.Secure.getUriFor(
+            Settings.Secure.KEY_REPEAT_ENABLED);
+    private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (mRepeatKeyUri.equals(uri)) {
+                updatePreferencesState();
+            }
+        }
+    };
+    private InputManager mInputManager;
+    private ContentResolver mContentResolver;
+    @Nullable
+    private LabeledSeekBarPreference mRepeatTimeoutPreference;
+    @Nullable
+    private LabeledSeekBarPreference mRepeatDelayPreference;
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.PHYSICAL_KEYBOARD_A11Y;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        mInputManager = Preconditions.checkNotNull(getActivity()
+                .getSystemService(InputManager.class));
+        mContentResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle bundle, String s) {
+        super.onCreatePreferences(bundle, s);
+        mRepeatTimeoutPreference = findPreference(TIME_OUT_KEY);
+        mRepeatDelayPreference = findPreference(DELAY_KEY);
+        updatePreferencesState();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        finishEarlyIfNeeded();
+        mInputManager.registerInputDeviceListener(this, null);
+        registerSettingsObserver();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mInputManager.unregisterInputDeviceListener(this);
+        unregisterSettingsObserver();
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.repeat_key_main_page;
+    }
+
+    private void updatePreferencesState() {
+        boolean isRepeatKeyEnabled = InputSettings.isRepeatKeysEnabled(getContext());
+        if (mRepeatTimeoutPreference != null && mRepeatDelayPreference != null) {
+            mRepeatTimeoutPreference.setEnabled(isRepeatKeyEnabled);
+            mRepeatDelayPreference.setEnabled(isRepeatKeyEnabled);
+        }
+    }
+
+    private void registerSettingsObserver() {
+        unregisterSettingsObserver();
+        mContentResolver.registerContentObserver(
+                mRepeatKeyUri,
+                false,
+                mContentObserver,
+                UserHandle.myUserId());
+    }
+
+    private void unregisterSettingsObserver() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    private void finishEarlyIfNeeded() {
+        final Context context = getContext();
+        ThreadUtils.postOnBackgroundThread(() -> {
+            final List<PhysicalKeyboardFragment.HardKeyboardDeviceInfo> newHardKeyboards =
+                    getHardKeyboards(context);
+            if (newHardKeyboards.isEmpty()) {
+                getActivity().finish();
+            }
+        });
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.repeat_key_main_page) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.keyboardAndTouchpadA11yNewPageEnabled()
+                            && !getHardKeyboards(context).isEmpty();
+                }
+            };
+}
diff --git a/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceController.java b/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceController.java
new file mode 100644
index 00000000000..e766d48318e
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.SliderPreferenceController;
+
+import com.google.common.collect.ImmutableList;
+
+public class KeyboardRepeatKeysTimeOutPreferenceController extends SliderPreferenceController {
+    @VisibleForTesting
+    static final ImmutableList<Integer> REPEAT_KEY_TIMEOUT_VALUE_LIST = ImmutableList.of(2000, 1500,
+            1000, 400, 300, 200, 150);
+
+    public KeyboardRepeatKeysTimeOutPreferenceController(
+            @NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return REPEAT_KEY_TIMEOUT_VALUE_LIST.indexOf(InputSettings.getRepeatKeysTimeout(mContext));
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        InputSettings.setRepeatKeysTimeout(mContext, REPEAT_KEY_TIMEOUT_VALUE_LIST.get(position));
+        return true;
+    }
+
+    @Override
+    public int getMax() {
+        return REPEAT_KEY_TIMEOUT_VALUE_LIST.size() - 1;
+    }
+
+    @Override
+    public int getMin() {
+        return 0;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return InputSettings.isRepeatKeysFeatureFlagEnabled()
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java
index 72551074148..4233ce21877 100644
--- a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java
+++ b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java
@@ -35,20 +35,21 @@ public interface KeyboardSettingsFeatureProvider {
     boolean supportsFirmwareUpdate();
 
     /**
-     * Add firmware update preference category .
+     * Register firmware information preferences update on preference screen.
      *
-     * @param context The context to initialize the application with.
-     * @param screen  The {@link PreferenceScreen} to add the firmware update preference category.
-     *
-     * @return true if the category is added successfully.
+     * @param screen The {@link PreferenceScreen} to add the firmware information preferences.
      */
-    boolean addFirmwareUpdateCategory(Context context, PreferenceScreen screen);
+    void registerKeyboardInformationCategory(@Nullable PreferenceScreen screen);
+
+    /**
+     * Unregister firmware information preferences update on preference screen.
+     */
+    void unregisterKeyboardInformationCategory();
 
     /**
      * Get custom action key icon.
      *
      * @param context Context for accessing resources.
-     *
      * @return Returns the image of the icon, or null if there is no any custom icon.
      */
     @Nullable
diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java
index 26b10e585e1..b6cc774fb80 100644
--- a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java
+++ b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java
@@ -19,6 +19,7 @@ package com.android.settings.inputmethod;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
+import androidx.annotation.Nullable;
 import androidx.preference.PreferenceScreen;
 
 /**
@@ -32,12 +33,13 @@ public class KeyboardSettingsFeatureProviderImpl implements KeyboardSettingsFeat
     }
 
     @Override
-    public boolean addFirmwareUpdateCategory(Context context, PreferenceScreen screen) {
-        return false;
-    }
+    public void registerKeyboardInformationCategory(@Nullable PreferenceScreen screen) {}
+
+    @Override
+    public void unregisterKeyboardInformationCategory() {}
 
     @Override
     public Drawable getActionKeyIcon(Context context) {
         return null;
-    };
+    }
 }
diff --git a/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java b/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
index fa7b372d709..9683b8787b9 100644
--- a/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
+++ b/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
@@ -316,7 +316,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment {
     }
 
     private int getColorOfMaterialColorPrimary() {
-        return Utils.getColorAttrDefaultColor(
-                mActivity, com.android.internal.R.attr.materialColorPrimary);
+        return mActivity.getColor(com.android.internal.R.color.materialColorPrimary);
     }
 }
diff --git a/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java b/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
index 5a5b69e4a16..58e49bf2cd5 100644
--- a/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
+++ b/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
@@ -36,7 +36,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.Utils;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.ArrayList;
@@ -202,8 +201,7 @@ public class ModifierKeysPreferenceController extends BasePreferenceController {
     }
 
     private int getColorOfMaterialColorPrimary() {
-        return Utils.getColorAttrDefaultColor(
-                mContext, com.android.internal.R.attr.materialColorPrimary);
+        return mContext.getColor(com.android.internal.R.color.materialColorPrimary);
     }
 
     private static boolean isCtrl(int keyCode) {
diff --git a/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java b/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
index 4bb106915d4..20defa9a0cc 100644
--- a/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
+++ b/src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.Utils;
 
 public class ModifierKeysRestorePreferenceController extends BasePreferenceController {
 
@@ -88,7 +87,6 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
     }
 
     private int getColorOfMaterialColorPrimary() {
-        return Utils.getColorAttrDefaultColor(
-                mParent.getActivity(), com.android.internal.R.attr.materialColorPrimary);
+        return mParent.getActivity().getColor(com.android.internal.R.color.materialColorPrimary);
     }
 }
diff --git a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
new file mode 100644
index 00000000000..65024b1b2cf
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class MouseKeysImageListAdapter extends
+        RecyclerView.Adapter<MouseKeysImageListAdapter.MouseKeyImageViewHolder> {
+    private static final ImmutableList<Integer> DRAWABLE_LIST = ImmutableList.of(
+            R.drawable.mouse_keys_directional, R.drawable.mouse_keys_click,
+            R.drawable.mouse_keys_press_hold, R.drawable.mouse_keys_release,
+            R.drawable.mouse_keys_toggle_scroll, R.drawable.mouse_keys_release2);
+    private static final ImmutableList<Integer> DIRECTIONAL_CHAR_KEYCODE_LIST = ImmutableList.of(
+            KeyEvent.KEYCODE_7, KeyEvent.KEYCODE_8, KeyEvent.KEYCODE_9, KeyEvent.KEYCODE_U,
+            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_J, KeyEvent.KEYCODE_K, KeyEvent.KEYCODE_L
+    );
+    private static final int LEFT_CLICK_CHAR_KEYCODE =
+            KeyEvent.KEYCODE_I;
+    private static final int PRESS_HOLD_CHAR_KEYCODE =
+            KeyEvent.KEYCODE_M;
+    private static final int RELEASE_CHAR_KEYCODE =
+            KeyEvent.KEYCODE_COMMA;
+    private static final ImmutableList<Integer> TOGGLE_SCROLL_CHAR_KEYCODE_LIST = ImmutableList.of(
+            KeyEvent.KEYCODE_PERIOD, KeyEvent.KEYCODE_8, KeyEvent.KEYCODE_K, KeyEvent.KEYCODE_O,
+            KeyEvent.KEYCODE_U
+    );
+    private static final int RIGHT_CLICK_CHAR_KEYCODE =
+            KeyEvent.KEYCODE_SLASH;
+    private final List<String> mComposedSummaryList = new ArrayList<>();
+
+    public MouseKeysImageListAdapter(@NonNull Context context,
+            @Nullable InputDevice currentInputDevice) {
+        composeSummaryForImages(context, currentInputDevice);
+    }
+
+    @NonNull
+    @Override
+    public MouseKeyImageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.mouse_keys_image_item, parent, false);
+        return new MouseKeyImageViewHolder(view, parent.getContext());
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MouseKeyImageViewHolder holder, int position) {
+        ((MouseKeyImageViewHolder) holder).bindView(DRAWABLE_LIST.get(position),
+                mComposedSummaryList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return DRAWABLE_LIST.size();
+    }
+
+    private void composeSummaryForImages(Context context,
+            @Nullable InputDevice currentInputDevice) {
+        if (currentInputDevice == null) {
+            return;
+        }
+        mComposedSummaryList.clear();
+        List<String> directionalLabelList = DIRECTIONAL_CHAR_KEYCODE_LIST.stream().map(
+                (key) -> getDisplayLabel(currentInputDevice, key)).toList();
+        mComposedSummaryList.add(context.getString(R.string.mouse_keys_directional_summary,
+                String.join(",", directionalLabelList)));
+        String leftClickLabel = getDisplayLabel(currentInputDevice, LEFT_CLICK_CHAR_KEYCODE);
+        mComposedSummaryList.add(
+                context.getString(R.string.mouse_keys_click_summary, leftClickLabel));
+        String pressHoldLabel = getDisplayLabel(currentInputDevice, PRESS_HOLD_CHAR_KEYCODE);
+        mComposedSummaryList.add(
+                context.getString(R.string.mouse_keys_press_hold_summary, pressHoldLabel));
+        String releaseLabel = getDisplayLabel(currentInputDevice, RELEASE_CHAR_KEYCODE);
+        mComposedSummaryList.add(
+                context.getString(R.string.mouse_keys_release_summary, releaseLabel));
+        List<String> toggleScrollLabelList = TOGGLE_SCROLL_CHAR_KEYCODE_LIST.stream().map(
+                (key) -> getDisplayLabel(currentInputDevice, key)).toList();
+        mComposedSummaryList.add(context.getString(R.string.mouse_keys_toggle_scroll_summary,
+                toggleScrollLabelList.getFirst(),
+                String.join(",", toggleScrollLabelList.subList(1, toggleScrollLabelList.size()))
+        ));
+        String rightClickLabel = getDisplayLabel(currentInputDevice, RIGHT_CLICK_CHAR_KEYCODE);
+        mComposedSummaryList.add(
+                context.getString(R.string.mouse_keys_release2_summary, rightClickLabel));
+    }
+
+    private String getDisplayLabel(InputDevice currentInputDevice, int keycode) {
+        return String.valueOf(currentInputDevice.getKeyCharacterMap().getDisplayLabel(
+                currentInputDevice.getKeyCodeForKeyLocation(keycode))).toLowerCase(Locale.ROOT);
+    }
+
+    public static class MouseKeyImageViewHolder extends RecyclerView.ViewHolder {
+        private final TextView mTextView;
+        private final Context mContext;
+
+        public MouseKeyImageViewHolder(View itemView, Context context) {
+            super(itemView);
+            mTextView = (TextView) itemView;
+            mContext = context;
+        }
+
+        void bindView(int drawableRes, String summary) {
+            mTextView.setText(summary);
+            mTextView.setCompoundDrawablesWithIntrinsicBounds(null,
+                    mContext.getDrawable(drawableRes), null, null);
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
new file mode 100644
index 00000000000..dd9c1ddf62f
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.settings.inputmethod.PhysicalKeyboardFragment.getHardKeyboards;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.os.Bundle;
+import android.view.InputDevice;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.utils.ThreadUtils;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.List;
+
+@SearchIndexable
+public class MouseKeysMainPageFragment extends DashboardFragment
+        implements InputManager.InputDeviceListener {
+
+    private static final String TAG = "MouseKeysMainPageFragment";
+    private static final String KEY_MOUSE_KEY_LIST = "mouse_keys_list";
+
+    private InputManager mInputManager;
+    private LayoutPreference mMouseKeyImagesPreference;
+    @Nullable
+    private InputDevice mCurrentInputDevice;
+
+    @Override
+    public void onCreate(@NonNull Bundle bundle) {
+        super.onCreate(bundle);
+        mCurrentInputDevice = getInputDevice();
+        final PreferenceScreen screen = getPreferenceScreen();
+        mMouseKeyImagesPreference = screen.findPreference(KEY_MOUSE_KEY_LIST);
+        mInputManager = Preconditions.checkNotNull(getActivity()
+                .getSystemService(InputManager.class));
+        String title = mCurrentInputDevice == null ? getActivity().getString(R.string.mouse_keys)
+                : getActivity().getString(R.string.mouse_key_main_page_title,
+                        mCurrentInputDevice.getName());
+        getActivity().setTitle(title);
+        configureImagesPreference();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        finishEarlyIfNeeded();
+        mInputManager.registerInputDeviceListener(this, null);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mInputManager.unregisterInputDeviceListener(this);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.PHYSICAL_KEYBOARD_A11Y;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.mouse_keys_main_page;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        finishEarlyIfNeeded();
+    }
+
+    private void finishEarlyIfNeeded() {
+        final Context context = getContext();
+        ThreadUtils.postOnBackgroundThread(() -> {
+            final List<PhysicalKeyboardFragment.HardKeyboardDeviceInfo> newHardKeyboards =
+                    getHardKeyboards(context);
+            if (newHardKeyboards.isEmpty()) {
+                getActivity().finish();
+            }
+        });
+    }
+
+    private void configureImagesPreference() {
+        final RecyclerView recyclerView = mMouseKeyImagesPreference.findViewById(
+                R.id.mouse_keys_image_recycler_list);
+        recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
+        recyclerView.setAdapter(new MouseKeysImageListAdapter(getActivity(), mCurrentInputDevice));
+    }
+
+    /**
+     * Priority of picking input device:
+     * 1. internal keyboard(built-in keyboard)
+     * 2. first keyboard in the list
+     */
+    @Nullable
+    private InputDevice getInputDevice() {
+        InputDevice inputDevice = null;
+        for (int deviceId : InputDevice.getDeviceIds()) {
+            final InputDevice device = InputDevice.getDevice(deviceId);
+            if (device == null || device.isVirtual() || !device.isFullKeyboard()) {
+                continue;
+            }
+            if (inputDevice == null) {
+                inputDevice = device;
+            } else if (!device.isExternal()) {
+                inputDevice = device;
+                break;
+            }
+        }
+        return inputDevice;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.mouse_keys_main_page) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.keyboardAndTouchpadA11yNewPageEnabled()
+                            && !getHardKeyboards(context).isEmpty();
+                }
+            };
+}
diff --git a/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceController.java b/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceController.java
new file mode 100644
index 00000000000..977e906e2a5
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceController.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class MouseReverseVerticalScrollingPreferenceController extends TogglePreferenceController {
+
+    public MouseReverseVerticalScrollingPreferenceController(
+            @NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return InputSettings.isMouseReverseVerticalScrollingEnabled(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        InputSettings.setMouseReverseVerticalScrolling(mContext, isChecked);
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!InputSettings.isMouseReverseVerticalScrollingFeatureFlagEnabled()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/MouseSettingFragment.java b/src/com/android/settings/inputmethod/MouseSettingFragment.java
new file mode 100644
index 00000000000..de9e3e0592e
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseSettingFragment.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class MouseSettingFragment extends DashboardFragment {
+    private static final String TAG = MouseSettingFragment.class.getSimpleName();
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.mouse_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_KEYBOARD_MOUSE;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.mouse_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.keyboardAndTouchpadA11yNewPageEnabled()
+                            && InputPeripheralsSettingsUtils.isMouse();
+                }
+            };
+}
diff --git a/src/com/android/settings/inputmethod/MouseSettingsController.java b/src/com/android/settings/inputmethod/MouseSettingsController.java
new file mode 100644
index 00000000000..ef9191e8dd0
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseSettingsController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.keyboard.Flags;
+
+public class MouseSettingsController extends InputDeviceSettingsController {
+
+    public MouseSettingsController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        boolean isFeatureOn = Flags.keyboardAndTouchpadA11yNewPageEnabled();
+        boolean isPointerCustomizationEnabled =
+                android.view.flags.Flags.enableVectorCursorA11ySettings();
+        boolean isMouse = InputPeripheralsSettingsUtils.isMouse();
+        return (isFeatureOn && isPointerCustomizationEnabled && isMouse) ? AVAILABLE
+                : CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceController.java b/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceController.java
new file mode 100644
index 00000000000..88199d8d64e
--- /dev/null
+++ b/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceController.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class MouseSwapPrimaryButtonPreferenceController extends TogglePreferenceController {
+
+    public MouseSwapPrimaryButtonPreferenceController(
+            @NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return InputSettings.isMouseSwapPrimaryButtonEnabled(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        InputSettings.setMouseSwapPrimaryButton(mContext, isChecked);
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!InputSettings.isMouseSwapPrimaryButtonFeatureFlagEnabled()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
index 7a5885756dd..d9195d68dce 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.hardware.input.InputDeviceIdentifier;
@@ -35,12 +36,13 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
-import com.android.settings.inputmethod.NewKeyboardSettingsUtils.KeyboardInfo;
+import com.android.settings.inputmethod.InputPeripheralsSettingsUtils.KeyboardInfo;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -106,6 +108,16 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
         mIm = mContext.getSystemService(InputManager.class);
         mImm = mContext.getSystemService(InputMethodManager.class);
         mInputDeviceId = -1;
+
+        Activity activity = Preconditions.checkNotNull(getActivity());
+        InputDevice inputDeviceFromIntent =
+                activity.getIntent().getParcelableExtra(
+                        InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE,
+                        InputDevice.class);
+
+        if (inputDeviceFromIntent != null) {
+            launchLayoutPickerWithIdentifier(inputDeviceFromIntent.getIdentifier());
+        }
     }
 
     @Override
@@ -117,14 +129,15 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
             return;
         }
         mInputDeviceIdentifier =
-                arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
+                arguments.getParcelable(
+                        InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
                         InputDeviceIdentifier.class);
         if (mInputDeviceIdentifier == null) {
             Log.e(TAG, "The inputDeviceIdentifier should not be null");
             return;
         }
         InputDevice inputDevice =
-                NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier);
+                InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier);
         if (inputDevice == null) {
             Log.e(TAG, "inputDevice is null");
             return;
@@ -138,7 +151,7 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
         super.onStart();
         mIm.registerInputDeviceListener(this, null);
         InputDevice inputDevice =
-                NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier);
+                InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier);
         if (inputDevice == null) {
             Log.e(TAG, "Unable to start: input device is null");
             getActivity().finish();
@@ -160,8 +173,25 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
         mInputDeviceId = -1;
     }
 
+    private void launchLayoutPickerWithIdentifier(
+            InputDeviceIdentifier inputDeviceIdentifier) {
+        if (InputPeripheralsSettingsUtils.getInputDevice(mIm, inputDeviceIdentifier) == null) {
+            return;
+        }
+        InputMethodInfo info = mImm.getCurrentInputMethodInfoAsUser(UserHandle.of(mUserId));
+        InputMethodSubtype subtype = mImm.getCurrentInputMethodSubtype();
+        CharSequence subtypeLabel = getSubtypeLabel(mContext, info, subtype);
+
+        showKeyboardLayoutPicker(
+                subtypeLabel,
+                inputDeviceIdentifier,
+                mUserId,
+                info,
+                subtype);
+    }
+
     private void updateCheckedState() {
-        if (NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier) == null) {
+        if (InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier) == null) {
             return;
         }
 
@@ -207,9 +237,9 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
     private void mapLanguageWithLayout(InputMethodInfo info, InputMethodSubtype subtype) {
         CharSequence subtypeLabel = getSubtypeLabel(mContext, info, subtype);
         KeyboardLayout[] keyboardLayouts =
-                NewKeyboardSettingsUtils.getKeyboardLayouts(
+                InputPeripheralsSettingsUtils.getKeyboardLayouts(
                         mIm, mUserId, mInputDeviceIdentifier, info, subtype);
-        KeyboardLayoutSelectionResult result = NewKeyboardSettingsUtils.getKeyboardLayout(
+        KeyboardLayoutSelectionResult result = InputPeripheralsSettingsUtils.getKeyboardLayout(
                 mIm, mUserId, mInputDeviceIdentifier, info, subtype);
         if (result.getLayoutDescriptor() != null) {
             for (int i = 0; i < keyboardLayouts.length; i++) {
@@ -316,13 +346,14 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
             InputMethodSubtype inputMethodSubtype) {
         Bundle arguments = new Bundle();
         arguments.putParcelable(
-                NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER, inputDeviceIdentifier);
+                InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
+                inputDeviceIdentifier);
         arguments.putParcelable(
-                NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_INFO, inputMethodInfo);
+                InputPeripheralsSettingsUtils.EXTRA_INPUT_METHOD_INFO, inputMethodInfo);
         arguments.putParcelable(
-                NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE, inputMethodSubtype);
-        arguments.putInt(NewKeyboardSettingsUtils.EXTRA_USER_ID, userId);
-        arguments.putCharSequence(NewKeyboardSettingsUtils.EXTRA_TITLE, subtypeLabel);
+                InputPeripheralsSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE, inputMethodSubtype);
+        arguments.putInt(InputPeripheralsSettingsUtils.EXTRA_USER_ID, userId);
+        arguments.putCharSequence(InputPeripheralsSettingsUtils.EXTRA_TITLE, subtypeLabel);
         new SubSettingLauncher(mContext)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .setDestination(NewKeyboardLayoutPickerFragment.class.getName())
diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
index e9349644be1..e9701aa0760 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerContent.java
@@ -48,9 +48,9 @@ public class NewKeyboardLayoutPickerContent extends DashboardFragment {
         InputManager im = getContext().getSystemService(InputManager.class);
         InputDeviceIdentifier identifier =
                 getArguments().getParcelable(
-                        NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER);
+                        InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER);
         if (identifier == null
-                || NewKeyboardSettingsUtils.getInputDevice(im, identifier) == null) {
+                || InputPeripheralsSettingsUtils.getInputDevice(im, identifier) == null) {
             getActivity().finish();
             return;
         }
diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
index ec727e8a55b..e8a645f2b5e 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java
@@ -73,19 +73,21 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController
     public void initialize(Fragment parent) {
         mParent = parent;
         Bundle arguments = parent.getArguments();
-        mTitle = arguments.getCharSequence(NewKeyboardSettingsUtils.EXTRA_TITLE);
-        mUserId = arguments.getInt(NewKeyboardSettingsUtils.EXTRA_USER_ID);
+        mTitle = arguments.getCharSequence(InputPeripheralsSettingsUtils.EXTRA_TITLE);
+        mUserId = arguments.getInt(InputPeripheralsSettingsUtils.EXTRA_USER_ID);
         mInputDeviceIdentifier =
-                arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER);
+                arguments.getParcelable(
+                        InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER);
         mInputMethodInfo =
-                arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_INFO);
+                arguments.getParcelable(InputPeripheralsSettingsUtils.EXTRA_INPUT_METHOD_INFO);
         mInputMethodSubtype =
-                arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE);
+                arguments.getParcelable(
+                        InputPeripheralsSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE);
         mLayout = getSelectedLayoutLabel();
         mFinalSelectedLayout = mLayout;
         mKeyboardLayouts = mIm.getKeyboardLayoutListForInputDevice(
                 mInputDeviceIdentifier, mUserId, mInputMethodInfo, mInputMethodSubtype);
-        NewKeyboardSettingsUtils.sortKeyboardLayoutsByLabel(mKeyboardLayouts);
+        InputPeripheralsSettingsUtils.sortKeyboardLayoutsByLabel(mKeyboardLayouts);
         parent.getActivity().setTitle(mTitle);
     }
 
@@ -93,11 +95,13 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController
     public void onStart() {
         mIm.registerInputDeviceListener(this, null);
         if (mInputDeviceIdentifier == null
-                || NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier) == null) {
+                || InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier)
+                == null) {
             return;
         }
         mInputDeviceId =
-                NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier).getId();
+                InputPeripheralsSettingsUtils.getInputDevice(mIm,
+                        mInputDeviceIdentifier).getId();
     }
 
     @Override
@@ -202,9 +206,9 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController
 
     private String getSelectedLayoutLabel() {
         String label = mContext.getString(R.string.keyboard_default_layout);
-        KeyboardLayoutSelectionResult result = NewKeyboardSettingsUtils.getKeyboardLayout(
+        KeyboardLayoutSelectionResult result = InputPeripheralsSettingsUtils.getKeyboardLayout(
                 mIm, mUserId, mInputDeviceIdentifier, mInputMethodInfo, mInputMethodSubtype);
-        KeyboardLayout[] keyboardLayouts = NewKeyboardSettingsUtils.getKeyboardLayouts(
+        KeyboardLayout[] keyboardLayouts = InputPeripheralsSettingsUtils.getKeyboardLayouts(
                 mIm, mUserId, mInputDeviceIdentifier, mInputMethodInfo, mInputMethodSubtype);
         if (result.getLayoutDescriptor() != null) {
             for (KeyboardLayout keyboardLayout : keyboardLayouts) {
diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS
index 8dc48707865..c8850fee0d7 100644
--- a/src/com/android/settings/inputmethod/OWNERS
+++ b/src/com/android/settings/inputmethod/OWNERS
@@ -2,8 +2,8 @@
 include platform/frameworks/base:/services/core/java/com/android/server/inputmethod/OWNERS
 include /OWNERS
 
-# Settings for physical keyboard and game pad are better to be reviewed by the input team
+# Settings for physical keyboard, gamepad, and touchpad are better reviewed by the input team
 per-file GameControllerPreferenceController.java = file:platform/frameworks/base:/INPUT_OWNERS
 per-file KeyboardLayoutPicker*.java = file:platform/frameworks/base:/INPUT_OWNERS
 per-file PhysicalKeyboard*.java = file:platform/frameworks/base:/INPUT_OWNERS
-per-file Trackpad*.java = file:platform/frameworks/base:/INPUT_OWNERS
+per-file Trackpad*.java,Touchpad*.java,PointerTouchpad*.java = file:platform/frameworks/base:/INPUT_OWNERS
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceController.java
new file mode 100644
index 00000000000..41be5b91798
--- /dev/null
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceController.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.settings.keyboard.Flags.keyboardAndTouchpadA11yNewPageEnabled;
+
+import android.content.Context;
+import android.view.InputDevice;
+
+import com.android.settings.core.BasePreferenceController;
+
+/** Controller that shows and updates the Physical Keyboard a11y preference. */
+public class PhysicalKeyboardA11yPreferenceController extends BasePreferenceController {
+
+
+    public PhysicalKeyboardA11yPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return keyboardAndTouchpadA11yNewPageEnabled()
+                && isAnyHardKeyboardsExist() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    private static boolean isAnyHardKeyboardsExist() {
+        for (int deviceId : InputDevice.getDeviceIds()) {
+            final InputDevice device = InputDevice.getDevice(deviceId);
+            if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index a000f9ede5d..fcb672da404 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -48,8 +48,8 @@ import androidx.preference.TwoStatePreference;
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 import com.android.settings.Settings;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.keyboard.Flags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -65,7 +65,7 @@ import java.util.Objects;
 // TODO(b/327638540): Update implementation of preference here and reuse key preferences and
 //  controllers between here and A11y Setting page.
 @SearchIndexable
-public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
+public final class PhysicalKeyboardFragment extends DashboardFragment
         implements InputManager.InputDeviceListener,
         KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener {
 
@@ -79,6 +79,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
     private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper";
     private static final String MODIFIER_KEYS_SETTINGS = "modifier_keys_settings";
     private static final String EXTRA_AUTO_SELECTION = "auto_selection";
+    private static final String TAG = "KeyboardAndTouchA11yFragment";
     private static final Uri sVirtualKeyboardSettingsUri = Secure.getUriFor(
             Secure.SHOW_IME_WITH_HARD_KEYBOARD);
     private static final Uri sAccessibilityBounceKeysUri = Secure.getUriFor(
@@ -118,6 +119,16 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
     static final String EXTRA_BT_ADDRESS = "extra_bt_address";
     private String mBluetoothAddress;
 
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.physical_keyboard_settings;
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putParcelable(EXTRA_AUTO_SELECTION, mAutoInputDeviceIdentifier);
@@ -126,6 +137,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
 
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
+        super.onCreatePreferences(bundle, s);
         Activity activity = Preconditions.checkNotNull(getActivity());
         addPreferencesFromResource(R.xml.physical_keyboard_settings);
         mIm = Preconditions.checkNotNull(activity.getSystemService(InputManager.class));
@@ -152,7 +164,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
         mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider();
         mSupportsFirmwareUpdate = mFeatureProvider.supportsFirmwareUpdate();
         if (mSupportsFirmwareUpdate) {
-            mFeatureProvider.addFirmwareUpdateCategory(getContext(), getPreferenceScreen());
+            mFeatureProvider.registerKeyboardInformationCategory(getPreferenceScreen());
         }
         boolean isModifierKeySettingsEnabled = FeatureFlagUtils
                 .isEnabled(getContext(), FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_MODIFIER_KEY);
@@ -277,11 +289,12 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
                 getActivity().finish();
                 return;
             }
-            ThreadUtils.postOnMainThread(() -> updateHardKeyboards(newHardKeyboards));
+            ThreadUtils.postOnMainThread(() -> updateHardKeyboards(context, newHardKeyboards));
         });
     }
 
-    private void updateHardKeyboards(@NonNull List<HardKeyboardDeviceInfo> newHardKeyboards) {
+    private void updateHardKeyboards(@NonNull Context context,
+                                     @NonNull List<HardKeyboardDeviceInfo> newHardKeyboards) {
         if (Objects.equals(mLastHardKeyboards, newHardKeyboards)) {
             // Nothing has changed.  Ignore.
             return;
@@ -304,7 +317,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
             final Preference pref = new Preference(getPrefContext());
             pref.setTitle(hardKeyboardDeviceInfo.mDeviceName);
             String currentLayout =
-                    NewKeyboardSettingsUtils.getSelectedKeyboardLayoutLabelForUser(getContext(),
+                    InputPeripheralsSettingsUtils.getSelectedKeyboardLayoutLabelForUser(context,
                             UserHandle.myUserId(), hardKeyboardDeviceInfo.mDeviceIdentifier);
             if (currentLayout != null) {
                 pref.setSummary(currentLayout);
@@ -324,14 +337,14 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
             vendorAndProductId.append("-");
             vendorAndProductId.append(productId);
             mMetricsFeatureProvider.action(
-                    getContext(),
+                    context,
                     SettingsEnums.ACTION_USE_SPECIFIC_KEYBOARD,
                     vendorAndProductId.toString());
         }
         mKeyboardAssistanceCategory.setOrder(1);
         preferenceScreen.addPreference(mKeyboardAssistanceCategory);
         if (mSupportsFirmwareUpdate) {
-            mFeatureProvider.addFirmwareUpdateCategory(getPrefContext(), preferenceScreen);
+            mFeatureProvider.registerKeyboardInformationCategory(preferenceScreen);
         }
 
         if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()
@@ -340,10 +353,10 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
                 || InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
             Objects.requireNonNull(mKeyboardA11yCategory).setOrder(2);
             preferenceScreen.addPreference(mKeyboardA11yCategory);
-            updateAccessibilityBounceKeysSwitch();
-            updateAccessibilitySlowKeysSwitch();
-            updateAccessibilityStickyKeysSwitch();
-            updateAccessibilityMouseKeysSwitch();
+            updateAccessibilityBounceKeysSwitch(context);
+            updateAccessibilitySlowKeysSwitch(context);
+            updateAccessibilityStickyKeysSwitch(context);
+            updateAccessibilityMouseKeysSwitch(context);
         }
     }
 
@@ -356,7 +369,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
 
     private void showEnabledLocalesKeyboardLayoutList(InputDeviceIdentifier inputDeviceIdentifier) {
         Bundle arguments = new Bundle();
-        arguments.putParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
+        arguments.putParcelable(InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
                 inputDeviceIdentifier);
         new SubSettingLauncher(getContext())
                 .setSourceMetricsCategory(getMetricsCategory())
@@ -401,46 +414,50 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
                     mContentObserver,
                     UserHandle.myUserId());
         }
-        updateAccessibilityBounceKeysSwitch();
-        updateAccessibilitySlowKeysSwitch();
-        updateAccessibilityStickyKeysSwitch();
-        updateAccessibilityMouseKeysSwitch();
+        final Context context = getContext();
+        updateAccessibilityBounceKeysSwitch(context);
+        updateAccessibilitySlowKeysSwitch(context);
+        updateAccessibilityStickyKeysSwitch(context);
+        updateAccessibilityMouseKeysSwitch(context);
     }
 
     private void unregisterSettingsObserver() {
         getActivity().getContentResolver().unregisterContentObserver(mContentObserver);
+        if (mSupportsFirmwareUpdate) {
+            mFeatureProvider.unregisterKeyboardInformationCategory();
+        }
     }
 
-    private void updateAccessibilityBounceKeysSwitch() {
+    private void updateAccessibilityBounceKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityBounceKeys).setChecked(
-                InputSettings.isAccessibilityBounceKeysEnabled(getContext()));
+                InputSettings.isAccessibilityBounceKeysEnabled(context));
     }
 
-    private void updateAccessibilitySlowKeysSwitch() {
+    private void updateAccessibilitySlowKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilitySlowKeys).setChecked(
-                InputSettings.isAccessibilitySlowKeysEnabled(getContext()));
+                InputSettings.isAccessibilitySlowKeysEnabled(context));
     }
 
-    private void updateAccessibilityStickyKeysSwitch() {
+    private void updateAccessibilityStickyKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityStickyKeys).setChecked(
-                InputSettings.isAccessibilityStickyKeysEnabled(getContext()));
+                InputSettings.isAccessibilityStickyKeysEnabled(context));
     }
 
-    private void updateAccessibilityMouseKeysSwitch() {
+    private void updateAccessibilityMouseKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityMouseKeys).setChecked(
-                InputSettings.isAccessibilityMouseKeysEnabled(getContext()));
+                InputSettings.isAccessibilityMouseKeysEnabled(context));
     }
 
     private void toggleKeyboardShortcutsMenu() {
@@ -477,13 +494,13 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
         @Override
         public void onChange(boolean selfChange, Uri uri) {
             if (sAccessibilityBounceKeysUri.equals(uri)) {
-                updateAccessibilityBounceKeysSwitch();
+                updateAccessibilityBounceKeysSwitch(getContext());
             } else if (sAccessibilitySlowKeysUri.equals(uri)) {
-                updateAccessibilitySlowKeysSwitch();
+                updateAccessibilitySlowKeysSwitch(getContext());
             } else if (sAccessibilityStickyKeysUri.equals(uri)) {
-                updateAccessibilityStickyKeysSwitch();
+                updateAccessibilityStickyKeysSwitch(getContext());
             } else if (sAccessibilityMouseKeysUri.equals(uri)) {
-                updateAccessibilityMouseKeysSwitch();
+                updateAccessibilityMouseKeysSwitch(getContext());
             }
         }
     };
diff --git a/src/com/android/settings/inputmethod/PointerColorCustomizationFragment.java b/src/com/android/settings/inputmethod/PointerColorCustomizationFragment.java
index 2324c5ec2a6..49c0413dfe8 100644
--- a/src/com/android/settings/inputmethod/PointerColorCustomizationFragment.java
+++ b/src/com/android/settings/inputmethod/PointerColorCustomizationFragment.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.inputmethod;
 
-import static com.android.settings.inputmethod.NewKeyboardSettingsUtils.isMouse;
-import static com.android.settings.inputmethod.NewKeyboardSettingsUtils.isTouchpad;
+import static com.android.settings.inputmethod.InputPeripheralsSettingsUtils.isMouse;
+import static com.android.settings.inputmethod.InputPeripheralsSettingsUtils.isTouchpad;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/inputmethod/PointerFillStylePreference.java b/src/com/android/settings/inputmethod/PointerFillStylePreference.java
index 52535f9321d..74284d64250 100644
--- a/src/com/android/settings/inputmethod/PointerFillStylePreference.java
+++ b/src/com/android/settings/inputmethod/PointerFillStylePreference.java
@@ -47,6 +47,7 @@ public class PointerFillStylePreference extends Preference {
     public PointerFillStylePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.pointer_icon_fill_style_layout);
+        setSelectable(false);
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java
index 1c02332f8a1..fdbad929de2 100644
--- a/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java
+++ b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java
@@ -38,6 +38,7 @@ public class PointerStrokeStylePreference extends Preference {
     public PointerStrokeStylePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.pointer_icon_stroke_style_layout);
+        setSelectable(false);
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/PointerTouchpadFragment.java b/src/com/android/settings/inputmethod/PointerTouchpadFragment.java
index fc069caf604..441bddd2574 100644
--- a/src/com/android/settings/inputmethod/PointerTouchpadFragment.java
+++ b/src/com/android/settings/inputmethod/PointerTouchpadFragment.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.inputmethod;
 
-import static com.android.settings.inputmethod.NewKeyboardSettingsUtils.isMouse;
-import static com.android.settings.inputmethod.NewKeyboardSettingsUtils.isTouchpad;
+import static com.android.settings.inputmethod.InputPeripheralsSettingsUtils.isMouse;
+import static com.android.settings.inputmethod.InputPeripheralsSettingsUtils.isTouchpad;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -25,14 +25,33 @@ import android.content.Context;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.List;
+
 /** Accessibility settings for pointer and touchpad. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class PointerTouchpadFragment extends DashboardFragment {
 
     private static final String TAG = "PointerTouchpadFragment";
 
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        TouchpadSystemGesturesPreferenceController systemGesturesController =
+                new TouchpadSystemGesturesPreferenceController(
+                        context, "touchpad_system_gestures_enable");
+        return List.of(
+                systemGesturesController,
+                new PreferenceCategoryController(context, "touchpad_category")
+                        .setChildren(List.of(systemGesturesController)));
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.ACCESSIBILITY_POINTER_TOUCHPAD;
@@ -54,5 +73,11 @@ public class PointerTouchpadFragment extends DashboardFragment {
                 protected boolean isPageSearchEnabled(Context context) {
                     return isTouchpad() || isMouse();
                 }
+
+                @Override
+                public List<AbstractPreferenceController> createPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context);
+                }
             };
 }
diff --git a/src/com/android/settings/inputmethod/PointerTouchpadPreferenceController.java b/src/com/android/settings/inputmethod/PointerTouchpadPreferenceController.java
index b6ea063237a..9c44d1eed9c 100644
--- a/src/com/android/settings/inputmethod/PointerTouchpadPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PointerTouchpadPreferenceController.java
@@ -32,8 +32,8 @@ public class PointerTouchpadPreferenceController extends BasePreferenceControlle
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
-        boolean isMouse = NewKeyboardSettingsUtils.isMouse();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
+        boolean isMouse = InputPeripheralsSettingsUtils.isMouse();
         return (isTouchpad || isMouse) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 }
diff --git a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
index 71fa28bf5ca..8b0ae4cbd26 100644
--- a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
@@ -21,6 +21,7 @@ import static com.android.systemui.shared.Flags.newTouchpadGesturesTutorial;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.hardware.input.InputSettings;
 import android.os.UserHandle;
 import android.util.FeatureFlagUtils;
 
@@ -74,8 +75,15 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
-        return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
+        if (isTouchpad) {
+            // If the user's disabled touchpad system gestures in the accessibility settings, the
+            // tutorial won't work or be relevant, so disable the button.
+            return InputSettings.useTouchpadSystemGestures(mContext) ? AVAILABLE
+                    : DISABLED_DEPENDENT_SETTING;
+        } else {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
     }
 
     private void showTouchpadGestureEducation() {
diff --git a/src/com/android/settings/inputmethod/TrackpadSettings.java b/src/com/android/settings/inputmethod/TouchpadAndMouseSettings.java
similarity index 71%
rename from src/com/android/settings/inputmethod/TrackpadSettings.java
rename to src/com/android/settings/inputmethod/TouchpadAndMouseSettings.java
index dca418a154d..14c580b541f 100644
--- a/src/com/android/settings/inputmethod/TrackpadSettings.java
+++ b/src/com/android/settings/inputmethod/TouchpadAndMouseSettings.java
@@ -18,24 +18,34 @@ package com.android.settings.inputmethod;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.os.Bundle;
 import android.util.FeatureFlagUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
 @SearchIndexable
-public class TrackpadSettings extends DashboardFragment {
+public class TouchpadAndMouseSettings extends DashboardFragment {
 
-    private static final String TAG = "TrackpadSettings";
+    private static final String TAG = TouchpadAndMouseSettings.class.getSimpleName();
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         use(TouchGesturesButtonPreferenceController.class).setFragment(this /*parent*/);
     }
 
+    @Override
+    public void onCreate(@NonNull Bundle icicle) {
+        super.onCreate(icicle);
+        getPreferenceScreen().setTitle(
+                InputPeripheralsSettingsUtils.getTouchpadAndMouseTitleTitleResId());
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_KEYBOARDS_TOUCHPAD;
@@ -48,16 +58,16 @@ public class TrackpadSettings extends DashboardFragment {
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.trackpad_settings;
+        return R.xml.touchpad_and_mouse_settings;
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.trackpad_settings) {
+            new BaseSearchIndexProvider(R.xml.touchpad_and_mouse_settings) {
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
                     return FeatureFlagUtils
                             .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD)
-                            && NewKeyboardSettingsUtils.isTouchpad();
+                            && InputPeripheralsSettingsUtils.isTouchpad();
                 }
             };
 }
diff --git a/src/com/android/settings/inputmethod/TrackpadSettingsController.java b/src/com/android/settings/inputmethod/TouchpadAndMouseSettingsController.java
similarity index 84%
rename from src/com/android/settings/inputmethod/TrackpadSettingsController.java
rename to src/com/android/settings/inputmethod/TouchpadAndMouseSettingsController.java
index d88b282a065..86e044c4291 100644
--- a/src/com/android/settings/inputmethod/TrackpadSettingsController.java
+++ b/src/com/android/settings/inputmethod/TouchpadAndMouseSettingsController.java
@@ -20,6 +20,8 @@ import android.content.Context;
 import android.hardware.input.InputManager;
 import android.util.FeatureFlagUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
@@ -28,15 +30,16 @@ 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 TrackpadSettingsController extends BasePreferenceController
+public class TouchpadAndMouseSettingsController extends BasePreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
         InputManager.InputDeviceListener {
 
     private final InputManager mIm;
 
+    @Nullable
     private Preference mPreference;
 
-    public TrackpadSettingsController(Context context, String key) {
+    public TouchpadAndMouseSettingsController(@NonNull Context context, @NonNull String key) {
         super(context, key);
         mIm = context.getSystemService(InputManager.class);
     }
@@ -77,16 +80,17 @@ public class TrackpadSettingsController extends BasePreferenceController
             return;
         }
         mPreference.setVisible(isAvailable());
+        mPreference.setTitle(InputPeripheralsSettingsUtils.getTouchpadAndMouseTitleTitleResId());
     }
 
     @Override
     public int getAvailabilityStatus() {
         boolean isFeatureOn = FeatureFlagUtils
                 .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
         boolean isPointerCustomizationEnabled =
                 android.view.flags.Flags.enableVectorCursorA11ySettings();
-        boolean isMouse = NewKeyboardSettingsUtils.isMouse();
+        boolean isMouse = InputPeripheralsSettingsUtils.isMouse();
         return (isFeatureOn && isTouchpad) || (isPointerCustomizationEnabled && isMouse) ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/inputmethod/TouchpadSettingFragment.java b/src/com/android/settings/inputmethod/TouchpadSettingFragment.java
new file mode 100644
index 00000000000..026357efdec
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadSettingFragment.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class TouchpadSettingFragment extends DashboardFragment {
+    private static final String TAG = TouchpadSettingFragment.class.getSimpleName();
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.touchpad_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_KEYBOARDS_TOUCHPAD;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.touchpad_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.keyboardAndTouchpadA11yNewPageEnabled()
+                            && InputPeripheralsSettingsUtils.isTouchpad();
+                }
+            };
+}
diff --git a/src/com/android/settings/inputmethod/TouchpadSettingsController.java b/src/com/android/settings/inputmethod/TouchpadSettingsController.java
new file mode 100644
index 00000000000..21c68c06283
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadSettingsController.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.keyboard.Flags;
+
+public class TouchpadSettingsController extends InputDeviceSettingsController {
+    public TouchpadSettingsController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        boolean isFeatureOn = Flags.keyboardAndTouchpadA11yNewPageEnabled();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
+        return (isFeatureOn && isTouchpad) ? AVAILABLE
+                : CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/TouchpadSystemGesturesPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadSystemGesturesPreferenceController.java
new file mode 100644
index 00000000000..9f0acb15a46
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadSystemGesturesPreferenceController.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class TouchpadSystemGesturesPreferenceController extends TogglePreferenceController {
+
+    public TouchpadSystemGesturesPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return InputSettings.isTouchpadSystemGestureDisableFeatureFlagEnabled()
+                && InputPeripheralsSettingsUtils.isTouchpad() ? AVAILABLE
+                                                              : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return InputSettings.useTouchpadSystemGestures(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        InputSettings.setTouchpadSystemGesturesEnabled(mContext, isChecked);
+        // TODO(b/353947750): add a metric for when the setting changes.
+        return true;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_accessibility;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/TouchpadThreeFingerTapFragment.java b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapFragment.java
new file mode 100644
index 00000000000..3aee4bf8927
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapFragment.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.settings.inputmethod.InputPeripheralsSettingsUtils.isTouchpad;
+
+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;
+
+/** Input settings for touchpad three finger tap. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class TouchpadThreeFingerTapFragment extends DashboardFragment {
+
+    private static final String TAG = "TouchpadThreeFingerTapFragment";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.TOUCHPAD_THREE_FINGER_TAP;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.input_touchpad_three_finger_tap_customization;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.input_touchpad_three_finger_tap_customization) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return isTouchpad();
+                }
+            };
+}
diff --git a/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceController.java
new file mode 100644
index 00000000000..7afd266b7ac
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.hardware.input.KeyGestureEvent;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import java.util.Map;
+
+public class TouchpadThreeFingerTapPreferenceController extends BasePreferenceController
+        implements LifecycleEventObserver {
+
+    private final Map<Integer, String> mKeyGestureTypeNameMap;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private @Nullable Preference mPreference;
+
+    public TouchpadThreeFingerTapPreferenceController(@NonNull Context context,
+            @NonNull String key) {
+        super(context, key);
+        mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
+
+        mKeyGestureTypeNameMap = Map.ofEntries(
+                Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,
+                        context.getString(R.string.three_finger_tap_launch_gemini)),
+                Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_HOME,
+                        context.getString(R.string.three_finger_tap_go_home)),
+                Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_BACK,
+                        context.getString(R.string.three_finger_tap_go_back)),
+                Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,
+                        context.getString(R.string.three_finger_tap_recent_apps)),
+                Map.entry(KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED,
+                        context.getString(R.string.three_finger_tap_middle_click)));
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
+        return (InputSettings.isTouchpadThreeFingerTapShortcutFeatureFlagEnabled() && isTouchpad)
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+
+    @Override
+    public @Nullable CharSequence getSummary() {
+        int currentType = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
+                KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
+        return mKeyGestureTypeNameMap.get(currentType);
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        refreshSummary(mPreference);
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        refreshSummary(mPreference);
+        if (event == Lifecycle.Event.ON_PAUSE) {
+            int currentValue =
+                    Settings.System.getIntForUser(mContext.getContentResolver(),
+                            Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
+                            KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
+            mMetricsFeatureProvider.action(mContext,
+                    SettingsEnums.ACTION_TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION_CHANGED,
+                    currentValue);
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java
new file mode 100644
index 00000000000..b56d2ead775
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.inputmethod;
+
+import static android.hardware.input.InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP;
+import static android.hardware.input.InputGestureData.createTouchpadTrigger;
+
+import android.content.Context;
+import android.hardware.input.InputGestureData;
+import android.hardware.input.InputManager;
+import android.hardware.input.KeyGestureEvent;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.view.PointerIcon;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+public class TouchpadThreeFingerTapSelector extends Preference {
+    private static final InputGestureData.Trigger THREE_FINGER_TAP_TOUCHPAD_TRIGGER =
+            createTouchpadTrigger(TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP);
+    private final InputManager mInputManager;
+
+    public TouchpadThreeFingerTapSelector(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.touchpad_three_finger_tap_layout);
+        mInputManager = context.getSystemService(InputManager.class);
+        setSelectable(false);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        LinearLayout buttonHolder = (LinearLayout) holder.findViewById(R.id.button_holder);
+        // Intercept hover events so setting row does not highlight when hovering buttons.
+        buttonHolder.setOnHoverListener((v, e) -> true);
+
+        int currentCustomization = Settings.System.getIntForUser(getContext().getContentResolver(),
+                Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,
+                KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);
+        initRadioButton(holder, R.id.launch_gemini,
+                KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT, currentCustomization);
+        initRadioButton(holder, R.id.go_home, KeyGestureEvent.KEY_GESTURE_TYPE_HOME,
+                currentCustomization);
+        initRadioButton(holder, R.id.go_back, KeyGestureEvent.KEY_GESTURE_TYPE_BACK,
+                currentCustomization);
+        initRadioButton(holder, R.id.recent_apps, KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,
+                currentCustomization);
+        initRadioButton(holder, R.id.middle_click,
+                KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, currentCustomization);
+    }
+
+    private void initRadioButton(@NonNull PreferenceViewHolder holder, int id,
+            int customGestureType, int currentCustomization) {
+        RadioButton radioButton = (RadioButton) holder.findViewById(id);
+        if (radioButton == null) {
+            return;
+        }
+        boolean isUnspecified = customGestureType == KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED;
+        InputGestureData gesture = isUnspecified ? null : new InputGestureData.Builder()
+                .setTrigger(THREE_FINGER_TAP_TOUCHPAD_TRIGGER)
+                .setKeyGestureType(customGestureType)
+                .build();
+        radioButton.setOnCheckedChangeListener((v, isChecked) -> {
+            if (isChecked) {
+                mInputManager.removeAllCustomInputGestures(InputGestureData.Filter.TOUCHPAD);
+                if (!isUnspecified) {
+                    mInputManager.addCustomInputGesture(gesture);
+                }
+                Settings.System.putIntForUser(getContext().getContentResolver(),
+                        Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION, customGestureType,
+                        UserHandle.USER_CURRENT);
+            }
+        });
+        radioButton.setChecked(currentCustomization == customGestureType);
+        radioButton.setPointerIcon(PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_ARROW));
+    }
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
index a92ebd434a3..8e77e0cc2c2 100644
--- a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
@@ -49,7 +49,7 @@ public class TrackpadBottomPreferenceController extends TogglePreferenceControll
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
         return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
diff --git a/src/com/android/settings/inputmethod/TrackpadGesturesDisabledFooterPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadGesturesDisabledFooterPreferenceController.java
new file mode 100644
index 00000000000..1fed57e5980
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TrackpadGesturesDisabledFooterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class TrackpadGesturesDisabledFooterPreferenceController extends BasePreferenceController {
+
+    public TrackpadGesturesDisabledFooterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return InputSettings.useTouchpadSystemGestures(mContext) ? CONDITIONALLY_UNAVAILABLE
+                : AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
index ca086a98728..e752c1edbd0 100644
--- a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
@@ -49,7 +49,7 @@ public class TrackpadReverseScrollingPreferenceController extends TogglePreferen
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
         return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
diff --git a/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
index b2bb61702a0..ddf6b441233 100644
--- a/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
@@ -49,9 +49,7 @@ public class TrackpadTapDraggingPreferenceController extends TogglePreferenceCon
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
-        return (InputSettings.isTouchpadTapDraggingFeatureFlagEnabled() && isTouchpad)
-                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        return InputPeripheralsSettingsUtils.isTouchpad() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
index c25cc4ec2bf..86d73112598 100644
--- a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
@@ -49,7 +49,7 @@ public class TrackpadTapToClickPreferenceController extends TogglePreferenceCont
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
         return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
index a6af3f651ba..14bb484d470 100644
--- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
@@ -59,7 +59,7 @@ public class TrackpadTouchGestureSettings extends DashboardFragment {
                             .isEnabled(
                                     context,
                                     FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE)
-                            && NewKeyboardSettingsUtils.isTouchpad();
+                            && InputPeripheralsSettingsUtils.isTouchpad();
                 }
             };
 }
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
index 79497276aba..ff6899049c0 100644
--- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
@@ -31,7 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro
     public int getAvailabilityStatus() {
         boolean isFeatureOn = FeatureFlagUtils
                 .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
-        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+        boolean isTouchpad = InputPeripheralsSettingsUtils.isTouchpad();
         return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 }
diff --git a/src/com/android/settings/language/LanguageSettingScreen.kt b/src/com/android/settings/language/LanguageSettingScreen.kt
new file mode 100644
index 00000000000..09ca11be979
--- /dev/null
+++ b/src/com/android/settings/language/LanguageSettingScreen.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.language
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import com.android.settings.R
+import com.android.settings.Settings.LanguageSettingsActivity
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class LanguageSettingScreen: PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.languages_settings
+
+    override val summary: Int
+        get() = R.string.languages_setting_summary
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_languages
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystLanguageSetting()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = LanguageSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "language_setting"
+    }
+}
diff --git a/src/com/android/settings/language/LanguageSettings.java b/src/com/android/settings/language/LanguageSettings.java
index a5adb02b5b9..d992ff27bc9 100644
--- a/src/com/android/settings/language/LanguageSettings.java
+++ b/src/com/android/settings/language/LanguageSettings.java
@@ -66,6 +66,11 @@ public class LanguageSettings extends DashboardFragment {
         activity.setTitle(R.string.languages_settings);
     }
 
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return LanguageSettingScreen.KEY;
+    }
+
     @Override
     protected int getPreferenceScreenResId() {
         return R.xml.language_settings;
diff --git a/src/com/android/settings/language/MoreLanguagesSettingsCategoryController.java b/src/com/android/settings/language/MoreLanguagesSettingsCategoryController.java
new file mode 100644
index 00000000000..3f2f9d77737
--- /dev/null
+++ b/src/com/android/settings/language/MoreLanguagesSettingsCategoryController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.language;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.flags.Flags;
+import com.android.settings.widget.PreferenceCategoryController;
+
+/**
+ * Controller for the "More language settings" category in the Language & region settings.
+ */
+public class MoreLanguagesSettingsCategoryController extends PreferenceCategoryController {
+
+    public MoreLanguagesSettingsCategoryController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
index 59a5fb0a596..a7ebe32b841 100644
--- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
+++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
@@ -39,7 +39,10 @@ import com.android.settings.R;
  * <p>It only removes one locale at the time, but most users don't
  * really add many locales "by mistake", so there is no real need
  * to delete a lot of locales at once.</p>
+ *
+ * @deprecated use SettingLib's widget instead of customized UIs.
  */
+@Deprecated
 public class LocaleLinearLayoutManager extends LinearLayoutManager {
     private final LocaleDragAndDropAdapter mAdapter;
     private final Context mContext;
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index b09e22cc698..f9c50b79bd7 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -71,6 +71,7 @@ import java.util.Locale;
 public class LocaleListEditor extends RestrictedSettingsFragment implements View.OnTouchListener {
     protected static final String INTENT_LOCALE_KEY = "localeInfo";
     protected static final String EXTRA_SYSTEM_LOCALE_DIALOG_TYPE = "system_locale_dialog_type";
+    protected static final String EXTRA_RESULT_LOCALE = "result_locale";
     protected static final String LOCALE_SUGGESTION = "locale_suggestion";
 
     private static final String TAG = LocaleListEditor.class.getSimpleName();
diff --git a/src/com/android/settings/localepicker/LocaleListSearchCallback.java b/src/com/android/settings/localepicker/LocaleListSearchCallback.java
new file mode 100644
index 00000000000..e24e9bd3fa1
--- /dev/null
+++ b/src/com/android/settings/localepicker/LocaleListSearchCallback.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.localepicker;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.app.LocaleStore;
+
+import java.util.List;
+
+/** Interface for when locale list changes in SearchView. */
+public interface LocaleListSearchCallback {
+
+    /** Callback method for searching changes. */
+    void onSearchListChanged(@NonNull List<LocaleStore.LocaleInfo> localeInfoList);
+}
diff --git a/src/com/android/settings/localepicker/LocalePickerBaseListPreferenceController.java b/src/com/android/settings/localepicker/LocalePickerBaseListPreferenceController.java
new file mode 100644
index 00000000000..4b0e9fa4fd4
--- /dev/null
+++ b/src/com/android/settings/localepicker/LocalePickerBaseListPreferenceController.java
@@ -0,0 +1,259 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.localepicker;
+
+import static com.android.settings.localepicker.LocaleListEditor.EXTRA_RESULT_LOCALE;
+import static com.android.settings.localepicker.RegionAndNumberingSystemPickerFragment.EXTRA_IS_NUMBERING_SYSTEM;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.LocaleList;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.app.LocaleCollectorBase;
+import com.android.internal.app.LocaleHelper;
+import com.android.internal.app.LocaleStore;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/** A base controller for handling locale controllers. */
+public abstract class LocalePickerBaseListPreferenceController extends
+        BasePreferenceController implements LocaleListSearchCallback {
+    private static final String TAG = "LocalePickerBaseListPreference";
+    private static final String KEY_SUGGESTED = "suggested";
+    private static final String KEY_SUPPORTED = "supported";
+
+    private PreferenceCategory mPreferenceCategory;
+    private Set<LocaleStore.LocaleInfo> mLocaleList;
+    private List<LocaleStore.LocaleInfo> mLocaleOptions;
+    private Map<String, Preference> mPreferences;
+    private String mPackageName;
+    private boolean mIsCountryMode;
+    @Nullable private LocaleStore.LocaleInfo mParentLocale;
+
+    public LocalePickerBaseListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mLocaleList = getLocaleCollectorController(context).getSupportedLocaleList(null,
+                false, false);
+        mLocaleOptions = new ArrayList<>(mLocaleList.size());
+        mPreferences = new ArrayMap<>();
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceCategory = screen.findPreference(getPreferenceCategoryKey());
+        updatePreferences();
+    }
+
+    private void updatePreferences() {
+        if (mPreferenceCategory == null) {
+            Log.d(TAG, "updatePreferences, mPreferenceCategory is null");
+            return;
+        }
+
+        List<LocaleStore.LocaleInfo> result;
+        mParentLocale = getParentLocale();
+        if (mParentLocale != null) {
+            mIsCountryMode = true;
+            mLocaleList = getLocaleCollectorController(mContext).getSupportedLocaleList(
+                    mParentLocale, false, mIsCountryMode);
+            mLocaleOptions = new ArrayList<>(mLocaleList.size());
+            if (!getPreferenceCategoryKey().contains(KEY_SUGGESTED)) {
+                mPreferenceCategory.setTitle(
+                        mContext.getString(R.string.all_supported_locales_regions_title));
+            }
+        }
+
+        result = getSortedLocaleList(
+                getPreferenceCategoryKey().contains(KEY_SUGGESTED)
+                        ? getSuggestedLocaleList()
+                        : getSupportedLocaleList());
+
+        final Map<String, Preference> existingPreferences = mPreferences;
+        mPreferences = new ArrayMap<>();
+        setupPreference(result, existingPreferences);
+
+        for (Preference pref : existingPreferences.values()) {
+            mPreferenceCategory.removePreference(pref);
+        }
+    }
+
+    @Override
+    public void onSearchListChanged(@NonNull List<LocaleStore.LocaleInfo> newList) {
+        mPreferenceCategory.removeAll();
+        mPreferences.clear();
+        final Map<String, Preference> existingPreferences = mPreferences;
+        if (getPreferenceCategoryKey().contains(KEY_SUGGESTED)) {
+            newList = getSortedSuggestedLocaleFromSearchList(
+                    newList, getSuggestedLocaleList());
+        }
+        setupPreference(newList, existingPreferences);
+    }
+
+    private List<LocaleStore.LocaleInfo> getSortedSuggestedLocaleFromSearchList(
+            List<LocaleStore.LocaleInfo> listOptions,
+            List<LocaleStore.LocaleInfo> listSuggested) {
+        List<LocaleStore.LocaleInfo> searchItem = new ArrayList<>();
+        for (LocaleStore.LocaleInfo option : listOptions) {
+            for (LocaleStore.LocaleInfo suggested : listSuggested) {
+                if (suggested.toString().contains(option.toString())) {
+                    searchItem.add(suggested);
+                }
+            }
+        }
+        searchItem = getSortedLocaleList(searchItem);
+        return searchItem;
+    }
+
+    private void setupPreference(List<LocaleStore.LocaleInfo> localeInfoList,
+            Map<String, Preference> existingPreferences) {
+        Log.d(TAG, "setupPreference: isNumberingMode = " + isNumberingMode());
+        if (isNumberingMode() && getPreferenceCategoryKey().contains(KEY_SUPPORTED)) {
+            mPreferenceCategory.setTitle(
+                    mContext.getString(R.string.all_supported_numbering_system_title));
+        }
+
+        localeInfoList.stream().forEach(locale ->
+        {
+            Preference pref = existingPreferences.remove(locale.getId());
+            if (pref == null) {
+                pref = new Preference(mContext);
+                mPreferenceCategory.addPreference(pref);
+            }
+            String localeName =
+                    mIsCountryMode ? locale.getFullCountryNameNative() : locale.getFullNameNative();
+            pref.setTitle(localeName);
+            pref.setKey(locale.toString());
+            pref.setOnPreferenceClickListener(clickedPref -> {
+                switchFragment(locale);
+                return true;
+            });
+            mPreferences.put(locale.getId(), pref);
+        });
+        mPreferenceCategory.setVisible(mPreferenceCategory.getPreferenceCount() > 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    protected abstract String getPreferenceCategoryKey();
+
+    protected abstract LocaleCollectorBase getLocaleCollectorController(Context context);
+
+    @Nullable protected abstract LocaleStore.LocaleInfo getParentLocale();
+
+    protected abstract boolean isNumberingMode();
+
+    @Nullable protected abstract LocaleList getExplicitLocaleList();
+
+    protected String getPackageName() {
+        return mPackageName;
+    }
+
+    protected List<LocaleStore.LocaleInfo> getSuggestedLocaleList() {
+        mLocaleOptions.clear();
+        if (mLocaleList != null && !mLocaleList.isEmpty()) {
+            mLocaleOptions.addAll(mLocaleList.stream()
+                    .filter(localeInfo -> localeInfo.isSuggested())
+                    .collect(Collectors.toList()));
+        } else {
+            Log.d(TAG, "Can not get suggested locales because the locale list is null or empty.");
+        }
+
+        return mLocaleOptions;
+    }
+
+    protected List<LocaleStore.LocaleInfo> getSupportedLocaleList() {
+        if (mLocaleList != null && !mLocaleList.isEmpty()) {
+            mLocaleOptions.addAll(mLocaleList.stream()
+                    .filter(localeInfo -> !localeInfo.isSuggested())
+                    .collect(Collectors.toList()));
+        } else {
+            Log.d(TAG, "Can not get supported locales because the locale list is null or empty.");
+        }
+
+        return mLocaleOptions;
+    }
+
+    private List<LocaleStore.LocaleInfo> getSortedLocaleList(
+            List<LocaleStore.LocaleInfo> localeInfos) {
+        final Locale sortingLocale = Locale.getDefault();
+        final LocaleHelper.LocaleInfoComparator comp =
+                new LocaleHelper.LocaleInfoComparator(sortingLocale, mIsCountryMode);
+        Collections.sort(localeInfos, comp);
+        return localeInfos;
+    }
+
+    private void switchFragment(LocaleStore.LocaleInfo localeInfo) {
+        boolean shouldShowLocaleEditor = shouldShowLocaleEditor(localeInfo);
+        String extraKey = shouldShowLocaleEditor ? LocaleListEditor.INTENT_LOCALE_KEY
+                : RegionAndNumberingSystemPickerFragment.EXTRA_TARGET_LOCALE;
+        String fragmentName = shouldShowLocaleEditor ? LocaleListEditor.class.getCanonicalName()
+                : RegionAndNumberingSystemPickerFragment.class.getCanonicalName();
+
+        final Bundle extra = new Bundle();
+        extra.putSerializable(extraKey, localeInfo);
+        extra.putBoolean(EXTRA_IS_NUMBERING_SYSTEM, localeInfo.hasNumberingSystems());
+        if (shouldShowLocaleEditor) {
+            extra.putBoolean(EXTRA_RESULT_LOCALE, true);
+        }
+
+        new SubSettingLauncher(mContext)
+                .setDestination(fragmentName)
+                .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
+                .setArguments(extra)
+                .launch();
+    }
+
+    private boolean shouldShowLocaleEditor(LocaleStore.LocaleInfo localeInfo) {
+        boolean isSystemLocale = localeInfo.isSystemLocale();
+        boolean isRegionLocale = localeInfo.getParent() != null;
+        boolean mayHaveDifferentNumberingSystem = localeInfo.hasNumberingSystems();
+        mLocaleList = getLocaleCollectorController(mContext).getSupportedLocaleList(localeInfo,
+                false, localeInfo != null);
+        Log.d(TAG,
+                "shouldShowLocaleEditor: isSystemLocale = " + isSystemLocale + ", isRegionLocale = "
+                        + isRegionLocale + ", mayHaveDifferentNumberingSystem = "
+                        + mayHaveDifferentNumberingSystem + ", isSuggested = "
+                        + localeInfo.isSuggested() + ", isNumberingMode = " + isNumberingMode());
+
+        return mLocaleList.size() == 1 || isSystemLocale || localeInfo.isSuggested()
+                || (isRegionLocale && !mayHaveDifferentNumberingSystem)
+                || isNumberingMode();
+    }
+}
diff --git a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
index 05cb6a48d1e..3cf76837ea5 100644
--- a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -34,7 +34,12 @@ import com.android.internal.app.LocaleStore;
 import com.android.settings.R;
 import com.android.settings.core.SettingsBaseActivity;
 
-/** A activity to show the locale picker page. */
+/**
+ * An activity to show the locale picker page.
+ *
+ * @deprecated use {@link com.android.settings.localepicker.SystemLocalePickerFragment} instead.
+ */
+@Deprecated
 public class LocalePickerWithRegionActivity extends SettingsBaseActivity
         implements LocalePickerWithRegion.LocaleSelectedListener, MenuItem.OnActionExpandListener {
     private static final String TAG = LocalePickerWithRegionActivity.class.getSimpleName();
diff --git a/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java b/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java
new file mode 100644
index 00000000000..83c87b03499
--- /dev/null
+++ b/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.localepicker;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceCategory;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.app.LocaleHelper;
+import com.android.internal.app.LocaleStore;
+import com.android.internal.app.SystemLocaleCollector;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * A locale picker fragment to show region country and numbering system.
+ *
+ * <p>It shows suggestions at the top, then the rest of the locales.
+ * Allows the user to search for locales using both their native name and their name in the
+ * default locale.</p>
+ */
+public class RegionAndNumberingSystemPickerFragment extends DashboardFragment {
+
+    public static final String EXTRA_TARGET_LOCALE = "extra_target_locale";
+    public static final String EXTRA_IS_NUMBERING_SYSTEM = "extra_is_numbering_system";
+
+    private static final String TAG = "RegionAndNumberingSystemPickerFragment";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_LIST = "system_locale_list";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST =
+            "system_locale_suggested_list";
+
+    @Nullable
+    private SystemLocaleAllListPreferenceController mSystemLocaleAllListPreferenceController;
+    @Nullable
+    private SystemLocaleSuggestedListPreferenceController mSuggestedListPreferenceController;
+    @Nullable
+    private LocaleStore.LocaleInfo mLocaleInfo;
+    private RecyclerView mRecyclerView;
+    private AppBarLayout mAppBarLayout;
+    private Activity mActivity;
+    private boolean mIsNumberingMode;
+
+    @Override
+    public void onCreate(@NonNull Bundle icicle) {
+        super.onCreate(icicle);
+        mActivity = getActivity();
+        if (mActivity == null || mActivity.isFinishing()) {
+            Log.d(TAG, "onCreate, no activity or activity is finishing");
+            return;
+        }
+
+        if (mLocaleInfo == null) {
+            Log.d(TAG, "onCreate, can not get localeInfo");
+            return;
+        }
+
+        mActivity.setTitle(mLocaleInfo.getFullNameNative());
+    }
+
+    @Override
+    public @NonNull View onCreateView(@NonNull LayoutInflater inflater,
+            @NonNull ViewGroup container, @NonNull Bundle savedInstanceState) {
+        mAppBarLayout = mActivity.findViewById(R.id.app_bar);
+        mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mRecyclerView = view.findViewById(R.id.recycler_view);
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.system_language_picker;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getSettingsLifecycle());
+    }
+
+    private List<AbstractPreferenceController> buildPreferenceControllers(
+            @NonNull Context context, @Nullable Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        mLocaleInfo = (LocaleStore.LocaleInfo) getArguments().getSerializable(EXTRA_TARGET_LOCALE);
+        mIsNumberingMode = getArguments().getBoolean(EXTRA_IS_NUMBERING_SYSTEM);
+        mSuggestedListPreferenceController = new SystemLocaleSuggestedListPreferenceController(
+                context, KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST, mLocaleInfo,
+                mIsNumberingMode);
+        mSystemLocaleAllListPreferenceController = new SystemLocaleAllListPreferenceController(
+                context, KEY_PREFERENCE_SYSTEM_LOCALE_LIST, mLocaleInfo, mIsNumberingMode);
+        controllers.add(mSuggestedListPreferenceController);
+        controllers.add(mSystemLocaleAllListPreferenceController);
+
+        return controllers;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.system_language_picker);
+
+    @Override
+    public int getMetricsCategory() {
+        return 0;
+    }
+}
diff --git a/src/com/android/settings/localepicker/SystemLocaleAllListPreferenceController.java b/src/com/android/settings/localepicker/SystemLocaleAllListPreferenceController.java
new file mode 100644
index 00000000000..d4d87fa2c2b
--- /dev/null
+++ b/src/com/android/settings/localepicker/SystemLocaleAllListPreferenceController.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.localepicker;
+
+import android.content.Context;
+import android.os.LocaleList;
+
+import com.android.internal.app.LocaleCollectorBase;
+import com.android.internal.app.LocaleStore;
+import com.android.internal.app.SystemLocaleCollector;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class SystemLocaleAllListPreferenceController extends
+        LocalePickerBaseListPreferenceController {
+    private static final String KEY_PREFERENCE_CATEGORY_ADD_LANGUAGE_ALL_SUPPORTED =
+            "system_language_all_supported_category";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_LIST = "system_locale_list";
+
+    private boolean mIsNumberingSystemMode;
+    @Nullable private LocaleStore.LocaleInfo mLocaleInfo;
+    @Nullable private LocaleList mExplicitLocales;
+
+    public SystemLocaleAllListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    public SystemLocaleAllListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey, @NonNull LocaleStore.LocaleInfo parentLocale,
+            boolean isNumberingSystemMode) {
+        super(context, preferenceKey);
+        mLocaleInfo = parentLocale;
+        mIsNumberingSystemMode = isNumberingSystemMode;
+    }
+
+    public SystemLocaleAllListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey, @Nullable LocaleList explicitLocales) {
+        super(context, preferenceKey);
+        mExplicitLocales = explicitLocales;
+    }
+
+    @Override
+    protected String getPreferenceCategoryKey() {
+        return KEY_PREFERENCE_CATEGORY_ADD_LANGUAGE_ALL_SUPPORTED;
+    }
+
+    @Override
+    public @NonNull String getPreferenceKey() {
+        return KEY_PREFERENCE_SYSTEM_LOCALE_LIST;
+    }
+
+    @Override
+    protected LocaleCollectorBase getLocaleCollectorController(Context context) {
+        return new SystemLocaleCollector(context, getExplicitLocaleList());
+    }
+
+    @Override
+    protected @Nullable LocaleStore.LocaleInfo getParentLocale() {
+        return mLocaleInfo;
+    }
+
+    @Override
+    protected boolean isNumberingMode() {
+        return mIsNumberingSystemMode;
+    }
+
+    @Override
+    protected @Nullable LocaleList getExplicitLocaleList() {
+        return mExplicitLocales;
+    }
+}
diff --git a/src/com/android/settings/localepicker/SystemLocalePickerFragment.java b/src/com/android/settings/localepicker/SystemLocalePickerFragment.java
new file mode 100644
index 00000000000..5a007318a55
--- /dev/null
+++ b/src/com/android/settings/localepicker/SystemLocalePickerFragment.java
@@ -0,0 +1,322 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.localepicker;
+
+import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.LocaleList;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.SearchView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.preference.PreferenceCategory;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.app.LocaleHelper;
+import com.android.internal.app.LocaleStore;
+import com.android.internal.app.SystemLocaleCollector;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * A locale picker fragment to show system languages.
+ *
+ * <p>It shows suggestions at the top, then the rest of the locales.
+ * Allows the user to search for locales using both their native name and their name in the
+ * default locale.</p>
+ */
+public class SystemLocalePickerFragment extends DashboardFragment implements
+        SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener {
+
+    private static final String TAG = "SystemLocalePickerFragment";
+    private static final String EXTRA_EXPAND_SEARCH_VIEW = "expand_search_view";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_LIST = "system_locale_list";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST =
+            "system_locale_suggested_list";
+
+    @Nullable
+    private SearchView mSearchView = null;
+    @Nullable
+    private SearchFilter mSearchFilter = null;
+    @Nullable
+    private Set<LocaleStore.LocaleInfo> mLocaleList;
+    @Nullable
+    private List<LocaleStore.LocaleInfo> mLocaleOptions;
+    @Nullable
+    private List<LocaleStore.LocaleInfo> mOriginalLocaleInfos;
+    @Nullable
+    private SystemLocaleAllListPreferenceController mSystemLocaleAllListPreferenceController;
+    @Nullable
+    private SystemLocaleSuggestedListPreferenceController mSuggestedListPreferenceController;
+    private AppBarLayout mAppBarLayout;
+    private RecyclerView mRecyclerView;
+    private Activity mActivity;
+    private boolean mExpandSearch;
+
+    @Override
+    public void onCreate(@NonNull Bundle icicle) {
+        super.onCreate(icicle);
+        mActivity = getActivity();
+        if (mActivity.isFinishing()) {
+            return;
+        }
+        setHasOptionsMenu(true);
+
+        mExpandSearch = mActivity.getIntent().getBooleanExtra(EXTRA_EXPAND_SEARCH_VIEW, false);
+        if (icicle != null) {
+            mExpandSearch = icicle.getBoolean(EXTRA_EXPAND_SEARCH_VIEW);
+        }
+
+        SystemLocaleCollector systemLocaleCollector = new SystemLocaleCollector(getContext(), null);
+        mLocaleList = systemLocaleCollector.getSupportedLocaleList(null, false, false);
+        mLocaleOptions = new ArrayList<>(mLocaleList.size());
+    }
+
+    @Override
+    public @NonNull View onCreateView(@NonNull LayoutInflater inflater,
+            @NonNull ViewGroup container, @NonNull Bundle savedInstanceState) {
+        mAppBarLayout = mActivity.findViewById(R.id.app_bar);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mRecyclerView = view.findViewById(R.id.recycler_view);
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mSearchView != null) {
+            outState.putBoolean(EXTRA_EXPAND_SEARCH_VIEW, !mSearchView.isIconified());
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.language_selection_list, menu);
+        final MenuItem searchMenuItem = menu.findItem(R.id.locale_search_menu);
+        if (searchMenuItem != null) {
+            searchMenuItem.setOnActionExpandListener(this);
+            mSearchView = (SearchView) searchMenuItem.getActionView();
+            mSearchView.setQueryHint(
+                    getContext().getResources().getText(R.string.search_language_hint));
+            mSearchView.setOnQueryTextListener(this);
+            mSearchView.setMaxWidth(Integer.MAX_VALUE);
+            if (mExpandSearch) {
+                searchMenuItem.expandActionView();
+            }
+        }
+    }
+
+    private void filterSearch(@Nullable String query) {
+        if (mSystemLocaleAllListPreferenceController == null) {
+            Log.d(TAG, "filterSearch(), can not get preference.");
+            return;
+        }
+
+        if (mSearchFilter == null) {
+            mSearchFilter = new SearchFilter();
+        }
+
+        mOriginalLocaleInfos = mSystemLocaleAllListPreferenceController.getSupportedLocaleList();
+        // If we haven't load apps list completely, don't filter anything.
+        if (mOriginalLocaleInfos == null) {
+            Log.w(TAG, "Locales haven't loaded completely yet, so nothing can be filtered");
+            return;
+        }
+        mSearchFilter.filter(query);
+    }
+
+    private class SearchFilter extends Filter {
+
+        @Override
+        protected FilterResults performFiltering(CharSequence prefix) {
+            FilterResults results = new FilterResults();
+
+            if (mOriginalLocaleInfos == null) {
+                mOriginalLocaleInfos = new ArrayList<>(mLocaleList);
+            }
+
+            if (TextUtils.isEmpty(prefix)) {
+                results.values = mOriginalLocaleInfos;
+                results.count = mOriginalLocaleInfos.size();
+            } else {
+                // TODO: decide if we should use the string's locale
+                Locale locale = Locale.getDefault();
+                String prefixString = LocaleHelper.normalizeForSearch(prefix.toString(), locale);
+
+                final int count = mOriginalLocaleInfos.size();
+                final ArrayList<LocaleStore.LocaleInfo> newValues = new ArrayList<>();
+
+                for (int i = 0; i < count; i++) {
+                    final LocaleStore.LocaleInfo value = mOriginalLocaleInfos.get(i);
+                    final String nameToCheck = LocaleHelper.normalizeForSearch(
+                            value.getFullNameInUiLanguage(), locale);
+                    final String nativeNameToCheck = LocaleHelper.normalizeForSearch(
+                            value.getFullNameNative(), locale);
+                    if ((wordMatches(nativeNameToCheck, prefixString)
+                            || wordMatches(nameToCheck, prefixString)) && !newValues.contains(
+                            value)) {
+                        newValues.add(value);
+                    }
+                }
+
+                results.values = newValues;
+                results.count = newValues.size();
+            }
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            if (mSystemLocaleAllListPreferenceController == null
+                    || mSuggestedListPreferenceController == null) {
+                Log.d(TAG, "publishResults(), can not get preference.");
+                return;
+            }
+
+            mLocaleOptions = (ArrayList<LocaleStore.LocaleInfo>) results.values;
+            // Need to scroll to first preference when searching.
+            if (mRecyclerView != null) {
+                mRecyclerView.post(() -> mRecyclerView.scrollToPosition(0));
+            }
+            mSystemLocaleAllListPreferenceController.onSearchListChanged(mLocaleOptions);
+            mSuggestedListPreferenceController.onSearchListChanged(mLocaleOptions);
+        }
+
+        // TODO: decide if this is enough, or we want to use a BreakIterator...
+        private boolean wordMatches(String valueText, String prefixString) {
+            if (valueText == null) {
+                return false;
+            }
+
+            // First match against the whole, non-split value
+            if (valueText.startsWith(prefixString)) {
+                return true;
+            }
+
+            return Arrays.stream(valueText.split(" "))
+                    .anyMatch(word -> word.startsWith(prefixString));
+        }
+    }
+
+    @Override
+    public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
+        // To prevent a large space on tool bar.
+        mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
+        // To prevent user can expand the collapsing tool bar view.
+        ViewCompat.setNestedScrollingEnabled(mRecyclerView, false);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
+        // We keep the collapsed status after user cancel the search function.
+        mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
+        ViewCompat.setNestedScrollingEnabled(mRecyclerView, true);
+        return true;
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(@Nullable String query) {
+        return false;
+    }
+
+    @Override
+    public boolean onQueryTextChange(@Nullable String newText) {
+        filterSearch(newText);
+        return false;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.USER_LOCALE_LIST;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.system_language_picker;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getSettingsLifecycle());
+    }
+
+    private List<AbstractPreferenceController> buildPreferenceControllers(
+            @NonNull Context context, @Nullable Lifecycle lifecycle) {
+        LocaleList explicitLocales = null;
+        if (isDeviceDemoMode()) {
+            Bundle bundle = getIntent().getExtras();
+            explicitLocales = bundle == null
+                    ? null
+                    : bundle.getParcelable(Settings.EXTRA_EXPLICIT_LOCALES, LocaleList.class);
+            Log.i(TAG, "Has explicit locales : " + explicitLocales);
+        }
+        mSuggestedListPreferenceController =
+                new SystemLocaleSuggestedListPreferenceController(context,
+                        KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST);
+        mSystemLocaleAllListPreferenceController = new SystemLocaleAllListPreferenceController(
+                context, KEY_PREFERENCE_SYSTEM_LOCALE_LIST, explicitLocales);
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(mSuggestedListPreferenceController);
+        controllers.add(mSystemLocaleAllListPreferenceController);
+
+        return controllers;
+    }
+
+    private boolean isDeviceDemoMode() {
+        return Settings.Global.getInt(
+                getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0) == 1;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.system_language_picker);
+}
diff --git a/src/com/android/settings/localepicker/SystemLocaleSuggestedListPreferenceController.java b/src/com/android/settings/localepicker/SystemLocaleSuggestedListPreferenceController.java
new file mode 100644
index 00000000000..d082bc09b2e
--- /dev/null
+++ b/src/com/android/settings/localepicker/SystemLocaleSuggestedListPreferenceController.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.localepicker;
+
+import android.content.Context;
+import android.os.LocaleList;
+
+import com.android.internal.app.LocaleCollectorBase;
+import com.android.internal.app.LocaleStore;
+import com.android.internal.app.SystemLocaleCollector;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class SystemLocaleSuggestedListPreferenceController extends
+        LocalePickerBaseListPreferenceController {
+    private static final String KEY_PREFERENCE_CATEGORY_ADD_A_LANGUAGE_SUGGESTED =
+            "system_language_suggested_category";
+    private static final String KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST =
+            "system_locale_suggested_list";
+
+    @Nullable private LocaleStore.LocaleInfo mLocaleInfo;
+    private boolean mIsNumberingSystemMode;
+
+    public SystemLocaleSuggestedListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    public SystemLocaleSuggestedListPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey,
+            @NonNull LocaleStore.LocaleInfo parentLocale, boolean isNumberingSystemMode) {
+        super(context, preferenceKey);
+        mLocaleInfo = parentLocale;
+        mIsNumberingSystemMode = isNumberingSystemMode;
+    }
+
+    @Override
+    protected @NonNull String getPreferenceCategoryKey() {
+        return KEY_PREFERENCE_CATEGORY_ADD_A_LANGUAGE_SUGGESTED;
+    }
+
+    @Override
+    public @NonNull String getPreferenceKey() {
+        return KEY_PREFERENCE_SYSTEM_LOCALE_SUGGESTED_LIST;
+    }
+
+    @Override
+    protected LocaleCollectorBase getLocaleCollectorController(Context context) {
+        return new SystemLocaleCollector(context, getExplicitLocaleList());
+    }
+
+    @Override
+    protected @Nullable LocaleStore.LocaleInfo getParentLocale() {
+        return mLocaleInfo;
+    }
+
+    @Override
+    protected boolean isNumberingMode() {
+        return mIsNumberingSystemMode;
+    }
+
+    @Override
+    protected @Nullable LocaleList getExplicitLocaleList() {
+        return null;
+    }
+}
diff --git a/src/com/android/settings/localepicker/TermsOfAddressBaseController.java b/src/com/android/settings/localepicker/TermsOfAddressBaseController.java
index 86b139ece48..889acf0a870 100644
--- a/src/com/android/settings/localepicker/TermsOfAddressBaseController.java
+++ b/src/com/android/settings/localepicker/TermsOfAddressBaseController.java
@@ -23,8 +23,8 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.TickButtonPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -32,9 +32,9 @@ import java.util.concurrent.Executors;
 public abstract class TermsOfAddressBaseController extends BasePreferenceController {
 
     private static final Executor sExecutor = Executors.newSingleThreadExecutor();
-    private PreferenceScreen mPreferenceScreen;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private TickButtonPreference mPreference;
+    private SelectorWithWidgetPreference mPreference;
+
     private TermsOfAddressHelper mTermsOfAddressHelper;
 
     public TermsOfAddressBaseController(Context context, String preferenceKey) {
@@ -49,34 +49,17 @@ public abstract class TermsOfAddressBaseController extends BasePreferenceControl
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreferenceScreen = screen;
         mPreference = screen.findPreference(getPreferenceKey());
-        mPreference.setOnPreferenceClickListener(clickedPref -> {
+        mPreference.setChecked(
+                mTermsOfAddressHelper.getSystemGrammaticalGender() == getGrammaticalGenderType());
+        mPreference.setOnClickListener(v -> {
             sExecutor.execute(
                     () -> {
                         mTermsOfAddressHelper.setSystemGrammaticalGender(
                                 getGrammaticalGenderType());
                     });
-            setSelected(mPreference);
             mMetricsFeatureProvider.action(mContext, getMetricsActionKey());
-            return true;
         });
-        updatePreferences();
-    }
-
-    private void setSelected(TickButtonPreference preference) {
-        for (int i = 1; i < mPreferenceScreen.getPreferenceCount(); i++) {
-            TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(i);
-            pref.setSelected(pref.getKey().equals(preference.getKey()));
-        }
-    }
-
-    private void updatePreferences() {
-        if (mPreference == null) {
-            return;
-        }
-        mPreference.setSelected(
-                mTermsOfAddressHelper.getSystemGrammaticalGender() == getGrammaticalGenderType());
     }
 
     @Override
diff --git a/src/com/android/settings/location/LocationScreen.kt b/src/com/android/settings/location/LocationScreen.kt
new file mode 100644
index 00000000000..d45b762d102
--- /dev/null
+++ b/src/com/android/settings/location/LocationScreen.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.location.LocationManager
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.location_settings_title
+
+    override val keywords: Int
+        get() = R.string.keywords_location
+
+    override fun getSummary(context: Context): CharSequence? {
+        var locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        return if (locationManager.isLocationEnabled) {
+            context.getString(R.string.location_settings_loading_app_permission_stats)
+        } else {
+            context.getString(R.string.location_settings_summary_location_off)
+        }
+    }
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_location_filled
+            else -> R.drawable.ic_settings_location
+        }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystLocationSettings()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = LocationSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "location_settings"
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 87e8817808f..6a1d3d28dfb 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -29,6 +29,8 @@ import android.os.SystemProperties;
 import android.provider.Settings;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 
@@ -185,4 +187,9 @@ public class LocationSettings extends DashboardFragment implements
                     R.string.location_settings_tooltip_text_for_chrome));
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return LocationScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 3cb30251c51..c93b450ba01 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -15,13 +15,16 @@ package com.android.settings.location;
 
 import static android.Manifest.permission_group.LOCATION;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.icu.text.RelativeDateTimeFormatter;
+import android.location.LocationManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.DeviceConfig;
 import android.provider.Settings;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -43,6 +46,8 @@ import java.util.List;
  * Preference controller that handles the display of apps that access locations.
  */
 public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController {
+    private static final String TAG = RecentLocationAccessPreferenceController.class
+            .getSimpleName();
     public static final int MAX_APPS = 3;
     @VisibleForTesting
     RecentAppOpsAccess mRecentLocationApps;
@@ -51,7 +56,8 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
     private boolean mShowSystem = false;
     private boolean mSystemSettingChanged = false;
 
-    private static class PackageEntryClickedListener implements
+    @VisibleForTesting
+    static class PackageEntryClickedListener implements
             Preference.OnPreferenceClickListener {
         private final Context mContext;
         private final String mPackage;
@@ -66,12 +72,28 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
 
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
-            intent.setPackage(mContext.getPackageManager().getPermissionControllerPackageName());
-            intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, LOCATION);
-            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackage);
-            intent.putExtra(Intent.EXTRA_USER, mUserHandle);
-            mContext.startActivity(intent);
+            if (mPackage.equals(mContext.getSystemService(LocationManager.class)
+                    .getExtraLocationControllerPackage())) {
+                try {
+                    mContext.startActivityAsUser(
+                            new Intent(Settings.ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS),
+                            mUserHandle);
+                } catch (ActivityNotFoundException e) {
+                    // In rare cases where location controller extra package is set, but
+                    // no activity exists to handle the location controller extra package settings
+                    // intent, log an error instead of crashing.
+                    Log.e(TAG, "No activity to handle "
+                            + "android.settings.LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS");
+                }
+            } else {
+                final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
+                intent.setPackage(mContext.getPackageManager()
+                        .getPermissionControllerPackageName());
+                intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, LOCATION);
+                intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackage);
+                intent.putExtra(Intent.EXTRA_USER, mUserHandle);
+                mContext.startActivity(intent);
+            }
             return true;
         }
     }
diff --git a/src/com/android/settings/network/AdaptiveConnectivityScreen.kt b/src/com/android/settings/network/AdaptiveConnectivityScreen.kt
new file mode 100644
index 00000000000..0604236173f
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityScreen.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class AdaptiveConnectivityScreen : PreferenceScreenCreator {
+    override val key
+        get() = KEY
+
+    override val title
+        get() = R.string.adaptive_connectivity_title
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystAdaptiveConnectivity()
+
+    override fun fragmentClass() = AdaptiveConnectivitySettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +AdaptiveConnectivityTogglePreference()
+    }
+
+    override fun hasCompleteHierarchy() = false
+
+    companion object {
+        const val KEY = "adaptive_connectivity"
+    }
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivitySettings.java b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
index 5e1dc124f3b..a4e872c67cb 100644
--- a/src/com/android/settings/network/AdaptiveConnectivitySettings.java
+++ b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
@@ -16,6 +16,10 @@
 package com.android.settings.network;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -30,8 +34,6 @@ 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;
@@ -49,4 +51,9 @@ public class AdaptiveConnectivitySettings extends DashboardFragment {
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.adaptive_connectivity_settings);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return AdaptiveConnectivityScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt
new file mode 100644
index 00000000000..c29ec6e7406
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.net.wifi.WifiManager
+import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED
+import com.android.settings.R
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObservableDelegate
+import com.android.settingslib.datastore.SettingsSecureStore
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.metadata.MainSwitchPreference
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+
+// LINT.IfChange
+class AdaptiveConnectivityTogglePreference :
+    MainSwitchPreference(KEY, R.string.adaptive_connectivity_main_switch_title) {
+
+    override fun storage(context: Context): KeyValueStore =
+        AdaptiveConnectivityToggleStorage(context, SettingsSecureStore.get(context))
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class AdaptiveConnectivityToggleStorage(
+        private val context: Context,
+        private val settingsStore: SettingsStore,
+    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
+
+        override fun contains(key: String) = settingsStore.contains(KEY)
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            DEFAULT_VALUE as T
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (settingsStore.getBoolean(key) ?: DEFAULT_VALUE) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            settingsStore.setBoolean(key, value as Boolean)
+            context.getSystemService(WifiManager::class.java)?.setWifiScoringEnabled(value)
+        }
+    }
+
+    companion object {
+        const val KEY = ADAPTIVE_CONNECTIVITY_ENABLED
+        const val DEFAULT_VALUE = true
+    }
+}
+// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceController.java)
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
index ea849f65ac0..e1a3fb437ee 100644
--- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -29,6 +29,7 @@ import com.android.settings.widget.SettingsMainSwitchPreferenceController;
  * {@link SettingsMainSwitchPreferenceController}
  * that controls whether Adaptive connectivity option is enabled.
  */
+// LINT.IfChange
 public class AdaptiveConnectivityTogglePreferenceController extends
         SettingsMainSwitchPreferenceController {
 
@@ -69,3 +70,4 @@ public class AdaptiveConnectivityTogglePreferenceController extends
         return R.string.menu_key_network;
     }
 }
+// LINT.ThenChange(AdaptiveConnectivityTogglePreference.kt)
diff --git a/src/com/android/settings/network/AirplaneModePreference.kt b/src/com/android/settings/network/AirplaneModePreference.kt
new file mode 100644
index 00000000000..758bcfbe487
--- /dev/null
+++ b/src/com/android/settings/network/AirplaneModePreference.kt
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Looper
+import android.os.UserHandle
+import android.os.UserManager
+import android.provider.Settings
+import android.telephony.PhoneStateListener
+import android.telephony.TelephonyManager
+import android.util.Log
+import androidx.annotation.DrawableRes
+import androidx.preference.Preference
+import com.android.settings.AirplaneModeEnabler
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settingslib.RestrictedSwitchPreference
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.SettingsGlobalStore
+import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+// LINT.IfChange
+class AirplaneModePreference :
+    SwitchPreference(KEY, R.string.airplane_mode),
+    PreferenceAvailabilityProvider,
+    PreferenceLifecycleProvider,
+    PreferenceRestrictionMixin {
+
+    override val icon: Int
+        @DrawableRes get() = R.drawable.ic_airplanemode_active
+
+    override fun isAvailable(context: Context) =
+        (context.resources.getBoolean(R.bool.config_show_toggle_airplane) &&
+            !context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK))
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_AIRPLANE_MODE)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        when {
+            isSatelliteOn(context) || isInEcmMode(context) -> ReadWritePermit.DISALLOW
+            else -> ReadWritePermit.ALLOW
+        }
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.HIGH_SENSITIVITY
+
+    override fun storage(context: Context): KeyValueStore =
+        AirplaneModeStorage(context, SettingsGlobalStore.get(context))
+
+    @Suppress("DEPRECATION", "MissingPermission", "UNCHECKED_CAST")
+    private class AirplaneModeStorage(
+        private val context: Context,
+        private val settingsStore: SettingsStore,
+    ) : AbstractKeyedDataObservable<String>(), KeyValueStore {
+        private var phoneStateListener: PhoneStateListener? = null
+
+        override fun contains(key: String) =
+            settingsStore.contains(KEY) &&
+                context.getSystemService(TelephonyManager::class.java) != null
+
+        override fun <T : Any> getDefaultValue(key: String, valueType: Class<T>) =
+            DEFAULT_VALUE as T
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T =
+            (settingsStore.getBoolean(key) ?: DEFAULT_VALUE) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value is Boolean) {
+                settingsStore.setBoolean(key, value)
+
+                val intent = Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED)
+                intent.putExtra("state", value)
+                context.sendBroadcastAsUser(intent, UserHandle.ALL)
+            }
+        }
+
+        override fun onFirstObserverAdded() {
+            context.getSystemService(TelephonyManager::class.java)?.let {
+                phoneStateListener =
+                    object : PhoneStateListener(Looper.getMainLooper()) {
+                        @Deprecated("Deprecated in Java")
+                        override fun onRadioPowerStateChanged(state: Int) {
+                            Log.d(TAG, "onRadioPowerStateChanged(), state=$state")
+                            notifyChange(KEY, DataChangeReason.UPDATE)
+                        }
+                    }
+                it.listen(phoneStateListener, PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED)
+            }
+        }
+
+        override fun onLastObserverRemoved() {
+            context
+                .getSystemService(TelephonyManager::class.java)
+                ?.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE)
+        }
+    }
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        context.requirePreference<RestrictedSwitchPreference>(KEY).onPreferenceChangeListener =
+            Preference.OnPreferenceChangeListener { _: Preference, _: Any ->
+                if (isInEcmMode(context)) {
+                    showEcmDialog(context)
+                    return@OnPreferenceChangeListener false
+                }
+                if (isSatelliteOn(context)) {
+                    showSatelliteDialog(context)
+                    return@OnPreferenceChangeListener false
+                }
+                return@OnPreferenceChangeListener true
+            }
+    }
+
+    override fun onActivityResult(
+        context: PreferenceLifecycleContext,
+        requestCode: Int,
+        resultCode: Int,
+        data: Intent?,
+    ): Boolean {
+        if (requestCode == REQUEST_CODE_EXIT_ECM && resultCode == Activity.RESULT_OK) {
+            context.getKeyValueStore(KEY)?.setBoolean(KEY, true)
+        }
+        return true
+    }
+
+    private fun isInEcmMode(context: Context) =
+        AirplaneModeEnabler.isInEcmMode(
+            context,
+            context.getSystemService(TelephonyManager::class.java),
+        )
+
+    private fun isSatelliteOn(context: Context): Boolean {
+        try {
+            return SatelliteRepository(context)
+                .requestIsSessionStarted(Executors.newSingleThreadExecutor())
+                .get(2000, TimeUnit.MILLISECONDS)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error to get satellite status : $e")
+        }
+        return false
+    }
+
+    private fun showEcmDialog(context: PreferenceLifecycleContext) {
+        val intent =
+            Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null)
+                .setPackage(Utils.PHONE_PACKAGE_NAME)
+        context.startActivityForResult(intent, REQUEST_CODE_EXIT_ECM, null)
+    }
+
+    private fun showSatelliteDialog(context: PreferenceLifecycleContext) {
+        val intent =
+            Intent(context, SatelliteWarningDialogActivity::class.java)
+                .putExtra(
+                    SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG,
+                    SatelliteWarningDialogActivity.TYPE_IS_AIRPLANE_MODE,
+                )
+        context.startActivity(intent)
+    }
+
+    companion object {
+        const val TAG = "AirplaneModePreference"
+        const val KEY = Settings.Global.AIRPLANE_MODE_ON
+        const val DEFAULT_VALUE = false
+        const val REQUEST_CODE_EXIT_ECM = 1
+
+        fun Context.isAirplaneModeOn() = SettingsGlobalStore.get(this).getBoolean(KEY) == true
+    }
+}
+// LINT.ThenChange(AirplaneModePreferenceController.java)
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index d4bd4a369c0..ca8595f7781 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -15,8 +15,6 @@
  */
 package com.android.settings.network;
 
-import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
-
 import static com.android.settings.network.SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG;
 import static com.android.settings.network.SatelliteWarningDialogActivity.TYPE_IS_AIRPLANE_MODE;
 
@@ -52,6 +50,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+// LINT.IfChange
 public class AirplaneModePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnResume, OnStop, OnDestroy,
         AirplaneModeEnabler.OnAirplaneModeChangedListener {
@@ -94,7 +93,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
 
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && isAvailable()) {
+        if (AirplaneModePreference.KEY.equals(preference.getKey()) && isAvailable()) {
             // In ECM mode launch ECM app dialog
             if (mAirplaneModeEnabler.isInEcmMode()) {
                 if (mFragment != null) {
@@ -217,3 +216,4 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
         }
     }
 }
+// LINT.ThenChange(AirplaneModePreference.kt)
diff --git a/src/com/android/settings/network/CellularSecurityPreferenceController.java b/src/com/android/settings/network/CellularSecurityPreferenceController.java
index f43805ef83a..e515339c68c 100644
--- a/src/com/android/settings/network/CellularSecurityPreferenceController.java
+++ b/src/com/android/settings/network/CellularSecurityPreferenceController.java
@@ -88,10 +88,10 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
         } catch (UnsupportedOperationException e) {
             Log.i(LOG_TAG, "Null cipher enablement is unsupported, hiding divider: "
                     + e.getMessage());
-        } catch (Exception e) {
+        } catch (IllegalStateException e) {
             Log.e(LOG_TAG,
                     "Failed isNullCipherAndIntegrityEnabled. Setting availability to "
-                            + "CONDITIONALLY_UNAVAILABLE. Exception: "
+                            + "UNSUPPORTED_ON_DEVICE. Exception: "
                             + e.getMessage());
         }
 
@@ -104,6 +104,12 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
         } catch (UnsupportedOperationException e) {
             Log.i(LOG_TAG, "Cellular security notifications are unsupported, hiding divider: "
                     + e.getMessage());
+        } catch (IllegalStateException e) {
+            Log.e(LOG_TAG,
+                    "Failed isNullCipherNotificationsEnabled, "
+                            + "isCellularIdentifierDisclosureNotificationsEnabled. "
+                            + "Setting availability to UNSUPPORTED_ON_DEVICE. Exception: "
+                            + e.getMessage());
         }
 
         if (isNullCipherDisablementAvailable || areCellSecNotificationsAvailable) {
@@ -119,7 +125,7 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
             return super.handlePreferenceTreeClick(preference);
         }
         boolean isSafetyCenterSupported = isSafetyCenterSupported();
-        if (isSafetyCenterSupported) {
+        if (isSafetyCenterSupported && areNotificationsEnabled()) {
             Intent safetyCenterIntent = new Intent(Intent.ACTION_SAFETY_CENTER);
             safetyCenterIntent.putExtra(SafetyCenterManager.EXTRA_SAFETY_SOURCES_GROUP_ID,
                     "AndroidCellularNetworkSecuritySources");
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
index b8e18b31dee..ad02ddb6f45 100644
--- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -27,13 +26,14 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 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;
 import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settings.system.ResetDashboardFragment;
 
 public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment implements
         DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/network/MobileDataPreference.kt b/src/com/android/settings/network/MobileDataPreference.kt
new file mode 100644
index 00000000000..d285a8ca26e
--- /dev/null
+++ b/src/com/android/settings/network/MobileDataPreference.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.telephony.SubscriptionManager
+import com.android.settings.R
+import com.android.settings.network.telephony.MobileDataRepository
+import com.android.settings.network.telephony.SubscriptionRepository
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+
+class MobileDataPreference :
+    SwitchPreference(
+        KEY,
+        R.string.mobile_data_settings_title,
+        R.string.mobile_data_settings_summary,
+    ),
+    PreferenceAvailabilityProvider {
+
+    override fun isAvailable(context: Context) =
+        SubscriptionRepository(context).getSelectableSubscriptionInfoList().any {
+            it.simSlotIndex > -1
+        }
+
+    override fun storage(context: Context): KeyValueStore = MobileDataStorage(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.LOW_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class MobileDataStorage(private val context: Context) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T {
+            val subId = SubscriptionManager.getDefaultDataSubscriptionId()
+            val flow = MobileDataRepository(context).isMobileDataEnabledFlow(subId)
+            return runBlocking { flow.first() } as T
+        }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            val subId = SubscriptionManager.getDefaultDataSubscriptionId()
+            MobileDataRepository(context).setMobileDataEnabled(subId, value as Boolean)
+        }
+    }
+
+    companion object {
+        const val KEY = "mobile_data"
+    }
+}
diff --git a/src/com/android/settings/network/MobileNetworkListFragment.kt b/src/com/android/settings/network/MobileNetworkListFragment.kt
index 3118088c6c3..a0da636379b 100644
--- a/src/com/android/settings/network/MobileNetworkListFragment.kt
+++ b/src/com/android/settings/network/MobileNetworkListFragment.kt
@@ -92,4 +92,6 @@ class MobileNetworkListFragment : DashboardFragment() {
                 simRepositoryFactory(context).canEnterMobileNetworkPage()
         }
     }
+
+    override fun getPreferenceScreenBindingKey(context: Context) = MobileNetworkListScreen.KEY
 }
diff --git a/src/com/android/settings/network/MobileNetworkListScreen.kt b/src/com/android/settings/network/MobileNetworkListScreen.kt
new file mode 100644
index 00000000000..d7231ccb711
--- /dev/null
+++ b/src/com/android/settings/network/MobileNetworkListScreen.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.UserManager
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener
+import androidx.preference.Preference
+import androidx.preference.Preference.OnPreferenceClickListener
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.network.AirplaneModePreference.Companion.isAirplaneModeOn
+import com.android.settings.network.SubscriptionUtil.getUniqueSubscriptionDisplayName
+import com.android.settings.network.telephony.SimRepository
+import com.android.settings.network.telephony.SubscriptionRepository
+import com.android.settings.network.telephony.euicc.EuiccRepository
+import com.android.settings.spa.network.getAddSimIntent
+import com.android.settings.spa.network.startAddSimFlow
+import com.android.settingslib.RestrictedPreference
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.datastore.SettingsGlobalStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenBinding
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class MobileNetworkListScreen :
+    PreferenceScreenCreator,
+    PreferenceScreenBinding,
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider,
+    PreferenceRestrictionMixin,
+    OnPreferenceClickListener {
+
+    private var airplaneModeObserver: KeyedObserver<String>? = null
+    private var subscriptionInfoList: List<SubscriptionInfo>? = null
+    private var onSubscriptionsChangedListener: OnSubscriptionsChangedListener? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.provider_network_settings_title
+
+    override val icon: Int
+        get() = R.drawable.ic_sim_card
+
+    override val keywords: Int
+        get() = R.string.keywords_more_mobile_networks
+
+    override fun intent(context: Context) = getAddSimIntent()
+
+    override fun getSummary(context: Context): CharSequence? {
+        val list = getSelectableSubscriptionInfoList(context)
+        return when {
+            list.isNotEmpty() ->
+                list
+                    .map { getUniqueSubscriptionDisplayName(it, context).toString() }
+                    .distinct()
+                    .joinToString(", ")
+            EuiccRepository(context).showEuiccSettings() ->
+                context.getString(R.string.mobile_network_summary_add_a_network)
+            else -> null
+        }
+    }
+
+    override fun isAvailable(context: Context) =
+        SimRepository(context).showMobileNetworkPageEntrance()
+
+    override fun isEnabled(context: Context) =
+        super<PreferenceRestrictionMixin>.isEnabled(context) &&
+            !context.isAirplaneModeOn() &&
+            (getSelectableSubscriptionInfoList(context).isNotEmpty() ||
+                EuiccRepository(context).showEuiccSettings())
+
+    private fun getSelectableSubscriptionInfoList(context: Context): List<SubscriptionInfo> =
+        subscriptionInfoList
+            ?: SubscriptionRepository(context).getSelectableSubscriptionInfoList().also {
+                subscriptionInfoList = it
+            }
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)
+
+    override val useAdminDisabledSummary
+        get() = true
+
+    override fun createWidget(context: Context) = RestrictedPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.onPreferenceClickListener = this
+    }
+
+    override fun onPreferenceClick(preference: Preference): Boolean {
+        val summary = preference.summary ?: return true // no-op
+        val context = preference.context
+        if (summary == context.getString(R.string.mobile_network_summary_add_a_network)) {
+            startAddSimFlow(context) // start intent
+            return true
+        }
+        return false // start fragment
+    }
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        val executor = HandlerExecutor.main
+        val observer = KeyedObserver<String> { _, _ -> context.notifyPreferenceChange(KEY) }
+        airplaneModeObserver = observer
+        SettingsGlobalStore.get(context).addObserver(AirplaneModePreference.KEY, observer, executor)
+        context.getSystemService(SubscriptionManager::class.java)?.let {
+            val listener =
+                object : OnSubscriptionsChangedListener() {
+                    override fun onSubscriptionsChanged() {
+                        subscriptionInfoList = null // invalid cache
+                        context.notifyPreferenceChange(KEY)
+                    }
+                }
+            it.addOnSubscriptionsChangedListener(executor, listener)
+            onSubscriptionsChangedListener = listener
+        }
+    }
+
+    override fun onDestroy(context: PreferenceLifecycleContext) {
+        airplaneModeObserver?.let {
+            SettingsGlobalStore.get(context).removeObserver(AirplaneModePreference.KEY, it)
+        }
+        context.getSystemService(SubscriptionManager::class.java)?.apply {
+            onSubscriptionsChangedListener?.let { removeOnSubscriptionsChangedListener(it) }
+        }
+    }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = MobileNetworkListFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) { +MobileDataPreference() }
+
+    companion object {
+        const val KEY = "mobile_network_list"
+    }
+}
diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.kt b/src/com/android/settings/network/MobileNetworkSummaryController.kt
index 8cf9bec283e..62c57661809 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.kt
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.kt
@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.Flow
  * - Has subscriptions: click action takes you to a page listing the subscriptions, and the summary
  *   text gives the count of SIMs
  */
+// LINT.IfChange
 class MobileNetworkSummaryController
 @JvmOverloads
 constructor(
@@ -119,3 +120,4 @@ constructor(
         )
     }
 }
+// LINT.ThenChange(MobileNetworkListScreen.kt)
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index ee7d440bcf3..00e25079fd0 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -19,6 +19,7 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.settings.R;
@@ -58,7 +59,9 @@ public class NetworkDashboardFragment extends DashboardFragment implements
     public void onAttach(Context context) {
         super.onAttach(context);
 
-        use(AirplaneModePreferenceController.class).setFragment(this);
+        if (isCatalystEnabled()) {
+            use(AirplaneModePreferenceController.class).setFragment(this);
+        }
         use(NetworkProviderCallsSmsController.class).init(this);
     }
 
@@ -101,8 +104,10 @@ public class NetworkDashboardFragment extends DashboardFragment implements
 
         switch (requestCode) {
             case AirplaneModePreferenceController.REQUEST_CODE_EXIT_ECM:
-                use(AirplaneModePreferenceController.class)
-                        .onActivityResult(requestCode, resultCode, data);
+                if (isCatalystEnabled()) {
+                    use(AirplaneModePreferenceController.class)
+                            .onActivityResult(requestCode, resultCode, data);
+                }
                 break;
         }
     }
@@ -115,4 +120,9 @@ public class NetworkDashboardFragment extends DashboardFragment implements
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return NetworkDashboardScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/network/NetworkDashboardScreen.kt b/src/com/android/settings/network/NetworkDashboardScreen.kt
new file mode 100644
index 00000000000..15bf590f462
--- /dev/null
+++ b/src/com/android/settings/network/NetworkDashboardScreen.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.datausage.DataSaverScreen
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.network_dashboard_title
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_wireless_filled
+            else -> R.drawable.ic_settings_wireless
+        }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystNetworkProviderAndInternetScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = NetworkDashboardFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +MobileNetworkListScreen.KEY order -15
+            +AirplaneModePreference() order -5
+            +DataSaverScreen.KEY order 10
+        }
+
+    companion object {
+        const val KEY = "network_provider_and_internet_screen"
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderScreen.kt b/src/com/android/settings/network/NetworkProviderScreen.kt
new file mode 100644
index 00000000000..766ec0c6a51
--- /dev/null
+++ b/src/com/android/settings/network/NetworkProviderScreen.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.UserManager
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.wifi.WifiSwitchPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class NetworkProviderScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.provider_internet_settings
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_wireless
+
+    override val keywords: Int
+        get() = R.string.keywords_internet
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_internet_settings)
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_WIFI)
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = NetworkProviderSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +WifiSwitchPreference()
+    }
+
+    companion object {
+        const val KEY = "internet_settings"
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 69183ff25c0..c776987856e 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -64,8 +64,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.location.WifiScanningFragment;
@@ -104,7 +104,7 @@ import java.util.Optional;
  * UI for Mobile network and Wi-Fi network settings.
  */
 @SearchIndexable
-public class NetworkProviderSettings extends RestrictedSettingsFragment
+public class NetworkProviderSettings extends RestrictedDashboardFragment
         implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
         WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,
         AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener {
@@ -356,9 +356,17 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         mIsGuest = userManager.isGuestUser();
     }
 
-    private void addPreferences() {
-        addPreferencesFromResource(R.xml.network_provider_settings);
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.network_provider_settings;
+    }
+
+    private void addPreferences() {
         mAirplaneModeMsgPreference = findPreference(PREF_KEY_AIRPLANE_MODE_MSG);
         updateAirplaneModeMsgPreference(mAirplaneModeEnabler.isAirplaneModeOn() /* visible */);
         mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
@@ -421,6 +429,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
     }
 
     private void addWifiSwitchPreferenceController() {
+        if (isCatalystEnabled()) {
+            Log.i(TAG, "WifiSwitchPreferenceController bypassed since Catalyst is enabled!");
+            return;
+        }
         if (!hasWifiManager()) return;
         if (mWifiSwitchPreferenceController == null) {
             mWifiSwitchPreferenceController =
@@ -1500,4 +1512,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
             return android.R.attr.colorControlNormal;
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return NetworkProviderScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index 7fab9c9848e..6d9800b5c5a 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -19,6 +19,7 @@ package com.android.settings.network
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.UserHandle;
 import android.provider.Settings
 import android.telephony.SubscriptionManager
 import android.util.Log
@@ -55,6 +56,7 @@ import com.android.settings.R
 import com.android.settings.SidecarFragment
 import com.android.settings.network.telephony.SimRepository
 import com.android.settings.network.telephony.SubscriptionActionDialogActivity
+import com.android.settings.network.telephony.SubscriptionRepository
 import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity
 import com.android.settings.network.telephony.requireSubscriptionManager
 import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
@@ -78,8 +80,10 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 
 class SimOnboardingActivity : SpaBaseDialogActivity() {
     lateinit var scope: CoroutineScope
@@ -105,6 +109,12 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
         }
 
         var targetSubId = intent.getIntExtra(SUB_ID,SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+        if (targetSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            targetSubId = intent.getIntExtra(
+              Settings.EXTRA_SUB_ID,
+              SubscriptionManager.INVALID_SUBSCRIPTION_ID
+            )
+        }
         initServiceData(this, targetSubId, callbackListener)
         if (!onboardingService.isUsableTargetSubscriptionId) {
             Log.e(TAG, "The subscription id is not usable.")
@@ -489,31 +499,25 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
         }
     }
 
-    suspend fun checkSimIsReadyAndGoNext() {
+    private suspend fun checkSimIsReadyAndGoNext() {
         withContext(Dispatchers.Default) {
-            val isEnabled = context.requireSubscriptionManager()
-                .isSubscriptionEnabled(onboardingService.targetSubId)
-            if (!isEnabled) {
-                val latch = CountDownLatch(1)
-                val receiver = CarrierConfigChangedReceiver(latch)
-                try {
-                    val waitingTimeMillis =
-                        Settings.Global.getLong(
-                            context.contentResolver,
-                            Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,
-                            UiccSlotUtil.DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS
-                        )
-                    receiver.registerOn(context)
-                    Log.d(TAG, "Start waiting, waitingTime is $waitingTimeMillis")
-                    latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS)
-                } catch (e: InterruptedException) {
-                    Thread.currentThread().interrupt()
-                    Log.e(TAG, "Failed switching to physical slot.", e)
-                } finally {
-                    context.unregisterReceiver(receiver)
-                }
-            }
-            Log.d(TAG, "Sim is ready then go to next")
+            val waitingTimeMillis =
+                Settings.Global.getLong(
+                    context.contentResolver,
+                    Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,
+                    UiccSlotUtil.DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS,
+                )
+            Log.d(TAG, "Start waiting, waitingTime is $waitingTimeMillis")
+            val isTimeout =
+                withTimeoutOrNull(waitingTimeMillis) {
+                    SubscriptionRepository(context)
+                        .isSubscriptionEnabledFlow(onboardingService.targetSubId)
+                        .firstOrNull { it }
+                } == null
+            Log.d(
+                TAG,
+                if (isTimeout) "Sim is not ready after timeout" else "Sim is ready then go to next",
+            )
             callbackListener(CallbackType.CALLBACK_SETUP_NAME)
         }
     }
@@ -588,7 +592,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
                     setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 }
             }
-            context.startActivity(intent)
+            context.startActivityAsUser(intent, UserHandle.CURRENT)
         }
 
         var onboardingService:SimOnboardingService = SimOnboardingService()
@@ -610,4 +614,4 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
             CALLBACK_FINISH(5)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/network/SimOnboardingService.kt b/src/com/android/settings/network/SimOnboardingService.kt
index e4f17e25802..0882b817360 100644
--- a/src/com/android/settings/network/SimOnboardingService.kt
+++ b/src/com/android/settings/network/SimOnboardingService.kt
@@ -74,8 +74,11 @@ class SimOnboardingService {
         }
     var isEsimProfileEnabled: Boolean = false
         get() {
-            activeSubInfoList.stream().anyMatch { it.isEmbedded }
-            return false
+            return activeSubInfoList.stream().anyMatch { it.isEmbedded }
+        }
+    var isRemovableSimProfileEnabled: Boolean = false
+        get() {
+            return activeSubInfoList.stream().anyMatch { !it.isEmbedded }
         }
     var doesTargetSimActive = false
         get() {
@@ -288,8 +291,8 @@ class SimOnboardingService {
             Log.d(TAG, "Hardware does not support DSDS.")
             return false
         }
-        val isActiveSim = activeSubInfoList.isNotEmpty()
-        if (isMultipleEnabledProfilesSupported && isActiveSim) {
+        val anyActiveSim = activeSubInfoList.isNotEmpty()
+        if (isMultipleEnabledProfilesSupported && anyActiveSim) {
             Log.d(TAG,
                 "Device supports MEP and eSIM operation and eSIM profile is enabled."
                         + " DSDS condition satisfied."
@@ -297,15 +300,13 @@ class SimOnboardingService {
             return true
         }
 
-        if (doesTargetSimHaveEsimOperation) {
-            if (UiccSlotRepository(telephonyManager).anyRemovablePhysicalSimEnabled()) {
-                Log.d(
-                    TAG,
-                    "eSIM operation and removable PSIM is enabled. DSDS condition satisfied."
-                )
-                return true
-            }
-        } else if (isEsimProfileEnabled) {
+        if (doesTargetSimHaveEsimOperation && isRemovableSimProfileEnabled) {
+            Log.d(TAG,
+                "eSIM operation and removable PSIM is enabled. DSDS condition satisfied."
+            )
+            return true
+        }
+        if (!doesTargetSimHaveEsimOperation && isEsimProfileEnabled) {
             Log.d(TAG,
                 "Removable SIM operation and eSIM profile is enabled. DSDS condition"
                         + " satisfied."
diff --git a/src/com/android/settings/network/TetherPreferenceController.kt b/src/com/android/settings/network/TetherPreferenceController.kt
index c36a2382c62..524eb7836fc 100644
--- a/src/com/android/settings/network/TetherPreferenceController.kt
+++ b/src/com/android/settings/network/TetherPreferenceController.kt
@@ -35,19 +35,35 @@ import com.android.settingslib.TetherUtil
 import com.android.settingslib.Utils
 import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class TetherPreferenceController(context: Context, key: String) :
-    BasePreferenceController(context, key) {
+class TetherPreferenceController(
+    context: Context,
+    key: String,
+    private val tetheredRepository: TetheredRepository = TetheredRepository(context),
+) : BasePreferenceController(context, key) {
 
-    private val tetheredRepository = TetheredRepository(context)
     private val tetheringManager = mContext.getSystemService(TetheringManager::class.java)!!
 
     private var preference: Preference? = null
 
-    override fun getAvailabilityStatus() =
-        if (TetherUtil.isTetherAvailable(mContext)) AVAILABLE else CONDITIONALLY_UNAVAILABLE
+    private val isTetherAvailableFlow =
+        flow { emit(TetherUtil.isTetherAvailable(mContext)) }
+            .distinctUntilChanged()
+            .conflate()
+            .flowOn(Dispatchers.Default)
+
+    /**
+     * Always returns available here to avoid ANR.
+     * - Actual UI visibility is handled in [onViewCreated].
+     * - Search visibility is handled in [updateNonIndexableKeys].
+     */
+    override fun getAvailabilityStatus() = AVAILABLE
 
     override fun displayPreference(screen: PreferenceScreen) {
         super.displayPreference(screen)
@@ -55,6 +71,9 @@ class TetherPreferenceController(context: Context, key: String) :
     }
 
     override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+        isTetherAvailableFlow.collectLatestWithLifecycle(viewLifecycleOwner) {
+            preference?.isVisible = it
+        }
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 getTitleResId()?.let { preference?.setTitle(it) }
@@ -84,6 +103,12 @@ class TetherPreferenceController(context: Context, key: String) :
         }
     }
 
+    override fun updateNonIndexableKeys(keys: MutableList<String>) {
+        if (!TetherUtil.isTetherAvailable(mContext)) {
+            keys += preferenceKey
+        }
+    }
+
     companion object {
         @JvmStatic
         fun isTetherConfigDisallowed(context: Context?): Boolean =
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index be0780948df..660fd14df86 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -26,7 +26,6 @@ import android.net.VpnManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.provider.SettingsSlicesContract;
 import android.security.Credentials;
 import android.security.LegacyVpnProfileStore;
 import android.util.Log;
@@ -39,7 +38,6 @@ import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.vpn2.VpnInfoPreference;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -50,7 +48,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.function.Function;
 
 public class VpnPreferenceController extends AbstractPreferenceController
@@ -87,7 +84,7 @@ public class VpnPreferenceController extends AbstractPreferenceController
                 Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
         // Manually set dependencies for Wifi when not toggleable.
         if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) {
-            preference.setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
+            preference.setDependency(Settings.Global.AIRPLANE_MODE_ON);
         }
         return preference;
     }
diff --git a/src/com/android/settings/network/WifiSwitchPreferenceController.java b/src/com/android/settings/network/WifiSwitchPreferenceController.java
index 8e6f4446cb2..a2292b9b7d9 100644
--- a/src/com/android/settings/network/WifiSwitchPreferenceController.java
+++ b/src/com/android/settings/network/WifiSwitchPreferenceController.java
@@ -38,6 +38,7 @@ import com.google.common.annotations.VisibleForTesting;
 /**
  * This controller helps to manage the state of wifi switch preference.
  */
+// LINT.IfChange
 public class WifiSwitchPreferenceController extends AbstractPreferenceController implements
         LifecycleObserver {
 
@@ -125,3 +126,4 @@ public class WifiSwitchPreferenceController extends AbstractPreferenceController
         return wifiManager.isWifiEnabled();
     }
 }
+// LINT.ThenChange(WifiSwitchPreference.kt)
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index d1b2f2fa3fc..5ae280c37cc 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -16,548 +16,64 @@
 
 package com.android.settings.network.apn;
 
-import android.app.Dialog;
+import static com.android.settings.network.apn.ApnEditPageProviderKt.EDIT_URL;
+import static com.android.settings.network.apn.ApnEditPageProviderKt.INSERT_URL;
+
 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.os.UserManager;
 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.TwoStatePreference;
 
-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;
+import com.android.settings.spa.SpaActivity;
 
 /** Use to edit apn settings. */
-public class ApnEditor extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, OnKeyListener {
+public class ApnEditor extends SettingsPreferenceFragment {
 
     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";
-
-    @VisibleForTesting
-    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
-    TwoStatePreference 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;
-    /**
-     * The APN deletion feature within menu is aligned with the APN adding feature.
-     * Having only one of them could lead to a UX which not that make sense from user's
-     * perspective.
-     *
-     * mIsAddApnAllowed stores the configuration value reading from
-     * CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL to support the presentation
-     * control of the menu options. When false, delete option would be invisible to
-     * the end user.
-     */
-    private boolean mIsAddApnAllowed;
-    private Uri mCarrierUri;
-    private boolean mIsCarrierIdApn;
-
-    /**
-     * 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
-            Telephony.Carriers.CARRIER_ID       // 25
-    };
-
-    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;
-    private static final int CARRIER_ID_INDEX = 25;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        maybeRedirectToNewPage();
+        finish();
+    }
+
+    private void maybeRedirectToNewPage() {
         if (isUserRestricted()) {
             Log.e(TAG, "This setting isn't available due to user restriction.");
-            finish();
             return;
         }
 
-        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(getContext());
+        int subId =
+                intent.getIntExtra(ApnSettings.SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
-        Uri uri = null;
-        if (action.equals(Intent.ACTION_EDIT)) {
-            uri = intent.getData();
+        Uri uri = intent.getData();
+        if (Intent.ACTION_EDIT.equals(action)) {
             if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
                 Log.e(TAG, "Edit request not for carrier table. Uri: " + uri);
-                finish();
-                return;
+            } else {
+                String route = ApnEditPageProvider.INSTANCE.getRoute(EDIT_URL, uri, subId);
+                SpaActivity.startSpaActivity(requireContext(), route);
             }
-        } 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 int carrierId = mApnData.getInteger(CARRIER_ID_INDEX,
-                TelephonyManager.UNKNOWN_CARRIER_ID);
-        mIsCarrierIdApn = (carrierId > TelephonyManager.UNKNOWN_CARRIER_ID);
-
-        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);
-        }
-        // Make sure that a user cannot break carrier id APN matching
-        if (mIsCarrierIdApn) {
-            disableFieldsForCarrieridApn();
-        }
-
-        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;
+        } else if (Intent.ACTION_INSERT.equals(action)) {
+            if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
+                Log.e(TAG, "Insert request not for carrier table. Uri: " + uri);
+            } else {
+                String route = ApnEditPageProvider.INSTANCE.getRoute(
+                        INSERT_URL, Telephony.Carriers.CONTENT_URI, subId);
+                SpaActivity.startSpaActivity(getContext(), route);
             }
         }
-
-        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;
-        }
-
-        final String[] apnTypesArray1LowerCase = new String[apnTypesArray1.length];
-        for (int i = 0; i < apnTypesArray1.length; i++) {
-            apnTypesArray1LowerCase[i] = apnTypesArray1[i].toLowerCase();
-        }
-
-        if (hasAllApns(apnTypesArray1LowerCase) || TextUtils.isEmpty(apnTypes2)) {
-            return true;
-        }
-
-        final List apnTypesList1 = Arrays.asList(apnTypesArray1LowerCase);
-        final String[] apnTypesArray2 = apnTypes2.split(",");
-
-        for (String apn : apnTypesArray2) {
-            if (apnTypesList1.contains(apn.trim().toLowerCase())) {
-                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);
-    }
-
-    /**
-     * Disables fields for a carrier id APN to avoid breaking the match criteria
-     */
-    private void disableFieldsForCarrieridApn() {
-        mMcc.setEnabled(false);
-        mMnc.setEnabled(false);
-        mMvnoType.setEnabled(false);
-        mMvnoMatchData.setEnabled(false);
     }
 
     @Override
@@ -565,904 +81,6 @@ public class ApnEditor extends SettingsPreferenceFragment
         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)) {
-                    // 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(checkNullforMvnoValue(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(checkNullforMvnoValue(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 APN add is not allowed, delete might lead to issue regarding recovery
-        if (!mNewApn && !mReadOnlyApn && mIsAddApnAllowed) {
-            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());
-        boolean doNotCheckMccMnc = mIsCarrierIdApn && TextUtils.isEmpty(mcc)
-                && TextUtils.isEmpty(mnc);
-        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 (doNotCheckMccMnc) {
-            Log.d(TAG, "validateApnData: carrier id APN does not have mcc/mnc defined");
-            // no op, skip mcc mnc null check
-        } 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;
-    }
-
-    /**
-     * To make traslation be diversity, use another string id for MVNO value.
-     */
-    private String checkNullforMvnoValue(String value) {
-        String notSetForMvnoValue = getResources().getString(R.string.apn_not_set_for_mvno);
-        return TextUtils.isEmpty(value) ? notSetForMvnoValue : 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)
-                    && !apnType.equals(APN_TYPE_IMS)) {
-                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 = (TwoStatePreference) findPreference(KEY_CARRIER_ENABLED);
-        mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
-        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
-        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
-    }
-
-    @VisibleForTesting
-    protected void getCarrierCustomizedConfig(Context context) {
-        mReadOnlyApn = false;
-        mReadOnlyApnTypes = null;
-        mReadOnlyApnFields = null;
-        mIsAddApnAllowed = true;
-
-        final CarrierConfigManager configManager = (CarrierConfigManager)
-            context.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);
-                }
-
-                mIsAddApnAllowed = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
-                if (!mIsAddApnAllowed) {
-                    Log.d(TAG, "onCreate: not allow to add new APN");
-                }
-            }
-        }
-    }
-
-    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
     boolean isUserRestricted() {
         UserManager userManager = getContext().getSystemService(UserManager.class);
@@ -1479,80 +97,4 @@ public class ApnEditor extends SettingsPreferenceFragment
         }
         return false;
     }
-
-    @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/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index 2debba1d99a..24f25ecf7ac 100644
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -23,7 +23,6 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -34,7 +33,6 @@ import android.provider.Telephony;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.data.ApnSetting;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -51,7 +49,6 @@ import androidx.preference.PreferenceGroup;
 
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.flags.Flags;
 import com.android.settings.network.telephony.SubscriptionRepository;
 import com.android.settings.spa.SpaActivity;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -59,6 +56,7 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import kotlin.Unit;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /** Handle each different apn setting. */
 public class ApnSettings extends RestrictedSettingsFragment
@@ -68,16 +66,12 @@ public class ApnSettings extends RestrictedSettingsFragment
     public static final String APN_ID = "apn_id";
     public static final String APN_LIST = "apn_list";
     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,
     };
 
@@ -85,9 +79,7 @@ public class ApnSettings extends RestrictedSettingsFragment
     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 EDITED_INDEX = 4;
 
     private static final int MENU_NEW = Menu.FIRST;
     private static final int MENU_RESTORE = Menu.FIRST + 1;
@@ -101,8 +93,6 @@ public class ApnSettings extends RestrictedSettingsFragment
     private PreferredApnRepository mPreferredApnRepository;
     @Nullable
     private String mPreferredApnKey;
-    private String mMvnoType;
-    private String mMvnoMatchData;
 
     private boolean mUnavailable;
 
@@ -135,10 +125,9 @@ public class ApnSettings extends RestrictedSettingsFragment
         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);
+            final List<String> readOnlyApnTypes = ApnTypes.getReadOnlyApnTypes(b);
             // if no apn type can be edited, do not allow adding APNs
-            if (ApnEditor.hasAllApns(readOnlyApnTypes)) {
+            if (ApnTypes.hasAllApnTypes(readOnlyApnTypes)) {
                 Log.d(TAG, "not allowing adding APN because all APN types are read only");
                 mAllowAddingApns = false;
             }
@@ -242,8 +231,6 @@ public class ApnSettings extends RestrictedSettingsFragment
                 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());
 
@@ -311,20 +298,9 @@ public class ApnSettings extends RestrictedSettingsFragment
     }
 
     private void addNewApn() {
-        if (Flags.newApnPageEnabled()) {
-            String route = ApnEditPageProvider.INSTANCE.getRoute(
-                    INSERT_URL, Telephony.Carriers.CONTENT_URI, mSubId);
-            SpaActivity.startSpaActivity(getContext(), route);
-        } else {
-            final Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
-            intent.putExtra(SUB_ID, mSubId);
-            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);
-        }
+        String route = ApnEditPageProvider.INSTANCE.getRoute(
+                INSERT_URL, Telephony.Carriers.CONTENT_URI, mSubId);
+        SpaActivity.startSpaActivity(getContext(), route);
     }
 
     @Override
diff --git a/src/com/android/settings/network/apn/ApnStatus.kt b/src/com/android/settings/network/apn/ApnStatus.kt
index 6492d39417d..d33c8b3cc73 100644
--- a/src/com/android/settings/network/apn/ApnStatus.kt
+++ b/src/com/android/settings/network/apn/ApnStatus.kt
@@ -25,6 +25,7 @@ import android.telephony.CarrierConfigManager
 import android.util.Log
 import com.android.settings.R
 import com.android.settings.network.apn.ApnTypes.getPreSelectedApnType
+import com.android.settings.network.apn.ApnTypes.getReadOnlyApnTypes
 
 private const val TAG = "ApnStatus"
 
@@ -204,9 +205,7 @@ fun getCarrierCustomizedConfig(
         CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL
     )
     val customizedConfig = CustomizedConfig(
-        readOnlyApnTypes = b.getStringArray(
-            CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY
-        )?.toList() ?: emptyList(),
+        readOnlyApnTypes = b.getReadOnlyApnTypes(),
         readOnlyApnFields = b.getStringArray(
             CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY
         )?.toList() ?: emptyList(),
diff --git a/src/com/android/settings/network/apn/ApnTypes.kt b/src/com/android/settings/network/apn/ApnTypes.kt
index b9bc480cc35..ee192b262b4 100644
--- a/src/com/android/settings/network/apn/ApnTypes.kt
+++ b/src/com/android/settings/network/apn/ApnTypes.kt
@@ -17,6 +17,8 @@
 package com.android.settings.network.apn
 
 import android.content.Context
+import android.os.PersistableBundle
+import android.telephony.CarrierConfigManager
 import android.telephony.data.ApnSetting
 import android.util.Log
 import android.widget.Toast
@@ -45,13 +47,13 @@ object ApnTypes {
         ApnSetting.TYPE_VSIM_STRING,
         ApnSetting.TYPE_BIP_STRING,
         ApnSetting.TYPE_ENTERPRISE_STRING,
+        ApnSetting.TYPE_OEM_PAID_STRING,
+        ApnSetting.TYPE_OEM_PRIVATE_STRING,
     )
 
     private fun splitToList(apnType: String): List<String> {
         val types = apnType.split(',').map { it.trim().toLowerCase(Locale.current) }
-        if (ApnSetting.TYPE_ALL_STRING in types || APN_TYPES.all { it in types }) {
-            return listOf(ApnSetting.TYPE_ALL_STRING)
-        }
+        if (hasAllApnTypes(types)) return listOf(ApnSetting.TYPE_ALL_STRING)
         return APN_TYPES.filter { it in types }
     }
 
@@ -130,4 +132,32 @@ object ApnTypes {
     private fun defaultPreSelectedApnTypes(readOnlyApnTypes: List<String>) =
         if (ApnSetting.TYPE_ALL_STRING in readOnlyApnTypes) emptyList()
         else PreSelectedTypes.filterNot { it in readOnlyApnTypes }
+
+    /** Array of APN types that are never user-editable */
+    private val ALWAYS_READ_ONLY_APN_TYPES =
+        arrayOf(ApnSetting.TYPE_OEM_PAID_STRING, ApnSetting.TYPE_OEM_PRIVATE_STRING)
+
+    /**
+     * Fetch complete list of read only APN types.
+     *
+     * The list primarily comes from carrier config, but is also supplied by APN types which are
+     * always read only.
+     */
+    @JvmStatic
+    fun PersistableBundle.getReadOnlyApnTypes(): List<String> {
+        val carrierReadOnlyApnTypes =
+            getStringArray(CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY)?.toList()
+                ?: emptyList()
+        return carrierReadOnlyApnTypes + ALWAYS_READ_ONLY_APN_TYPES
+    }
+
+    /**
+     * 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
+     */
+    @JvmStatic
+    fun hasAllApnTypes(apnTypes: List<String>): Boolean =
+        ApnSetting.TYPE_ALL_STRING in apnTypes || APN_TYPES.all { it in apnTypes }
 }
diff --git a/src/com/android/settings/network/telephony/CarrierConfigRepository.kt b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
index 99683a8671a..77f4e1c277a 100644
--- a/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
+++ b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
@@ -224,7 +224,10 @@ class CarrierConfigRepository(private val context: Context) {
         }
 
         private val BooleanKeysWhichNotFollowingsNamingConventions =
-            listOf(CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
+            listOf(
+                CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS,
+                CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL,
+            )
 
         private fun checkBooleanKey(key: String) {
             check(key.endsWith("_bool") || key in BooleanKeysWhichNotFollowingsNamingConventions) {
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 7d5230db2b6..8051711ddd4 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -16,29 +16,31 @@
 
 package com.android.settings.network.telephony;
 
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
-import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
-
 import static com.android.settings.network.telephony.EnabledNetworkModePreferenceControllerHelperKt.getNetworkModePreferenceType;
 import static com.android.settings.network.telephony.EnabledNetworkModePreferenceControllerHelperKt.setAllowedNetworkTypes;
+import static com.android.settings.network.telephony.mode.NetworkModes.addNrToLteNetworkMode;
+import static com.android.settings.network.telephony.mode.NetworkModes.reduceNrToLteNetworkMode;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
+import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteModemStateCallback;
+import android.telephony.satellite.SelectedNbIotSatelliteSubscriptionCallback;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.ListPreference;
 import androidx.preference.ListPreferenceDialogFragmentCompat;
 import androidx.preference.Preference;
@@ -52,7 +54,6 @@ import com.android.settings.network.CarrierConfigCache;
 import com.android.settings.network.SubscriptionsChangeListener;
 import com.android.settings.network.telephony.NetworkModeChoicesProto.EnabledNetworks;
 import com.android.settings.network.telephony.NetworkModeChoicesProto.UiOptions;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -65,7 +66,7 @@ import java.util.stream.Stream;
  */
 public class EnabledNetworkModePreferenceController extends
         BasePreferenceController implements
-        ListPreference.OnPreferenceChangeListener, LifecycleObserver,
+        ListPreference.OnPreferenceChangeListener, DefaultLifecycleObserver,
         SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
 
     private static final String LOG_TAG = "EnabledNetworkMode";
@@ -81,6 +82,43 @@ public class EnabledNetworkModePreferenceController extends
     private PhoneCallStateTelephonyCallback mTelephonyCallback;
     private FragmentManager mFragmentManager;
     private LifecycleOwner mViewLifecycleOwner;
+    private SatelliteManager mSatelliteManager;
+    private boolean mIsSatelliteSessionStarted = false;
+    private boolean mIsCurrentSubscriptionForSatellite = false;
+
+    @VisibleForTesting
+    final SelectedNbIotSatelliteSubscriptionCallback mSelectedNbIotSatelliteSubscriptionCallback =
+            new SelectedNbIotSatelliteSubscriptionCallback() {
+                @Override
+                public void onSelectedNbIotSatelliteSubscriptionChanged(int selectedSubId) {
+                    mIsCurrentSubscriptionForSatellite = selectedSubId == mSubId;
+                    updatePreference();
+                }
+            };
+
+    @VisibleForTesting
+    final SatelliteModemStateCallback mSatelliteModemStateCallback =
+            new SatelliteModemStateCallback() {
+                @Override
+                public void onSatelliteModemStateChanged(int state) {
+                    switch (state) {
+                        case SatelliteManager.SATELLITE_MODEM_STATE_OFF:
+                        case SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE:
+                        case SatelliteManager.SATELLITE_MODEM_STATE_UNKNOWN:
+                            if (mIsSatelliteSessionStarted) {
+                                mIsSatelliteSessionStarted = false;
+                                updatePreference();
+                            }
+                            break;
+                        default:
+                            if (!mIsSatelliteSessionStarted) {
+                                mIsSatelliteSessionStarted = true;
+                                updatePreference();
+                            }
+                            break;
+                    }
+                }
+            };
 
     public EnabledNetworkModePreferenceController(Context context, String key) {
         super(context, key);
@@ -88,6 +126,7 @@ public class EnabledNetworkModePreferenceController extends
         if (mTelephonyCallback == null) {
             mTelephonyCallback = new PhoneCallStateTelephonyCallback();
         }
+        mSatelliteManager = context.getSystemService(SatelliteManager.class);
     }
 
     @Override
@@ -101,8 +140,22 @@ public class EnabledNetworkModePreferenceController extends
         return mCallState == TelephonyManager.CALL_STATE_IDLE;
     }
 
-    @OnLifecycleEvent(ON_START)
-    public void onStart() {
+    @Override
+    public void onStart(@NonNull LifecycleOwner owner) {
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            if (mSatelliteManager != null) {
+                try {
+                    mSatelliteManager.registerForModemStateChanged(
+                            mContext.getMainExecutor(), mSatelliteModemStateCallback);
+                    mSatelliteManager.registerForSelectedNbIotSatelliteSubscriptionChanged(
+                            mContext.getMainExecutor(),
+                            mSelectedNbIotSatelliteSubscriptionCallback);
+                } catch (IllegalStateException e) {
+                    Log.w(LOG_TAG, "IllegalStateException : " + e);
+                }
+            }
+        }
+
         mSubscriptionsListener.start();
         if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
@@ -111,9 +164,21 @@ public class EnabledNetworkModePreferenceController extends
         mTelephonyCallback.register(mTelephonyManager, mSubId);
     }
 
-    @OnLifecycleEvent(ON_STOP)
-    public void onStop() {
+    @Override
+    public void onStop(@NonNull LifecycleOwner owner) {
         mSubscriptionsListener.stop();
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            if (mSatelliteManager != null) {
+                try {
+                    mSatelliteManager.unregisterForModemStateChanged(mSatelliteModemStateCallback);
+                    mSatelliteManager.unregisterForSelectedNbIotSatelliteSubscriptionChanged(
+                            mSelectedNbIotSatelliteSubscriptionCallback);
+                } catch (IllegalStateException e) {
+                    Log.w(LOG_TAG, "IllegalStateException : " + e);
+                }
+            }
+        }
+
         if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
         }
@@ -145,7 +210,7 @@ public class EnabledNetworkModePreferenceController extends
         listPreference.setEntryValues(mBuilder.getEntryValues());
         listPreference.setValue(Integer.toString(mBuilder.getSelectedEntryValue()));
         listPreference.setSummary(mBuilder.getSummary());
-        boolean listPreferenceEnabled = isCallStateIdle();
+        boolean listPreferenceEnabled = isPreferenceShallEnabled();
         listPreference.setEnabled(listPreferenceEnabled);
         if (!listPreferenceEnabled) {
             // If dialog is already opened when ListPreference disabled, dismiss them.
@@ -201,6 +266,14 @@ public class EnabledNetworkModePreferenceController extends
         }
     }
 
+    private boolean isPreferenceShallEnabled() {
+        Log.d(LOG_TAG, "isPreferenceShallEnabled, mIsSatelliteSessionStarted : "
+                + mIsSatelliteSessionStarted + " / mIsCurrentSubscriptionForSatellite : "
+                + mIsCurrentSubscriptionForSatellite);
+        return isCallStateIdle()
+                && !(mIsSatelliteSessionStarted && mIsCurrentSubscriptionForSatellite);
+    }
+
     private final class PreferenceEntriesBuilder {
         private CarrierConfigCache mCarrierConfigCache;
         private Context mContext;
@@ -252,7 +325,7 @@ public class EnabledNetworkModePreferenceController extends
 
                 if (flagHidePrefer3gItem) {
                     mDisplay3gOptions = carrierConfig.getBoolean(
-                        CarrierConfigManager.KEY_PREFER_3G_VISIBILITY_BOOL);
+                            CarrierConfigManager.KEY_PREFER_3G_VISIBILITY_BOOL);
                 } else {
                     mDisplay3gOptions = getResourcesForSubId().getBoolean(
                             R.bool.config_display_network_mode_3g_option);
@@ -428,14 +501,14 @@ public class EnabledNetworkModePreferenceController extends
                         addLteEntry(entryValuesInt[entryIndex]);
                         break;
                     case add5gEntry:
-                        add5gEntry(addNrToLteNetworkType(entryValuesInt[entryIndex]));
+                        add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
                         break;
                     case add5gAnd4gEntry:
-                        add5gEntry(addNrToLteNetworkType(entryValuesInt[entryIndex]));
+                        add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
                         add4gEntry(entryValuesInt[entryIndex]);
                         break;
                     case add5gAndLteEntry:
-                        add5gEntry(addNrToLteNetworkType(entryValuesInt[entryIndex]));
+                        add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
                         addLteEntry(entryValuesInt[entryIndex]);
                         break;
                     default:
@@ -445,12 +518,12 @@ public class EnabledNetworkModePreferenceController extends
         }
 
         private int getPreferredNetworkMode() {
-            int networkMode = MobileNetworkUtils.getNetworkTypeFromRaf(
+            int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
             if (!showNrList()) {
                 Log.d(LOG_TAG, "Network mode :" + networkMode + " reduce NR");
-                networkMode = reduceNrToLteNetworkType(networkMode);
+                networkMode = reduceNrToLteNetworkMode(networkMode);
             }
             Log.d(LOG_TAG, "getPreferredNetworkMode: " + networkMode);
             return networkMode;
@@ -471,16 +544,16 @@ public class EnabledNetworkModePreferenceController extends
                         enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_CDMA_CHOICES;
                     } else {
                         switch (settingsNetworkMode) {
-                            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
-                            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
-                            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
+                            case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
+                            case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
+                            case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
                                 enabledNetworkType =
                                         EnabledNetworks.ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES;
                                 break;
-                            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
-                            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
-                            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
+                            case TelephonyManager.NETWORK_MODE_GLOBAL:
+                            case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
+                            case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                            case TelephonyManager.NETWORK_MODE_LTE_ONLY:
                                 enabledNetworkType =
                                         EnabledNetworks.ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES;
                                 break;
@@ -538,46 +611,42 @@ public class EnabledNetworkModePreferenceController extends
         void setPreferenceValueAndSummary(int networkMode) {
             setSelectedEntry(networkMode);
             switch (networkMode) {
-                case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
-                    setSelectedEntry(
-                            TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+                case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA:
+                case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
                     setSummary(R.string.network_3G);
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
-                case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
-                case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
+                case TelephonyManager.NETWORK_MODE_WCDMA_ONLY:
+                case TelephonyManager.NETWORK_MODE_GSM_UMTS:
+                case TelephonyManager.NETWORK_MODE_WCDMA_PREF:
                     if (!mIsGlobalCdma) {
-                        setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_WCDMA_PREF);
                         setSummary(R.string.network_3G);
                     } else {
-                        setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
                         setSummary(R.string.network_global);
                     }
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
+                case TelephonyManager.NETWORK_MODE_GSM_ONLY:
                     if (!mIsGlobalCdma) {
-                        setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_GSM_ONLY);
                         setSummary(R.string.network_2G);
                     } else {
-                        setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
                         setSummary(R.string.network_global);
                     }
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA:
                     if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                         setSummary(
                                 R.string.preferred_network_mode_lte_gsm_umts_summary);
                         break;
                     }
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_ONLY:
+                case TelephonyManager.NETWORK_MODE_LTE_WCDMA:
                     if (!mIsGlobalCdma) {
-                        setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
                         if (is5gEntryDisplayed()) {
                             setSummary(mShow4gForLTE
                                     ? R.string.network_4G_pure : R.string.network_lte_pure);
@@ -586,55 +655,52 @@ public class EnabledNetworkModePreferenceController extends
                                     ? R.string.network_4G : R.string.network_lte);
                         }
                     } else {
-                        setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
                         setSummary(R.string.network_global);
                     }
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+                case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
                     if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                         setSummary(
                                 R.string.preferred_network_mode_lte_cdma_summary);
                     } else {
-                        setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO);
+                        setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
                         setSummary(is5gEntryDisplayed()
                                 ? R.string.network_lte_pure : R.string.network_lte);
                     }
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                    setSelectedEntry(
-                            TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
+                case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
                     setSummary(R.string.network_3G);
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
-                case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
-                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO);
+                case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
+                case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
+                case TelephonyManager.NETWORK_MODE_GLOBAL:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_CDMA_EVDO);
                     setSummary(R.string.network_3G);
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
-                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO);
+                case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO);
                     setSummary(R.string.network_1x);
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
-                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY);
+                case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY);
                     setSummary(R.string.network_3G);
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM:
+                case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
                     if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
-                        setSelectedEntry(TelephonyManagerConstants
-                                .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
+                        setSelectedEntry(
+                                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
                         setSummary(is5gEntryDisplayed()
                                 ? R.string.network_lte_pure : R.string.network_lte);
                     } else {
                         setSelectedEntry(
-                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+                                TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
                         if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                                 || mIsGlobalCdma
                                 || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
@@ -651,30 +717,28 @@ public class EnabledNetworkModePreferenceController extends
                     }
                     break;
 
-                case TelephonyManagerConstants.NETWORK_MODE_NR_ONLY:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
+                case TelephonyManager.NETWORK_MODE_NR_ONLY:
+                case TelephonyManager.NETWORK_MODE_NR_LTE:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_WCDMA:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+                    setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
+                    break;
+                case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
+                case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                     setSelectedEntry(
-                            TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+                            TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
                     setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                    setSelectedEntry(TelephonyManagerConstants
-                            .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
+                case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO);
                     setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
                     break;
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
-                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);
-                    setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
-                    break;
-                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
-                    setSelectedEntry(
-                            TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
+                case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
+                    setSelectedEntry(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
                     if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                             || mIsGlobalCdma
                             || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
@@ -691,74 +755,6 @@ public class EnabledNetworkModePreferenceController extends
             }
         }
 
-        /**
-         * Transform LTE network mode to 5G network mode.
-         *
-         * @param networkType an LTE network mode without 5G.
-         * @return the corresponding network mode with 5G.
-         */
-        private int addNrToLteNetworkType(int networkType) {
-            switch (networkType) {
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
-                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
-                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                    return TelephonyManagerConstants
-                            .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-                default:
-                    return networkType; // not LTE
-            }
-        }
-
-        /**
-         * 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());
         }
@@ -771,7 +767,7 @@ public class EnabledNetworkModePreferenceController extends
          * Add 5G option. Only show the UI when device supported 5G and allowed 5G.
          */
         private void add5gEntry(int value) {
-            boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
+            boolean isNRValue = value >= TelephonyManager.NETWORK_MODE_NR_ONLY;
             if (showNrList() && isNRValue) {
                 mEntries.add(getResourcesForSubId().getString(R.string.network_5G_recommended));
                 mEntriesValue.add(value);
@@ -791,7 +787,7 @@ public class EnabledNetworkModePreferenceController extends
                     + " allowed5GNetworkType: " + mAllowed5gNetworkType);
             mEntries.add(getResourcesForSubId().getString(R.string.network_global));
             if (showNrList()) {
-                value = addNrToLteNetworkType(value);
+                value = addNrToLteNetworkMode(value);
             }
             mEntriesValue.add(value);
         }
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
index d297e1ce262..9af6437c5cf 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
@@ -18,6 +18,7 @@ package com.android.settings.network.telephony
 
 import android.content.Context
 import android.telephony.CarrierConfigManager
+import android.telephony.RadioAccessFamily
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import androidx.lifecycle.LifecycleOwner
@@ -35,7 +36,7 @@ fun TelephonyManager.setAllowedNetworkTypes(
     viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Default) {
         setAllowedNetworkTypesForReason(
             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-            MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode),
+            RadioAccessFamily.getRafFromNetworkType(newPreferredNetworkMode).toLong(),
         )
     }
 }
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
index 220218c9473..a37a12b2dee 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
@@ -17,6 +17,7 @@
 package com.android.settings.network.telephony
 
 import android.content.Context
+import android.telephony.CarrierConfigManager
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import android.telephony.data.ApnSetting
@@ -45,7 +46,7 @@ constructor(
     private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
     private var telephonyManager: TelephonyManager =
         context.getSystemService(TelephonyManager::class.java)!!
-
+    private val carrierConfigRepository = CarrierConfigRepository(context)
     private var preferenceScreen: PreferenceScreen? = null
 
     fun init(subId: Int) {
@@ -54,7 +55,13 @@ constructor(
     }
 
     override fun getAvailabilityStatus() =
-        if (getAvailabilityStatus(telephonyManager, subId, getDefaultDataSubId)) AVAILABLE
+        if (getAvailabilityStatus(
+                telephonyManager,
+                subId,
+                getDefaultDataSubId,
+                carrierConfigRepository
+            )
+        ) AVAILABLE
         else CONDITIONALLY_UNAVAILABLE
 
     override fun displayPreference(screen: PreferenceScreen) {
@@ -92,11 +99,14 @@ constructor(
             telephonyManager: TelephonyManager,
             subId: Int,
             getDefaultDataSubId: () -> Int,
+            carrierConfigRepository: CarrierConfigRepository,
         ): Boolean {
             return SubscriptionManager.isValidSubscriptionId(subId) &&
                 !telephonyManager.isDataEnabled &&
                 telephonyManager.isApnMetered(ApnSetting.TYPE_MMS) &&
-                !isFallbackDataEnabled(telephonyManager, subId, getDefaultDataSubId())
+                !isFallbackDataEnabled(telephonyManager, subId, getDefaultDataSubId()) &&
+                carrierConfigRepository.getBoolean(
+                    subId, CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL)
         }
 
         private fun isFallbackDataEnabled(
@@ -118,11 +128,16 @@ constructor(
         ) : MobileNetworkSettingsSearchItem {
             private var telephonyManager: TelephonyManager =
                 context.getSystemService(TelephonyManager::class.java)!!
+            private val carrierConfigRepository = CarrierConfigRepository(context)
 
             @VisibleForTesting
             fun isAvailable(subId: Int): Boolean =
                 getAvailabilityStatus(
-                    telephonyManager.createForSubscriptionId(subId), subId, getDefaultDataSubId)
+                    telephonyManager.createForSubscriptionId(subId),
+                    subId,
+                    getDefaultDataSubId,
+                    carrierConfigRepository
+                )
 
             override fun getSearchResult(subId: Int): MobileNetworkSettingsSearchResult? {
                 if (!isAvailable(subId)) return null
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 91874c4f5ac..d934c99634b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -277,11 +277,18 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
         if (roamingPreferenceController != null) {
             roamingPreferenceController.init(getParentFragmentManager(), mSubId);
         }
+        final SatelliteSettingsPreferenceCategoryController
+                satelliteSettingsPreferenceCategoryController =
+                use(SatelliteSettingsPreferenceCategoryController.class);
+        if (satelliteSettingsPreferenceCategoryController != null) {
+            satelliteSettingsPreferenceCategoryController.init(mSubId);
+        }
         final SatelliteSettingPreferenceController satelliteSettingPreferenceController = use(
                 SatelliteSettingPreferenceController.class);
         if (satelliteSettingPreferenceController != null) {
             satelliteSettingPreferenceController.init(mSubId);
         }
+
         use(ApnPreferenceController.class).init(mSubId);
         use(CarrierPreferenceController.class).init(mSubId);
         use(DataUsagePreferenceController.class).init(mSubId);
@@ -327,12 +334,10 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
             convertToEsimPreferenceController.init(mSubId, mSubscriptionInfoEntity);
         }
 
-        List<AbstractSubscriptionPreferenceController> subscriptionPreferenceControllers =
-                useAll(AbstractSubscriptionPreferenceController.class);
-        for (AbstractSubscriptionPreferenceController controller :
-                subscriptionPreferenceControllers) {
-            controller.init(mSubId);
-        }
+        List<AbstractPreferenceController> subscriptionPreferenceControllers =
+                useGroup(AbstractSubscriptionPreferenceController.class);
+        subscriptionPreferenceControllers.forEach(
+                controller -> ((AbstractSubscriptionPreferenceController) controller).init(mSubId));
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 235418ebb55..2e812b4ef3a 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -18,19 +18,6 @@ package com.android.settings.network.telephony;
 
 import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
 
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.EVDO;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.LTE;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.NR;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_TD_SCDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_UNKNOWN;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.WCDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
-import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
-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.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -56,11 +43,11 @@ import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telephony.euicc.EuiccManager;
 import android.telephony.ims.ImsManager;
 import android.telephony.ims.ImsRcsManager;
 import android.telephony.ims.ProvisioningManager;
@@ -83,15 +70,12 @@ import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.CarrierConfigCache;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settings.network.telephony.wificalling.WifiCallingRepository;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.graph.SignalDrawable;
 import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class MobileNetworkUtils {
 
@@ -334,14 +318,14 @@ public class MobileNetworkUtils {
         }
 
         if (isWorldMode(context, subId)) {
-            final int settingsNetworkMode = getNetworkTypeFromRaf(
+            final int settingsNetworkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) telephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
 
-            if (settingsNetworkMode == NETWORK_MODE_LTE_GSM_WCDMA
-                    || settingsNetworkMode == NETWORK_MODE_LTE_CDMA_EVDO
-                    || settingsNetworkMode == NETWORK_MODE_NR_LTE_GSM_WCDMA
-                    || settingsNetworkMode == NETWORK_MODE_NR_LTE_CDMA_EVDO) {
+            if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA
+                    || settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO
+                    || settingsNetworkMode == TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA
+                    || settingsNetworkMode == TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO) {
                 return true;
             }
 
@@ -365,14 +349,14 @@ public class MobileNetworkUtils {
         }
         final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(subId);
-        final int networkMode = getNetworkTypeFromRaf(
+        final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) telephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
         if (isWorldMode(context, subId)) {
-            if (networkMode == NETWORK_MODE_LTE_CDMA_EVDO
-                    || networkMode == NETWORK_MODE_LTE_GSM_WCDMA
-                    || networkMode == NETWORK_MODE_NR_LTE_CDMA_EVDO
-                    || networkMode == NETWORK_MODE_NR_LTE_GSM_WCDMA) {
+            if (networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO
+                    || networkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA
+                    || networkMode == TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO
+                    || networkMode == TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA) {
                 return true;
             } else if (shouldSpeciallyUpdateGsmCdma(context, subId)) {
                 return true;
@@ -433,17 +417,17 @@ public class MobileNetworkUtils {
         }
 
         if (isWorldMode(context, subId)) {
-            final int networkMode = getNetworkTypeFromRaf(
+            final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) telephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
-            if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
+            if (networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO) {
                 return false;
             }
             if (shouldSpeciallyUpdateGsmCdma(context, subId)) {
                 return false;
             }
 
-            if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
+            if (networkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA) {
                 return true;
             }
         }
@@ -548,16 +532,16 @@ public class MobileNetworkUtils {
         }
         final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(subId);
-        final int networkMode = getNetworkTypeFromRaf(
+        final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) telephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
-        if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
-                || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
-                || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA
-                || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA
+        if (networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM
+                || networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
+                || networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA
+                || networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA
                 || networkMode
-                == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA
-                || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
+                == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA
+                || networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
             if (!isTdscdmaSupported(context, subId)) {
                 return true;
             }
@@ -610,12 +594,8 @@ public class MobileNetworkUtils {
     }
 
     public static CharSequence getCurrentCarrierNameForDisplay(Context context) {
-        final SubscriptionInfo subInfo = getSubscriptionInfo(context,
+        return getCurrentCarrierNameForDisplay(context,
                 SubscriptionManager.getDefaultSubscriptionId());
-        if (subInfo != null) {
-            return subInfo.getCarrierName();
-        }
-        return getOperatorNameFromTelephonyManager(context);
     }
 
     private static @Nullable SubscriptionInfo getSubscriptionInfo(Context context, int subId) {
@@ -651,197 +631,6 @@ public class MobileNetworkUtils {
         return activeSubIds;
     }
 
-    /**
-     * Loop through all the device logical slots to check whether the user's current country
-     * supports eSIM.
-     */
-    private static boolean isCurrentCountrySupported(Context context) {
-        final EuiccManager em = (EuiccManager) context.getSystemService(EuiccManager.class);
-        final TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(TelephonyManager.class);
-
-        Set<String> countrySet = new HashSet<>();
-        for (int i = 0; i < tm.getPhoneCount(); i++) {
-            String countryCode = tm.getNetworkCountryIso(i);
-            if (!TextUtils.isEmpty(countryCode)) {
-                countrySet.add(countryCode);
-            }
-        }
-        boolean isSupported = countrySet.stream().anyMatch(em::isSupportedCountry);
-        Log.i(TAG, "isCurrentCountrySupported countryCodes: " + countrySet
-                + " eSIMSupported: " + isSupported);
-        return isSupported;
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    public static long getRafFromNetworkType(int type) {
-        switch (type) {
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
-                return GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
-                return GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
-                return WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
-                return GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
-                return CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
-                return LTE | CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
-                return LTE | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                return LTE | CDMA | EVDO | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
-                return LTE;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
-                return LTE | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
-                return CDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
-                return EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
-                return GSM | WCDMA | CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
-                return RAF_TD_SCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
-                return RAF_TD_SCDMA | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
-                return LTE | RAF_TD_SCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
-                return RAF_TD_SCDMA | GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
-                return LTE | RAF_TD_SCDMA | GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
-                return RAF_TD_SCDMA | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
-                return LTE | RAF_TD_SCDMA | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
-                return LTE | RAF_TD_SCDMA | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                return RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                return LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_ONLY):
-                return NR;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE):
-                return NR | LTE;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO):
-                return NR | LTE | CDMA | EVDO;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA):
-                return NR | LTE | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA):
-                return NR | LTE | CDMA | EVDO | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA):
-                return NR | LTE | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA):
-                return NR | LTE | RAF_TD_SCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM):
-                return NR | LTE | RAF_TD_SCDMA | GSM;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            default:
-                return RAF_UNKNOWN;
-        }
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    public static int getNetworkTypeFromRaf(int raf) {
-        raf = getAdjustedRaf(raf);
-
-        switch (raf) {
-            case (GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF;
-            case GSM:
-                return TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY;
-            case WCDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY;
-            case (CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO;
-            case (LTE | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
-            case (LTE | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
-            case (LTE | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
-            case LTE:
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY;
-            case (LTE | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA;
-            case CDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO;
-            case EVDO:
-                return TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA;
-            case (GSM | WCDMA | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_GLOBAL;
-            case RAF_TD_SCDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY;
-            case (RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA;
-            case (LTE | RAF_TD_SCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA;
-            case (RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM;
-            case (LTE | RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
-            case (RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;
-            case (LTE | RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
-            case (LTE | RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
-            case (RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            case (LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            case (NR):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
-            case (NR | LTE):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
-            case (NR | LTE | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
-            case (NR | LTE | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
-            case (NR | LTE | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
-            case (NR | LTE | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
-            case (NR | LTE | RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            default:
-                return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
-        }
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    private static int getAdjustedRaf(int raf) {
-        raf = ((GSM & raf) > 0) ? (GSM | raf) : raf;
-        raf = ((WCDMA & raf) > 0) ? (WCDMA | raf) : raf;
-        raf = ((CDMA & raf) > 0) ? (CDMA | raf) : raf;
-        raf = ((EVDO & raf) > 0) ? (EVDO | raf) : raf;
-        raf = ((LTE & raf) > 0) ? (LTE | raf) : raf;
-        raf = ((NR & raf) > 0) ? (NR | raf) : raf;
-        return raf;
-    }
-
     /**
      * Copied from SubscriptionsPreferenceController#activeNetworkIsCellular()
      */
diff --git a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
index d95c90e5c19..219f9db6315 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
+++ b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
@@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager
 import android.telephony.NetworkRegistrationInfo
 import android.telephony.TelephonyManager
 import android.telephony.satellite.SatelliteManager
+import android.util.Log
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
@@ -92,6 +93,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) {
      * Update satellite PLMNs from the satellite framework.
      */
     private fun getSatellitePlmns(): List<String> {
+        if (satelliteManager == null) {
+            Log.d(TAG, "SatelliteManager is null")
+            return emptyList()
+        }
+
         val config = carrierConfigManager.getConfigForSubId(
             subId,
             CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL
@@ -104,7 +110,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) {
         return if (shouldFilter) {
             satelliteManager.getSatellitePlmnsForCarrier(subId)
         } else {
-            emptyList();
+            emptyList()
         }
     }
+
+    private companion object {
+        private const val TAG = "NetworkSelectRepository"
+    }
 }
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 210cd879966..44091884f13 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -21,33 +21,81 @@ import static com.android.settings.network.telephony.EnabledNetworkModePreferenc
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteModemStateCallback;
+import android.telephony.satellite.SelectedNbIotSatelliteSubscriptionCallback;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
 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.settings.network.CarrierConfigCache;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+import com.android.settings.network.telephony.mode.NetworkModes;
 
 /**
  * Preference controller for "Preferred network mode"
  */
 public class PreferredNetworkModePreferenceController extends BasePreferenceController
-        implements ListPreference.OnPreferenceChangeListener {
+        implements ListPreference.OnPreferenceChangeListener, DefaultLifecycleObserver {
     private static final String TAG = "PrefNetworkModeCtrl";
 
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     private CarrierConfigCache mCarrierConfigCache;
     private TelephonyManager mTelephonyManager;
     private boolean mIsGlobalCdma;
+    private SatelliteManager mSatelliteManager;
+    private Preference mPreference;
+    private boolean mIsSatelliteSessionStarted = false;
+    private boolean mIsCurrentSubscriptionForSatellite = false;
+
+    @VisibleForTesting
+    final SelectedNbIotSatelliteSubscriptionCallback mSelectedNbIotSatelliteSubscriptionCallback =
+            new SelectedNbIotSatelliteSubscriptionCallback() {
+                @Override
+                public void onSelectedNbIotSatelliteSubscriptionChanged(int selectedSubId) {
+                    mIsCurrentSubscriptionForSatellite = selectedSubId == mSubId;
+                    updateState(mPreference);
+                }
+            };
+
+    @VisibleForTesting
+    final SatelliteModemStateCallback mSatelliteModemStateCallback =
+            new SatelliteModemStateCallback() {
+                @Override
+                public void onSatelliteModemStateChanged(int state) {
+                    switch (state) {
+                        case SatelliteManager.SATELLITE_MODEM_STATE_OFF:
+                        case SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE:
+                        case SatelliteManager.SATELLITE_MODEM_STATE_UNKNOWN:
+                            if (mIsSatelliteSessionStarted) {
+                                mIsSatelliteSessionStarted = false;
+                                updateState(mPreference);
+                            }
+                            break;
+                        default:
+                            if (!mIsSatelliteSessionStarted) {
+                                mIsSatelliteSessionStarted = true;
+                                updateState(mPreference);
+                            }
+                            break;
+                    }
+                }
+            };
 
     public PreferredNetworkModePreferenceController(Context context, String key) {
         super(context, key);
         mCarrierConfigCache = CarrierConfigCache.getInstance(context);
+        mSatelliteManager = context.getSystemService(SatelliteManager.class);
     }
 
     @Override
@@ -57,9 +105,19 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont
                 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
     @Override
     public void updateState(Preference preference) {
+        if (preference == null) {
+            return;
+        }
         super.updateState(preference);
+        preference.setEnabled(!(mIsCurrentSubscriptionForSatellite && mIsSatelliteSessionStarted));
         final ListPreference listPreference = (ListPreference) preference;
         final int networkMode = getPreferredNetworkMode();
         listPreference.setValue(Integer.toString(networkMode));
@@ -72,11 +130,11 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont
 
         mTelephonyManager.setAllowedNetworkTypesForReason(
                 TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-                MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode));
+                RadioAccessFamily.getRafFromNetworkType(newPreferredNetworkMode));
 
-            final ListPreference listPreference = (ListPreference) preference;
-            listPreference.setSummary(getPreferredNetworkModeSummaryResId(newPreferredNetworkMode));
-            return true;
+        final ListPreference listPreference = (ListPreference) preference;
+        listPreference.setSummary(getPreferredNetworkModeSummaryResId(newPreferredNetworkMode));
+        return true;
     }
 
     public void init(int subId) {
@@ -89,57 +147,89 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont
                 && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
     }
 
+    @Override
+    public void onStart(@NonNull LifecycleOwner owner) {
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            if (mSatelliteManager != null) {
+                try {
+                    mSatelliteManager.registerForModemStateChanged(
+                            mContext.getMainExecutor(), mSatelliteModemStateCallback);
+                    mSatelliteManager.registerForSelectedNbIotSatelliteSubscriptionChanged(
+                            mContext.getMainExecutor(),
+                            mSelectedNbIotSatelliteSubscriptionCallback);
+                } catch (IllegalStateException e) {
+                    Log.w(TAG, "IllegalStateException : " + e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onStop(@NonNull LifecycleOwner owner) {
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            if (mSatelliteManager != null) {
+                try {
+                    mSatelliteManager.unregisterForModemStateChanged(mSatelliteModemStateCallback);
+                    mSatelliteManager.unregisterForSelectedNbIotSatelliteSubscriptionChanged(
+                            mSelectedNbIotSatelliteSubscriptionCallback);
+                } catch (IllegalStateException e) {
+                    Log.w(TAG, "IllegalStateException : " + e);
+                }
+            }
+        }
+    }
+
     private int getPreferredNetworkMode() {
         if (mTelephonyManager == null) {
             Log.w(TAG, "TelephonyManager is null");
-            return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
+            return NetworkModes.NETWORK_MODE_UNKNOWN;
         }
-        return MobileNetworkUtils.getNetworkTypeFromRaf(
+        return RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
     }
 
-    private int getPreferredNetworkModeSummaryResId(int NetworkMode) {
-        switch (NetworkMode) {
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+    private int getPreferredNetworkModeSummaryResId(int networkMode) {
+        switch (networkMode) {
+            case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
                 return R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
+            case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM:
                 return R.string.preferred_network_mode_tdscdma_gsm_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
+            case TelephonyManager.NETWORK_MODE_WCDMA_PREF:
                 return R.string.preferred_network_mode_wcdma_perf_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
+            case TelephonyManager.NETWORK_MODE_GSM_ONLY:
                 return R.string.preferred_network_mode_gsm_only_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
+            case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA:
                 return R.string.preferred_network_mode_tdscdma_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
+            case TelephonyManager.NETWORK_MODE_WCDMA_ONLY:
                 return R.string.preferred_network_mode_wcdma_only_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
+            case TelephonyManager.NETWORK_MODE_GSM_UMTS:
                 return R.string.preferred_network_mode_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
+            case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
                 return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
                         ? R.string.preferred_network_mode_cdma_summary
                         : R.string.preferred_network_mode_cdma_evdo_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
+            case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
                 return R.string.preferred_network_mode_cdma_only_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
+            case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
                 return R.string.preferred_network_mode_evdo_only_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
+            case TelephonyManager.NETWORK_MODE_LTE_ONLY:
                 return R.string.preferred_network_mode_lte_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
+            case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM:
                 return R.string.preferred_network_mode_lte_tdscdma_gsm_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA:
                 return R.string.preferred_network_mode_lte_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+            case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
                 return R.string.preferred_network_mode_lte_cdma_evdo_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
+            case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY:
                 return R.string.preferred_network_mode_tdscdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
                 if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
@@ -147,35 +237,35 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont
                 } else {
                     return R.string.preferred_network_mode_lte_summary;
                 }
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                 return R.string.preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
+            case TelephonyManager.NETWORK_MODE_GLOBAL:
                 return R.string.preferred_network_mode_cdma_evdo_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
+            case TelephonyManager.NETWORK_MODE_LTE_WCDMA:
                 return R.string.preferred_network_mode_lte_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_ONLY:
+            case TelephonyManager.NETWORK_MODE_NR_ONLY:
                 return R.string.preferred_network_mode_nr_only_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE:
+            case TelephonyManager.NETWORK_MODE_NR_LTE:
                 return R.string.preferred_network_mode_nr_lte_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO:
                 return R.string.preferred_network_mode_nr_lte_cdma_evdo_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
+            case TelephonyManager.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:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
                 return R.string.preferred_network_mode_global_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA:
                 return R.string.preferred_network_mode_nr_lte_tdscdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
                 return R.string.preferred_network_mode_nr_lte_tdscdma_gsm_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_tdscdma_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_tdscdma_gsm_wcdma_summary;
-            case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary;
             default:
                 return R.string.preferred_network_mode_global_summary;
diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java
index df580482ed0..a6e2f82b122 100644
--- a/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/SatelliteSetting.java
@@ -56,20 +56,26 @@ import java.util.Set;
 /** Handle Satellite Setting Preference Layout. */
 public class SatelliteSetting extends RestrictedDashboardFragment {
     private static final String TAG = "SatelliteSetting";
-    public static final String PREF_KEY_ABOUT_SATELLITE_MESSAGING = "key_about_satellite_messaging";
-    public static final String PREF_KEY_CATEGORY_YOUR_SATELLITE_PLAN =
+    private static final String PREF_KEY_ABOUT_SATELLITE_MESSAGING =
+            "key_about_satellite_messaging";
+    private static final String PREF_KEY_CATEGORY_YOUR_SATELLITE_PLAN =
             "key_category_your_satellite_plan";
-    public static final String PREF_KEY_YOUR_SATELLITE_PLAN = "key_your_satellite_plan";
-    public static final String PREF_KEY_CATEGORY_HOW_IT_WORKS = "key_category_how_it_works";
+    private static final String PREF_KEY_YOUR_SATELLITE_PLAN = "key_your_satellite_plan";
+    private static final String PREF_KEY_CATEGORY_HOW_IT_WORKS = "key_category_how_it_works";
+    private static final String PREF_KEY_YOUR_SATELLITE_DATA_PLAN = "key_your_satellite_data_plan";
+    private static final String PREF_KEY_CATEGORY_ABOUT_SATELLITE = "key_category_about_satellite";
     private static final String KEY_FOOTER_PREFERENCE = "satellite_setting_extra_info_footer_pref";
-    public static final String SUB_ID = "sub_id";
+
+    static final String SUB_ID = "sub_id";
+    static final String EXTRA_IS_SERVICE_DATA_TYPE = "is_service_data_type";
 
     private Activity mActivity;
-    private TelephonyManager mTelephonymanager;
     private CarrierConfigManager mCarrierConfigManager;
     private SatelliteManager mSatelliteManager;
     private PersistableBundle mConfigBundle;
-    private int mSubId;
+    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    private String mSimOperatorName = "";
+    private boolean mIsServiceDataType = false;
 
     public SatelliteSetting() {
         super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
@@ -111,13 +117,19 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
             return;
         }
 
-        mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
+        mIsServiceDataType = getIntent().getBooleanExtra(EXTRA_IS_SERVICE_DATA_TYPE, false);
+        mSimOperatorName = getSystemService(TelephonyManager.class).getSimOperatorName(mSubId);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        updateDynamicPreferenceViews();
+        boolean isSatelliteEligible = isSatelliteEligible();
+        updateTitle();
+        updateAboutSatelliteContent();
+        updateMobilePlan(isSatelliteEligible);
+        updateHowItWorksContent(isSatelliteEligible);
+        updateFooterContent();
     }
 
     @Override
@@ -130,31 +142,45 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
         return R.xml.satellite_setting;
     }
 
-    private void updateDynamicPreferenceViews() {
-        String operatorName = mTelephonymanager.getSimOperatorName(mSubId);
-        boolean isSatelliteEligible = isSatelliteEligible();
+    private void updateTitle() {
+        getActivity().setTitle(getSubjectString());
+    }
+
+    // About satellite content
+    private void updateAboutSatelliteContent() {
+        Preference categoryTitle = findPreference(PREF_KEY_CATEGORY_ABOUT_SATELLITE);
+        categoryTitle.setTitle(
+                getString(R.string.category_name_about_satellite_messaging,
+                        getDescriptionString()));
 
-        // About satellite messaging
         Preference preference = findPreference(PREF_KEY_ABOUT_SATELLITE_MESSAGING);
         preference.setTitle(
-                getResources().getString(R.string.title_about_satellite_setting, operatorName));
+                getResources().getString(R.string.title_about_satellite_setting, mSimOperatorName));
+    }
 
+    private void updateMobilePlan(boolean isSatelliteEligible) {
         // Your mobile plan
         PreferenceCategory prefCategory = findPreference(PREF_KEY_CATEGORY_YOUR_SATELLITE_PLAN);
         prefCategory.setTitle(getResources().getString(R.string.category_title_your_satellite_plan,
-                operatorName));
+                mSimOperatorName));
+        Preference messagingPreference = findPreference(PREF_KEY_YOUR_SATELLITE_PLAN);
 
-        preference = findPreference(PREF_KEY_YOUR_SATELLITE_PLAN);
-        Drawable icon;
+        Drawable icon = getContext().getDrawable(R.drawable.ic_check_circle_24px);
         if (isSatelliteEligible) {
             /* In case satellite is allowed by carrier's entitlement server, the page will show
                the check icon with guidance that satellite is included in user's mobile plan */
-            preference.setTitle(R.string.title_have_satellite_plan);
-            icon = getContext().getDrawable(R.drawable.ic_check_circle_24px);
+            messagingPreference.setTitle(R.string.title_have_satellite_plan);
+            if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+                Preference connectivityPreference = findPreference(
+                        PREF_KEY_YOUR_SATELLITE_DATA_PLAN);
+                connectivityPreference.setTitle(R.string.title_have_satellite_data_plan);
+                connectivityPreference.setIcon(icon);
+                connectivityPreference.setVisible(true);
+            }
         } else {
             /* Or, it will show the blocked icon with the guidance that satellite is not included
                in user's mobile plan */
-            preference.setTitle(R.string.title_no_satellite_plan);
+            messagingPreference.setTitle(R.string.title_no_satellite_plan);
             /* And, the link url provides more information via web page will be shown */
             SpannableString spannable = new SpannableString(
                     getResources().getString(R.string.summary_add_satellite_setting));
@@ -162,9 +188,9 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
                     Spanned.SPAN_INCLUSIVE_INCLUSIVE);
             spannable.setSpan(new StyleSpan(Typeface.BOLD), 0, spannable.length(),
                     Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-            preference.setSummary(spannable);
+            messagingPreference.setSummary(spannable);
             /* The link will lead users to a guide page */
-            preference.setOnPreferenceClickListener(pref -> {
+            messagingPreference.setOnPreferenceClickListener(pref -> {
                 String url = readSatelliteMoreInfoString(mSubId);
                 if (!url.isEmpty()) {
                     Uri uri = Uri.parse(url);
@@ -173,11 +199,13 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
                 }
                 return true;
             });
-            icon = getResources().getDrawable(R.drawable.ic_block_24px);
+            icon = getResources().getDrawable(R.drawable.ic_block_24px, null);
         }
         icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary));
-        preference.setIcon(icon);
+        messagingPreference.setIcon(icon);
+    }
 
+    private void updateHowItWorksContent(boolean isSatelliteEligible) {
         /* Composes "How it works" section, which guides how users can use satellite messaging, when
            satellite messaging is included in user's mobile plan, or it'll will be grey out. */
         if (!isSatelliteEligible) {
@@ -185,29 +213,32 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
             category.setEnabled(false);
             category.setShouldDisableView(true);
         }
+    }
 
+    private void updateFooterContent() {
         // More about satellite messaging
         FooterPreference footerPreference = findPreference(KEY_FOOTER_PREFERENCE);
         if (footerPreference != null) {
             footerPreference.setSummary(
                     getResources().getString(R.string.satellite_setting_summary_more_information,
-                            operatorName));
+                            getSubjectString(), mSimOperatorName));
 
             final String[] link = new String[1];
             link[0] = readSatelliteMoreInfoString(mSubId);
-            footerPreference.setLearnMoreAction(view -> {
-                if (!link[0].isEmpty()) {
-                    Intent helpIntent = HelpUtils.getHelpIntent(mActivity, link[0],
-                            this.getClass().getName());
-                    if (helpIntent != null) {
-                        mActivity.startActivityForResult(helpIntent, /*requestCode=*/ 0);
+            if (link[0] != null && !link[0].isEmpty()) {
+                footerPreference.setLearnMoreAction(view -> {
+                    if (!link[0].isEmpty()) {
+                        Intent helpIntent = HelpUtils.getHelpIntent(mActivity, link[0],
+                                this.getClass().getName());
+                        if (helpIntent != null) {
+                            mActivity.startActivityForResult(helpIntent, /*requestCode=*/ 0);
+                        }
                     }
-                }
-            });
-            footerPreference.setLearnMoreText(
-                    getResources().getString(R.string.more_about_satellite_messaging));
+                });
 
-            // TODO : b/320467418 add rounded rectangle border line to footer preference.
+                footerPreference.setLearnMoreText(
+                        getString(R.string.more_about_satellite_messaging, getDescriptionString()));
+            }
         }
     }
 
@@ -245,6 +276,32 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
         return bundle.getBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);
     }
 
+    // This is for a word which first letter is uppercase. e.g. Satellite messaging.
+    private String getSubjectString() {
+        int result;
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            result = mIsServiceDataType
+                    ? R.string.title_satellite_setting_connectivity
+                    : R.string.satellite_setting_title;
+        } else {
+            result = R.string.satellite_setting_title;
+        }
+        return getString(result);
+    }
+
+    // This is for a word without uppercase letter. e.g. satellite messaging.
+    private String getDescriptionString() {
+        int result;
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            result = mIsServiceDataType
+                    ? R.string.description_satellite_setting_connectivity
+                    : R.string.description_satellite_setting_messaging;
+        } else {
+            result = R.string.satellite_setting_title;
+        }
+        return getString(result);
+    }
+
     private static void loge(String message) {
         Log.e(TAG, message);
     }
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index 9ca0294ebe6..017d478eda7 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -16,16 +16,25 @@
 
 package com.android.settings.network.telephony;
 
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.PersistableBundle;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.telephony.satellite.NtnSignalStrength;
 import android.telephony.satellite.SatelliteManager;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -33,28 +42,34 @@ import com.android.internal.telephony.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.network.CarrierConfigCache;
-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.Arrays;
+import java.util.List;
 import java.util.Set;
 
 /**
  * Preference controller for "Satellite Setting"
  */
 public class SatelliteSettingPreferenceController extends
-        TelephonyBasePreferenceController implements LifecycleObserver, OnStart, OnStop {
-
+        TelephonyBasePreferenceController implements DefaultLifecycleObserver {
     private static final String TAG = "SatelliteSettingPreferenceController";
 
     CarrierConfigCache mCarrierConfigCache;
     SatelliteManager mSatelliteManager;
-    @Nullable private Boolean mIsSatelliteEligible = null;
+    private TelephonyManager mTelephonyManager = null;
+    @VisibleForTesting
+    final CarrierRoamingNtnModeCallback mCarrierRoamingNtnModeCallback =
+            new CarrierRoamingNtnModeCallback();
+
+    @Nullable
+    private Boolean mIsSatelliteEligible = null;
+    private boolean mIsServiceDataType = false;
 
     public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) {
         super(context, key);
         mCarrierConfigCache = CarrierConfigCache.getInstance(context);
         mSatelliteManager = context.getSystemService(SatelliteManager.class);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
     }
 
     @Override
@@ -76,22 +91,31 @@ public class SatelliteSettingPreferenceController extends
     }
 
     @Override
-    public void onStart() {
+    public void onResume(@NonNull LifecycleOwner owner) {
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(),
+                    mCarrierRoamingNtnModeCallback);
+        }
     }
 
     @Override
-    public void onStop() {
+    public void onPause(@NonNull LifecycleOwner owner) {
+        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
+            mTelephonyManager.unregisterTelephonyCallback(mCarrierRoamingNtnModeCallback);
+        }
     }
 
     @Override
     public void displayPreference(@NonNull PreferenceScreen screen) {
         super.displayPreference(screen);
+        updateState(screen.findPreference(getPreferenceKey()));
     }
 
     @Override
     public void updateState(@Nullable Preference preference) {
         super.updateState(preference);
         if (preference != null) {
+            mCarrierRoamingNtnModeCallback.mPref = preference;
             updateSummary(preference);
         }
     }
@@ -105,6 +129,7 @@ public class SatelliteSettingPreferenceController extends
             // This will setup the Home and Search affordance
             intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
             intent.putExtra(SatelliteSetting.SUB_ID, mSubId);
+            intent.putExtra(SatelliteSetting.EXTRA_IS_SERVICE_DATA_TYPE, mIsServiceDataType);
             mContext.startActivity(intent);
             return true;
         }
@@ -114,14 +139,20 @@ public class SatelliteSettingPreferenceController extends
 
     /**
      * Set subId for Satellite Settings page.
+     *
      * @param subId subscription ID.
      */
     public void init(int subId) {
         logd("init(), subId=" + subId);
         mSubId = subId;
+        mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
     }
 
     private void updateSummary(Preference preference) {
+        if (mSatelliteManager == null) {
+            logd("updateSummary - no SatelliteManager");
+            return;
+        }
         try {
             Set<Integer> restrictionReason =
                     mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
@@ -147,4 +178,46 @@ public class SatelliteSettingPreferenceController extends
     private static void loge(String message) {
         Log.e(TAG, message);
     }
+
+    @VisibleForTesting
+    class CarrierRoamingNtnModeCallback extends TelephonyCallback implements
+            TelephonyCallback.CarrierRoamingNtnModeListener {
+        Preference mPref = null;
+
+        @Override
+        public void onCarrierRoamingNtnAvailableServicesChanged(int[] availableServices) {
+            CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(
+                    availableServices);
+            List<Integer> availableServicesList = Arrays.stream(availableServices).boxed().toList();
+            boolean isSmsAvailable = availableServicesList.contains(SERVICE_TYPE_SMS);
+            boolean isDataAvailable = availableServicesList.contains(SERVICE_TYPE_DATA);
+            logd("isSmsAvailable : " + isSmsAvailable
+                    + " / isDataAvailable " + isDataAvailable);
+            if (mPref == null) {
+                logd("Satellite preference is not initialized yet");
+                return;
+            }
+            if (isDataAvailable) {
+                mIsServiceDataType = true;
+                mPref.setTitle(R.string.title_satellite_setting_connectivity);
+            } else if (isSmsAvailable) {
+                mPref.setTitle(R.string.satellite_setting_title);
+            }
+        }
+
+        @Override
+        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {
+            // Do nothing
+        }
+
+        @Override
+        public void onCarrierRoamingNtnModeChanged(boolean active) {
+            // Do nothing
+        }
+
+        @Override
+        public void onCarrierRoamingNtnSignalStrengthChanged(NtnSignalStrength ntnSignalStrength) {
+            // Do nothing
+        }
+    }
 }
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
new file mode 100644
index 00000000000..db09651b641
--- /dev/null
+++ b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;
+import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_SUPPORTED_BOOL;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.telephony.satellite.NtnSignalStrength;
+import android.telephony.satellite.SatelliteManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.flags.Flags;
+import com.android.settings.network.CarrierConfigCache;
+
+import java.util.Arrays;
+import java.util.List;
+
+/** Preference controller for Satellite functions in mobile network settings. */
+public class SatelliteSettingsPreferenceCategoryController
+        extends TelephonyBasePreferenceController implements DefaultLifecycleObserver {
+    private static final String TAG = "SatelliteSettingsPrefCategoryCon";
+
+    private CarrierConfigCache mCarrierConfigCache;
+    private SatelliteManager mSatelliteManager;
+    private PreferenceCategory mPreferenceCategory;
+    private TelephonyManager mTelephonyManager;
+
+    @VisibleForTesting
+    final CarrierRoamingNtnModeCallback mCarrierRoamingNtnModeCallback =
+            new CarrierRoamingNtnModeCallback();
+
+    public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
+        super(context, key);
+        mCarrierConfigCache = CarrierConfigCache.getInstance(context);
+        mSatelliteManager = context.getSystemService(SatelliteManager.class);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+    }
+
+    /**
+     * Set subId for Satellite Settings category .
+     *
+     * @param subId subscription ID.
+     */
+    public void init(int subId) {
+        Log.d(TAG, "init(), subId=" + subId);
+        mSubId = subId;
+        mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceCategory = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public int getAvailabilityStatus(int subId) {
+        if (!com.android.internal.telephony.flags.Flags.carrierEnabledSatelliteFlag()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        if (mSatelliteManager == null) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
+        final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
+                KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
+        boolean isSatelliteSosSupported = false;
+        if (Flags.satelliteOemSettingsUxMigration()) {
+            isSatelliteSosSupported = carrierConfig.getBoolean(
+                    KEY_SATELLITE_ESOS_SUPPORTED_BOOL);
+        }
+
+        return (isSatelliteAttachSupported || isSatelliteSosSupported)
+                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        if (Flags.satelliteOemSettingsUxMigration()) {
+            mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(),
+                    mCarrierRoamingNtnModeCallback);
+        }
+    }
+
+    @Override
+    public void onPause(@NonNull LifecycleOwner owner) {
+        if (Flags.satelliteOemSettingsUxMigration()) {
+            mTelephonyManager.unregisterTelephonyCallback(mCarrierRoamingNtnModeCallback);
+        }
+    }
+
+    @VisibleForTesting
+    class CarrierRoamingNtnModeCallback extends TelephonyCallback implements
+            TelephonyCallback.CarrierRoamingNtnModeListener {
+        @Override
+        public void onCarrierRoamingNtnAvailableServicesChanged(int[] availableServices) {
+            CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(
+                    availableServices);
+            List<Integer> availableServicesList = Arrays.stream(availableServices).boxed().toList();
+            boolean isSmsAvailable = availableServicesList.contains(SERVICE_TYPE_SMS);
+            boolean isDataAvailable = availableServicesList.contains(SERVICE_TYPE_DATA);
+            Log.i(TAG, "isSmsAvailable : " + isSmsAvailable
+                    + " / isDataAvailable " + isDataAvailable);
+            if (mPreferenceCategory == null) {
+                Log.d(TAG, "Satellite preference category is not initialized yet");
+                return;
+            }
+            if (isDataAvailable) {
+                mPreferenceCategory.setTitle(R.string.category_title_satellite_connectivity);
+            } else if (isSmsAvailable) {
+                mPreferenceCategory.setTitle(R.string.satellite_setting_title);
+            }
+        }
+
+        @Override
+        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {
+            // Do nothing
+        }
+
+        @Override
+        public void onCarrierRoamingNtnModeChanged(boolean active) {
+            // Do nothing
+        }
+
+        @Override
+        public void onCarrierRoamingNtnSignalStrengthChanged(NtnSignalStrength ntnSignalStrength) {
+            // Do nothing
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/TelephonyConstants.java b/src/com/android/settings/network/telephony/TelephonyConstants.java
index 78a177edccc..4331a4619dc 100644
--- a/src/com/android/settings/network/telephony/TelephonyConstants.java
+++ b/src/com/android/settings/network/telephony/TelephonyConstants.java
@@ -23,188 +23,6 @@ import android.telephony.TelephonyManager;
  */
 public class TelephonyConstants {
 
-    /**
-     * Copied from {@link android.telephony.TelephonyManager}
-     */
-    public static class TelephonyManagerConstants {
-
-        // Network modes are in turn copied from RILConstants
-        // with one difference: NETWORK_MODE_CDMA is named NETWORK_MODE_CDMA_EVDO
-
-        public static final int NETWORK_MODE_UNKNOWN = -1;
-
-        /**
-         * GSM, WCDMA (WCDMA preferred)
-         */
-        public static final int NETWORK_MODE_WCDMA_PREF = 0;
-
-        /**
-         * GSM only
-         */
-        public static final int NETWORK_MODE_GSM_ONLY = 1;
-
-        /**
-         * WCDMA only
-         */
-        public static final int NETWORK_MODE_WCDMA_ONLY = 2;
-
-        /**
-         * GSM, WCDMA (auto mode, according to PRL)
-         */
-        public static final int NETWORK_MODE_GSM_UMTS = 3;
-
-        /**
-         * CDMA and EvDo (auto mode, according to PRL)
-         * this is NETWORK_MODE_CDMA in RILConstants.java
-         */
-        public static final int NETWORK_MODE_CDMA_EVDO = 4;
-
-        /**
-         * CDMA only
-         */
-        public static final int NETWORK_MODE_CDMA_NO_EVDO = 5;
-
-        /**
-         * EvDo only
-         */
-        public static final int NETWORK_MODE_EVDO_NO_CDMA = 6;
-
-        /**
-         * GSM, WCDMA, CDMA, and EvDo (auto mode, according to PRL)
-         */
-        public static final int NETWORK_MODE_GLOBAL = 7;
-
-        /**
-         * LTE, CDMA and EvDo
-         */
-        public static final int NETWORK_MODE_LTE_CDMA_EVDO = 8;
-
-        /**
-         * LTE, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_GSM_WCDMA = 9;
-
-        /**
-         * LTE, CDMA, EvDo, GSM, and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10;
-
-        /**
-         * LTE only mode.
-         */
-        public static final int NETWORK_MODE_LTE_ONLY = 11;
-
-        /**
-         * LTE and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_WCDMA = 12;
-
-        /**
-         * TD-SCDMA only
-         */
-        public static final int NETWORK_MODE_TDSCDMA_ONLY = 13;
-
-        /**
-         * TD-SCDMA and WCDMA
-         */
-        public static final int NETWORK_MODE_TDSCDMA_WCDMA = 14;
-
-        /**
-         * LTE and TD-SCDMA
-         */
-        public static final int NETWORK_MODE_LTE_TDSCDMA = 15;
-
-        /**
-         * TD-SCDMA and GSM
-         */
-        public static final int NETWORK_MODE_TDSCDMA_GSM = 16;
-
-        /**
-         * TD-SCDMA, GSM and LTE
-         */
-        public static final int NETWORK_MODE_LTE_TDSCDMA_GSM = 17;
-
-        /**
-         * TD-SCDMA, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_TDSCDMA_GSM_WCDMA = 18;
-
-        /**
-         * LTE, TD-SCDMA and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_TDSCDMA_WCDMA = 19;
-
-        /**
-         * LTE, TD-SCDMA, GSM, and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20;
-
-        /**
-         * TD-SCDMA, CDMA, EVDO, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21;
-
-        /**
-         * LTE, TDCSDMA, CDMA, EVDO, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22;
-
-        /**
-         * NR 5G only mode
-         */
-        public static final int NETWORK_MODE_NR_ONLY = 23;
-
-        /**
-         * NR 5G, LTE
-         */
-        public static final int NETWORK_MODE_NR_LTE = 24;
-
-        /**
-         * NR 5G, LTE, CDMA and EvDo
-         */
-        public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO = 25;
-
-        /**
-         * NR 5G, LTE, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_GSM_WCDMA = 26;
-
-        /**
-         * NR 5G, LTE, CDMA, EvDo, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = 27;
-
-        /**
-         * NR 5G, LTE and WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_WCDMA = 28;
-
-        /**
-         * NR 5G, LTE and TDSCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_TDSCDMA = 29;
-
-        /**
-         * NR 5G, LTE, TD-SCDMA and GSM
-         */
-        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM = 30;
-
-        /**
-         * NR 5G, LTE, TD-SCDMA, WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA = 31;
-
-        /**
-         * NR 5G, LTE, TD-SCDMA, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = 32;
-
-        /**
-         * NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA
-         */
-        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;
-    }
-
     /**
      * Copied from {@link android.telephony.RadioAccessFamily}
      */
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index f9751f1bc3c..f4d2ce2b03c 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -557,15 +557,17 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
             Log.d(TAG, "Hardware does not support DSDS.");
             return false;
         }
-        boolean isActiveSim = SubscriptionUtil.getActiveSubscriptions(
+        boolean anyActiveSim = SubscriptionUtil.getActiveSubscriptions(
                 mSubscriptionManager).size() > 0;
-        if (isMultipleEnabledProfilesSupported() && isActiveSim) {
+        if (isMultipleEnabledProfilesSupported() && anyActiveSim) {
             Log.d(TAG,
                     "Device supports MEP and eSIM operation and eSIM profile is enabled."
                             + " DSDS condition satisfied.");
             return true;
         }
-        boolean isRemovableSimEnabled = isRemovableSimEnabled();
+        boolean isRemovableSimEnabled =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager).stream()
+                        .anyMatch(subInfo-> !subInfo.isEmbedded());
         if (mIsEsimOperation && isRemovableSimEnabled) {
             Log.d(TAG, "eSIM operation and removable SIM is enabled. DSDS condition satisfied.");
             return true;
@@ -583,7 +585,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
     }
 
     private boolean isRemovableSimEnabled() {
-        return new UiccSlotRepository(mTelMgr).anyRemovablePhysicalSimEnabled();
+        return new UiccSlotRepository(mTelMgr).anyRemovablePhysicalSimSlotActiveAndInserted();
     }
 
     private boolean isMultipleEnabledProfilesSupported() {
diff --git a/src/com/android/settings/network/telephony/UiccSlotRepository.kt b/src/com/android/settings/network/telephony/UiccSlotRepository.kt
index 3a83805d7a5..8a20329c925 100644
--- a/src/com/android/settings/network/telephony/UiccSlotRepository.kt
+++ b/src/com/android/settings/network/telephony/UiccSlotRepository.kt
@@ -22,17 +22,17 @@ import android.util.Log
 
 class UiccSlotRepository(private val telephonyManager: TelephonyManager?) {
 
-    /** Returns whether any removable physical sim is enabled. */
-    fun anyRemovablePhysicalSimEnabled(): Boolean {
+    /** Returns whether any removable physical sim slot is active and the sim is inserted. */
+    fun anyRemovablePhysicalSimSlotActiveAndInserted(): Boolean {
         val result =
             telephonyManager?.uiccSlotsInfo?.any { uiccSlotInfo: UiccSlotInfo? ->
-                uiccSlotInfo.isRemovablePhysicalSimEnabled()
+                uiccSlotInfo.isRemovablePhysicalSimSlotActiveAndInserted()
             } ?: false
         Log.i(TAG, "anyRemovablePhysicalSimEnabled: $result")
         return result
     }
 
-    private fun UiccSlotInfo?.isRemovablePhysicalSimEnabled(): Boolean {
+    private fun UiccSlotInfo?.isRemovablePhysicalSimSlotActiveAndInserted(): Boolean {
         return this != null &&
             isRemovable &&
             !isEuicc &&
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.kt b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.kt
index e6b3f315425..f73bcdaf81f 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.kt
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.kt
@@ -44,12 +44,12 @@ constructor(
     context: Context,
     key: String,
     private val callStateRepository: CallStateRepository = CallStateRepository(context),
+    private val videoCallingRepository: VideoCallingRepository = VideoCallingRepository(context),
 ) : TogglePreferenceController(context, key), On4gLteUpdateListener {
 
     private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
     private var preference: TwoStatePreference? = null
     private var callingPreferenceCategoryController: CallingPreferenceCategoryController? = null
-    private val repository = VideoCallingRepository(context)
 
     private var videoCallEditable = false
     private var isInCall = false
@@ -71,14 +71,18 @@ constructor(
     override fun displayPreference(screen: PreferenceScreen) {
         super.displayPreference(screen)
         preference = screen.findPreference(preferenceKey)
+        Log.d(TAG, "init ui")
+        preference?.isVisible = false
+        callingPreferenceCategoryController?.updateChildVisible(preferenceKey, false)
     }
 
     override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
-        repository.isVideoCallReadyFlow(subId).collectLatestWithLifecycle(viewLifecycleOwner) {
-            isReady ->
-            preference?.isVisible = isReady
-            callingPreferenceCategoryController?.updateChildVisible(preferenceKey, isReady)
-        }
+        videoCallingRepository.isVideoCallReadyFlow(subId)
+            .collectLatestWithLifecycle(viewLifecycleOwner) { isReady ->
+                Log.d(TAG, "isVideoCallReadyFlow: update visible")
+                preference?.isVisible = isReady
+                callingPreferenceCategoryController?.updateChildVisible(preferenceKey, isReady)
+            }
         callStateRepository.callStateFlow(subId).collectLatestWithLifecycle(viewLifecycleOwner) {
             callState ->
             isInCall = callState != TelephonyManager.CALL_STATE_IDLE
@@ -129,10 +133,10 @@ constructor(
 
         class VideoCallingSearchItem(private val context: Context) :
             MobileNetworkSettingsSearchItem {
-            private val repository = VideoCallingRepository(context)
+            private val videoCallingRepository = VideoCallingRepository(context)
 
             private fun isAvailable(subId: Int): Boolean = runBlocking {
-                repository.isVideoCallReadyFlow(subId).first()
+                videoCallingRepository.isVideoCallReadyFlow(subId).first()
             }
 
             override fun getSearchResult(subId: Int): MobileNetworkSettingsSearchResult? {
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index 4f4c35d62c9..011a8797b13 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -16,20 +16,20 @@
 
 package com.android.settings.network.telephony.cdma;
 
-import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
+import static android.telephony.TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA;
+import static android.telephony.TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA;
+
+import static com.android.settings.network.telephony.mode.NetworkModes.NETWORK_MODE_UNKNOWN;
 
 import android.content.Context;
 import android.provider.Settings;
+import android.telephony.RadioAccessFamily;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.settings.network.telephony.MobileNetworkUtils;
-
 /**
  * Preference controller for "System Select"
  */
@@ -65,7 +65,7 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
             }
 
             final int settingsNetworkMode =
-                    hasTelephonyMgr ? MobileNetworkUtils.getNetworkTypeFromRaf(
+                    hasTelephonyMgr ? RadioAccessFamily.getNetworkTypeFromRaf(
                             (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                                     TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER))
                             : NETWORK_MODE_UNKNOWN;
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
index 67a23563727..18426ab3f28 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt
@@ -25,18 +25,22 @@ import android.telephony.CarrierConfigManager
 import android.telephony.ServiceState
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
+import android.telephony.satellite.SatelliteManager
+import android.telephony.satellite.SatelliteModemStateCallback
+import android.telephony.satellite.SelectedNbIotSatelliteSubscriptionCallback
+import android.util.Log
 import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.preference.Preference
-import androidx.preference.PreferenceScreen
 import com.android.settings.R
 import com.android.settings.Settings.NetworkSelectActivity
+import com.android.settings.flags.Flags
 import com.android.settings.network.CarrierConfigCache
 import com.android.settings.network.telephony.MobileNetworkUtils
 import com.android.settings.network.telephony.allowedNetworkTypesFlow
@@ -46,8 +50,6 @@ import com.android.settingslib.spa.framework.compose.OverridableFlow
 import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
 import com.android.settingslib.spa.widget.preference.SwitchPreference
 import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
-import kotlin.properties.Delegates.notNull
-import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@@ -59,6 +61,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * Preference controller for "Auto Select Network"
@@ -73,9 +76,14 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
     private val getConfigForSubId: (subId: Int) -> PersistableBundle = { subId ->
         CarrierConfigCache.getInstance(context).getConfigForSubId(subId)
     },
-) : ComposePreferenceController(context, key) {
+) : ComposePreferenceController(context, key), DefaultLifecycleObserver {
+
+    private var isSatelliteSessionStarted = false
+    private var isSelectedSubIdForSatellite = false
 
     private lateinit var telephonyManager: TelephonyManager
+    private val satelliteManager: SatelliteManager? =
+        context.getSystemService(SatelliteManager::class.java)
     private val listeners = mutableListOf<OnNetworkSelectModeListener>()
 
     @VisibleForTesting
@@ -83,6 +91,21 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
 
     private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
 
+    val satelliteModemStateCallback = SatelliteModemStateCallback { state ->
+        isSatelliteSessionStarted = when (state) {
+            SatelliteManager.SATELLITE_MODEM_STATE_OFF,
+            SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE,
+            SatelliteManager.SATELLITE_MODEM_STATE_UNKNOWN -> false
+
+            else -> true
+        }
+    }
+
+    val selectedNbIotSatelliteSubscriptionCallback =
+        SelectedNbIotSatelliteSubscriptionCallback { selectedSubId ->
+            isSelectedSubIdForSatellite = selectedSubId == subId
+        }
+
     /**
      * Initialization based on given subscription id.
      */
@@ -90,7 +113,6 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
         this.subId = subId
         telephonyManager = mContext.getSystemService(TelephonyManager::class.java)!!
             .createForSubscriptionId(subId)
-
         return this
     }
 
@@ -117,7 +139,10 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
         SwitchPreference(object : SwitchPreferenceModel {
             override val title = stringResource(R.string.select_automatically)
             override val summary = { disallowedSummary }
-            override val changeable = { disallowedSummary.isEmpty() }
+            override val changeable = {
+                disallowedSummary.isEmpty()
+                        && !(isSatelliteSessionStarted && isSelectedSubIdForSatellite)
+            }
             override val checked = { isAuto }
             override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
                 if (newChecked) {
@@ -132,6 +157,38 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
         })
     }
 
+    override fun onStart(owner: LifecycleOwner) {
+        if (Flags.satelliteOemSettingsUxMigration()) {
+            if (satelliteManager != null) {
+                try {
+                    satelliteManager.registerForModemStateChanged(
+                        mContext.mainExecutor, satelliteModemStateCallback
+                    )
+                    satelliteManager.registerForSelectedNbIotSatelliteSubscriptionChanged(
+                        mContext.mainExecutor, selectedNbIotSatelliteSubscriptionCallback
+                    )
+                } catch (e: IllegalStateException) {
+                    Log.w(TAG, "IllegalStateException $e")
+                }
+            }
+        }
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        if (Flags.satelliteOemSettingsUxMigration()) {
+            if (satelliteManager != null) {
+                try {
+                    satelliteManager.unregisterForModemStateChanged(satelliteModemStateCallback)
+                    satelliteManager.unregisterForSelectedNbIotSatelliteSubscriptionChanged(
+                        selectedNbIotSatelliteSubscriptionCallback
+                    )
+                } catch (e: IllegalStateException) {
+                    Log.w(TAG, "IllegalStateException $e")
+                }
+            }
+        }
+    }
+
     private suspend fun getDisallowedSummary(serviceState: ServiceState): String =
         withContext(Dispatchers.Default) {
             if (!serviceState.roaming && onlyAutoSelectInHome()) {
@@ -213,6 +270,8 @@ class AutoSelectPreferenceController @JvmOverloads constructor(
     }
 
     companion object {
+        private const val TAG = "AutoSelectPreferenceController"
+
         private val MINIMUM_DIALOG_TIME = 1.seconds
     }
 }
diff --git a/src/com/android/settings/network/telephony/mode/NetworkModes.kt b/src/com/android/settings/network/telephony/mode/NetworkModes.kt
new file mode 100644
index 00000000000..11c4c41ca38
--- /dev/null
+++ b/src/com/android/settings/network/telephony/mode/NetworkModes.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.mode
+
+import android.telephony.TelephonyManager
+import com.google.common.collect.ImmutableBiMap
+
+/** Network mode related utilities. */
+object NetworkModes {
+    const val NETWORK_MODE_UNKNOWN = -1
+
+    private val LteToNrNetworkModeMap =
+        ImmutableBiMap.builder<Int, Int>()
+            .put(TelephonyManager.NETWORK_MODE_LTE_ONLY, TelephonyManager.NETWORK_MODE_NR_LTE)
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO,
+                TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_WCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM,
+                TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA,
+            )
+            .put(
+                TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA,
+                TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA,
+            )
+            .build()
+
+    /**
+     * Transforms LTE network mode to 5G network mode.
+     *
+     * @param networkMode an LTE network mode without 5G.
+     * @return the corresponding network mode with 5G.
+     */
+    @JvmStatic
+    fun addNrToLteNetworkMode(networkMode: Int): Int =
+        LteToNrNetworkModeMap.getOrElse(networkMode) { networkMode }
+
+    /**
+     * Transforms NR5G network mode to LTE network mode.
+     *
+     * @param networkMode an 5G network mode.
+     * @return the corresponding network mode without 5G.
+     */
+    @JvmStatic
+    fun reduceNrToLteNetworkMode(networkMode: Int): Int =
+        LteToNrNetworkModeMap.inverse().getOrElse(networkMode) { networkMode }
+}
diff --git a/src/com/android/settings/network/tether/BluetoothTetherSwitchPreference.kt b/src/com/android/settings/network/tether/BluetoothTetherSwitchPreference.kt
new file mode 100644
index 00000000000..a22df124262
--- /dev/null
+++ b/src/com/android/settings/network/tether/BluetoothTetherSwitchPreference.kt
@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.tether
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothPan
+import android.bluetooth.BluetoothProfile
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.net.TetheringManager
+import android.os.Handler
+import android.os.Looper
+import com.android.settings.R
+import com.android.settings.datausage.DataSaverBackend
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedDataObservable
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import java.util.concurrent.atomic.AtomicReference
+
+// LINT.IfChange
+@Suppress("DEPRECATION")
+class BluetoothTetherSwitchPreference :
+    SwitchPreference(KEY, R.string.bluetooth_tether_checkbox_text),
+    PreferenceAvailabilityProvider,
+    PreferenceLifecycleProvider {
+
+    private var tetherChangeReceiver: BroadcastReceiver? = null
+
+    override val summary: Int
+        get() = R.string.bluetooth_tethering_subtext
+
+    override val keywords: Int
+        get() = R.string.keywords_hotspot_tethering
+
+    override fun storage(context: Context): KeyValueStore = BluetoothTetherStore(context)
+
+    override fun isAvailable(context: Context): Boolean {
+        BluetoothAdapter.getDefaultAdapter() ?: return false
+        val tetheringManager = context.getSystemService(TetheringManager::class.java)
+        val bluetoothRegexs = tetheringManager?.tetherableBluetoothRegexs
+        return bluetoothRegexs?.isNotEmpty() == true
+    }
+
+    override fun isEnabled(context: Context): Boolean {
+        val adapter = BluetoothAdapter.getDefaultAdapter() ?: return false
+        val btState = adapter.state
+        /* TODO: when bluetooth is off, btstate will be `state_turning_on` -> `state_off` ->
+        `state_turning_on` -> `state_on`, causing preference enable status incorrect. */
+        when (btState) {
+            BluetoothAdapter.STATE_TURNING_OFF,
+            BluetoothAdapter.STATE_TURNING_ON -> return false
+            else -> {}
+        }
+        val dataSaverBackend = DataSaverBackend(context)
+        return !dataSaverBackend.isDataSaverEnabled
+    }
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel: Int
+        get() = SensitivityLevel.LOW_SENSITIVITY
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        val receiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(content: Context, intent: Intent) {
+                    when (intent.action) {
+                        TetheringManager.ACTION_TETHER_STATE_CHANGED,
+                        Intent.ACTION_MEDIA_SHARED,
+                        Intent.ACTION_MEDIA_UNSHARED,
+                        BluetoothAdapter.ACTION_STATE_CHANGED,
+                        BluetoothPan.ACTION_TETHERING_STATE_CHANGED ->
+                            context.notifyPreferenceChange(KEY)
+                    }
+                }
+            }
+        tetherChangeReceiver = receiver
+        var filter = IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED)
+        val intent = context.registerReceiver(receiver, filter)
+
+        filter = IntentFilter()
+        filter.addAction(Intent.ACTION_MEDIA_SHARED)
+        filter.addAction(Intent.ACTION_MEDIA_UNSHARED)
+        filter.addDataScheme("file")
+        context.registerReceiver(receiver, filter)
+
+        filter = IntentFilter()
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED)
+        filter.addAction(BluetoothPan.ACTION_TETHERING_STATE_CHANGED)
+        context.registerReceiver(receiver, filter)
+    }
+
+    override fun onDestroy(context: PreferenceLifecycleContext) {
+        tetherChangeReceiver?.let {
+            context.unregisterReceiver(it)
+            tetherChangeReceiver = null
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private class BluetoothTetherStore(private val context: Context) :
+        KeyedDataObservable<String>(), KeyValueStore {
+
+        val bluetoothPan = AtomicReference<BluetoothPan>()
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
+            // TODO: support async operation in background thread
+            val adapter = BluetoothAdapter.getDefaultAdapter() ?: return false as T
+            if (bluetoothPan.get() == null) {
+                val profileServiceListener: BluetoothProfile.ServiceListener =
+                    object : BluetoothProfile.ServiceListener {
+                        override fun onServiceConnected(profile: Int, proxy: BluetoothProfile) {
+                            if (bluetoothPan.get() == null) {
+                                bluetoothPan.set(proxy as BluetoothPan)
+                                notifyChange(KEY, 0)
+                            }
+                        }
+
+                        override fun onServiceDisconnected(profile: Int) {
+                            /* Do nothing */
+                        }
+                    }
+                // TODO: adapter.closeProfileProxy(bluetoothPan.get())
+                adapter.getProfileProxy(
+                    context.applicationContext,
+                    profileServiceListener,
+                    BluetoothProfile.PAN,
+                )
+            }
+
+            val btState = adapter.state
+            val pan = bluetoothPan.get()
+            return ((btState == BluetoothAdapter.STATE_ON ||
+                btState == BluetoothAdapter.STATE_TURNING_OFF) && pan != null && pan.isTetheringOn)
+                as T?
+        }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value == null) return
+            val connectivityManager =
+                context.getSystemService(ConnectivityManager::class.java) ?: return
+            if (value as Boolean) {
+                val handler by lazy { Handler(Looper.getMainLooper()) }
+                val startTetheringCallback = OnStartTetheringCallback()
+                fun startTethering() {
+                    connectivityManager.startTethering(
+                        ConnectivityManager.TETHERING_BLUETOOTH,
+                        true,
+                        startTetheringCallback,
+                        handler,
+                    )
+                }
+
+                val adapter = BluetoothAdapter.getDefaultAdapter()
+                if (adapter.state == BluetoothAdapter.STATE_OFF) {
+                    adapter.enable()
+                    val filter = IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)
+                    val tetherChangeReceiver =
+                        object : BroadcastReceiver() {
+                            override fun onReceive(context: Context, intent: Intent) {
+                                if (
+                                    intent.getIntExtra(
+                                        BluetoothAdapter.EXTRA_STATE,
+                                        BluetoothAdapter.ERROR,
+                                    ) == BluetoothAdapter.STATE_ON
+                                ) {
+                                    startTethering()
+                                    context.unregisterReceiver(this)
+                                }
+                            }
+                        }
+                    val intent = context.registerReceiver(tetherChangeReceiver, filter)
+                    if (intent != null) tetherChangeReceiver.onReceive(context, intent)
+                } else {
+                    startTethering()
+                }
+            } else {
+                connectivityManager.stopTethering(ConnectivityManager.TETHERING_BLUETOOTH)
+            }
+        }
+
+        private inner class OnStartTetheringCallback :
+            ConnectivityManager.OnStartTetheringCallback() {
+            override fun onTetheringStarted() {
+                notifyChange(KEY, 0)
+            }
+
+            override fun onTetheringFailed() {
+                notifyChange(KEY, 0)
+            }
+        }
+    }
+
+    companion object {
+        const val KEY = "enable_bluetooth_tethering"
+    }
+}
+// LINT.ThenChange(TetherSettings.java)
diff --git a/src/com/android/settings/network/tether/TetherScreen.kt b/src/com/android/settings/network/tether/TetherScreen.kt
new file mode 100644
index 00000000000..5865c861f58
--- /dev/null
+++ b/src/com/android/settings/network/tether/TetherScreen.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.tether
+
+import android.content.Context
+import android.net.TetheringManager
+import android.os.UserManager
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.Settings.TetherSettingsActivity
+import com.android.settings.datausage.DataSaverMainSwitchPreference
+import com.android.settings.flags.Flags
+import com.android.settings.network.TetherPreferenceController
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settings.wifi.tether.WifiHotspotSwitchPreference
+import com.android.settingslib.TetherUtil
+import com.android.settingslib.Utils
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceTitleProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class TetherScreen :
+    PreferenceScreenCreator,
+    PreferenceTitleProvider,
+    PreferenceAvailabilityProvider,
+    PreferenceRestrictionMixin {
+
+    override val key: String
+        get() = KEY
+
+    override val icon: Int
+        get() = R.drawable.ic_wifi_tethering
+
+    override val keywords: Int
+        get() = R.string.keywords_hotspot_tethering
+
+    override fun getTitle(context: Context): CharSequence? =
+        if (TetherPreferenceController.isTetherConfigDisallowed(context)) {
+            context.getText(R.string.tether_settings_title_all)
+        } else {
+            val tetheringManager = context.getSystemService(TetheringManager::class.java)!!
+            context.getText(Utils.getTetheringLabel(tetheringManager))
+        }
+
+    override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context)
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_TETHERING)
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = TetherSettings::class.java
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, TetherSettingsActivity::class.java, metadata?.key)
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            val dataSaverStore = DataSaverMainSwitchPreference.createDataStore(context)
+            +WifiHotspotSwitchPreference(context, dataSaverStore)
+        }
+
+    companion object {
+        const val KEY = "tether_settings"
+    }
+}
diff --git a/src/com/android/settings/network/tether/TetherSettings.java b/src/com/android/settings/network/tether/TetherSettings.java
index 77ef4b6ef12..57715be94db 100644
--- a/src/com/android/settings/network/tether/TetherSettings.java
+++ b/src/com/android/settings/network/tether/TetherSettings.java
@@ -48,14 +48,15 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.Preference;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.Utils;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.datausage.DataSaverBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.tether.WifiTetherPreferenceController;
@@ -71,11 +72,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+// LINT.IfChange
 /**
  * Displays preferences for Tethering.
  */
 @SearchIndexable
-public class TetherSettings extends RestrictedSettingsFragment
+public class TetherSettings extends RestrictedDashboardFragment
         implements DataSaverBackend.Listener {
 
     @VisibleForTesting
@@ -143,11 +145,20 @@ public class TetherSettings extends RestrictedSettingsFragment
         super(UserManager.DISALLOW_CONFIG_TETHERING);
     }
 
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.tether_prefs;
+    }
+
+    @SuppressWarnings("NullAway")
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        // Even when the UI is restricted, addPreferencesFromResource cannot be omitted.
-        addPreferencesFromResource(R.xml.tether_prefs);
         setIfOnlyAvailableForAdmins(true);
         if (isUiRestricted()) {
             return;
@@ -194,18 +205,23 @@ public class TetherSettings extends RestrictedSettingsFragment
             getPreferenceScreen().removePreference(mUsbTether);
         }
 
-        mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());
+        if (!isCatalystEnabled() && mWifiTetherPreferenceController != null) {
+            mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());
+        }
 
-        if (!bluetoothAvailable) {
-            getPreferenceScreen().removePreference(mBluetoothTether);
-        } else {
-            BluetoothPan pan = mBluetoothPan.get();
-            if (pan != null && pan.isTetheringOn()) {
-                mBluetoothTether.setChecked(true);
+        if (!isCatalystEnabled()) {
+            if (!bluetoothAvailable) {
+                mBluetoothTether.setVisible(false);
             } else {
-                mBluetoothTether.setChecked(false);
+                BluetoothPan pan = mBluetoothPan.get();
+                if (pan != null && pan.isTetheringOn()) {
+                    mBluetoothTether.setChecked(true);
+                } else {
+                    mBluetoothTether.setChecked(false);
+                }
             }
         }
+
         if (!ethernetAvailable) getPreferenceScreen().removePreference(mEthernetTether);
         // Set initial state based on Data Saver mode.
         onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
@@ -214,8 +230,10 @@ public class TetherSettings extends RestrictedSettingsFragment
     @VisibleForTesting
     void setupViewModel() {
         TetheringManagerModel model = new ViewModelProvider(this).get(TetheringManagerModel.class);
-        mWifiTetherPreferenceController =
-                new WifiTetherPreferenceController(getContext(), getSettingsLifecycle(), model);
+        if (!isCatalystEnabled()) {
+            mWifiTetherPreferenceController =
+                    new WifiTetherPreferenceController(getContext(), getSettingsLifecycle(), model);
+        }
         mTm = model.getTetheringManager();
         model.getTetheredInterfaces().observe(this, this::onTetheredInterfacesChanged);
     }
@@ -252,9 +270,13 @@ public class TetherSettings extends RestrictedSettingsFragment
     @Override
     public void onDataSaverChanged(boolean isDataSaving) {
         mDataSaverEnabled = isDataSaving;
-        mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled);
+        if (!isCatalystEnabled()) {
+            mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled);
+        }
         mUsbTether.setEnabled(!mDataSaverEnabled);
-        mBluetoothTether.setEnabled(!mDataSaverEnabled);
+        if (!isCatalystEnabled()) {
+            mBluetoothTether.setEnabled(!mDataSaverEnabled);
+        }
         mEthernetTether.setEnabled(!mDataSaverEnabled);
         mDataSaverFooter.setVisible(mDataSaverEnabled);
     }
@@ -504,6 +526,8 @@ public class TetherSettings extends RestrictedSettingsFragment
     }
 
     private void updateBluetoothState() {
+        if (isCatalystEnabled()) return;
+
         final int btState = getBluetoothState();
         if (DEBUG) {
             Log.d(TAG, "updateBluetoothState() btState : " + btState);
@@ -559,7 +583,7 @@ public class TetherSettings extends RestrictedSettingsFragment
     }
 
     private void startTethering(int choice) {
-        if (choice == TETHERING_BLUETOOTH) {
+        if (choice == TETHERING_BLUETOOTH && !isCatalystEnabled()) {
             // Turn on Bluetooth first.
             BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
             if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
@@ -581,7 +605,7 @@ public class TetherSettings extends RestrictedSettingsFragment
             } else {
                 mCm.stopTethering(TETHERING_USB);
             }
-        } else if (preference == mBluetoothTether) {
+        } else if (preference == mBluetoothTether && !isCatalystEnabled()) {
             if (mBluetoothTether.isChecked()) {
                 startTethering(TETHERING_BLUETOOTH);
             } else {
@@ -723,4 +747,10 @@ public class TetherSettings extends RestrictedSettingsFragment
         }
         updateBluetoothAndEthernetState();
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return TetherScreen.KEY;
+    }
 }
+// LINT.ThenChange(BluetoothTetherSwitchPreference.kt)
diff --git a/src/com/android/settings/notification/BundleGlobalPreferenceController.java b/src/com/android/settings/notification/BundleGlobalPreferenceController.java
new file mode 100644
index 00000000000..e41e7dd7c63
--- /dev/null
+++ b/src/com/android/settings/notification/BundleGlobalPreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Flags;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+
+public class BundleGlobalPreferenceController extends
+        SettingsMainSwitchPreferenceController {
+
+    NotificationBackend mBackend;
+
+    public BundleGlobalPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mBackend = new NotificationBackend();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.notificationClassificationUi() && mBackend.isNotificationBundlingSupported()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mBackend.isNotificationBundlingEnabled(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        mBackend.setNotificationBundlingEnabled(isChecked);
+        return true;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/notification/BundlePreferenceController.java b/src/com/android/settings/notification/BundlePreferenceController.java
new file mode 100644
index 00000000000..39d28ceee07
--- /dev/null
+++ b/src/com/android/settings/notification/BundlePreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Flags;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Controller for the bundled notifications settings page.
+ */
+public class BundlePreferenceController extends BasePreferenceController {
+
+    NotificationBackend mBackend;
+
+    public BundlePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mBackend = new NotificationBackend();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Flags.notificationClassificationUi() && mBackend.isNotificationBundlingSupported()
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mBackend.isNotificationBundlingEnabled(mContext)
+                ? mContext.getString(R.string.notification_bundle_on)
+                : mContext.getString(R.string.notification_bundle_off);
+    }
+}
diff --git a/src/com/android/settings/notification/BundlePreferenceFragment.java b/src/com/android/settings/notification/BundlePreferenceFragment.java
new file mode 100644
index 00000000000..14de2c26d1c
--- /dev/null
+++ b/src/com/android/settings/notification/BundlePreferenceFragment.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.settings.SettingsEnums;
+import android.content.Context;
+import android.app.Flags;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Fragment for bundled notifications.
+ */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class BundlePreferenceFragment extends DashboardFragment {
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.BUNDLED_NOTIFICATIONS;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.bundle_notifications_settings;
+    }
+    @Override
+    protected String getLogTag() {
+        return "BundlePreferenceFragment";
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.bundle_notifications_settings) {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.notificationClassificationUi();
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/BundleTypePreferenceController.java b/src/com/android/settings/notification/BundleTypePreferenceController.java
new file mode 100644
index 00000000000..b9fb2b2d78f
--- /dev/null
+++ b/src/com/android/settings/notification/BundleTypePreferenceController.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Flags;
+import android.content.Context;
+import android.service.notification.Adjustment;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+
+public class BundleTypePreferenceController extends
+        SettingsMainSwitchPreferenceController {
+
+    static final String PROMO_KEY = "promotions";
+    static final String NEWS_KEY = "news";
+    static final String SOCIAL_KEY = "social";
+    static final String RECS_KEY = "recs";
+
+    NotificationBackend mBackend;
+    int mType;
+
+    public BundleTypePreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mBackend = new NotificationBackend();
+        mType = getBundleTypeForKey();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.notificationClassificationUi() && mBackend.isNotificationBundlingSupported()
+                && mBackend.isNotificationBundlingEnabled(mContext)) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mBackend.isBundleTypeApproved(mType);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        mBackend.setBundleTypeState(mType, isChecked);
+        return true;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return NO_RES;
+    }
+
+    private @Adjustment.Types int getBundleTypeForKey() {
+        if (PROMO_KEY.equals(mPreferenceKey)) {
+            return Adjustment.TYPE_PROMOTION;
+        } else if (NEWS_KEY.equals(mPreferenceKey)) {
+            return Adjustment.TYPE_NEWS;
+        } else if (SOCIAL_KEY.equals(mPreferenceKey)) {
+            return Adjustment.TYPE_SOCIAL_MEDIA;
+        } else if (RECS_KEY.equals(mPreferenceKey)) {
+            return Adjustment.TYPE_CONTENT_RECOMMENDATION;
+        }
+        return Adjustment.TYPE_OTHER;
+    }
+}
diff --git a/src/com/android/settings/notification/CallVolumePreference.kt b/src/com/android/settings/notification/CallVolumePreference.kt
new file mode 100644
index 00000000000..031687f0128
--- /dev/null
+++ b/src/com/android/settings/notification/CallVolumePreference.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.media.AudioManager
+import android.media.AudioManager.STREAM_BLUETOOTH_SCO
+import android.media.AudioManager.STREAM_VOICE_CALL
+import android.os.UserManager
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.RangeValue
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+open class CallVolumePreference :
+    PreferenceMetadata,
+    PreferenceBinding,
+    PersistentPreference<Int>,
+    RangeValue,
+    PreferenceAvailabilityProvider,
+    PreferenceIconProvider,
+    PreferenceRestrictionMixin {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.call_volume_option_title
+
+    override fun getIcon(context: Context) = R.drawable.ic_local_phone_24_lib
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_call_volume) &&
+            !createAudioHelper(context).isSingleVolume
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
+
+    override fun storage(context: Context): KeyValueStore {
+        val helper = createAudioHelper(context)
+        return object : NoOpKeyedObservable<String>(), KeyValueStore {
+            override fun contains(key: String) = key == KEY
+
+            @Suppress("UNCHECKED_CAST")
+            override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+                helper.getStreamVolume(getAudioStream(context)) as T
+
+            override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+                helper.setStreamVolume(getAudioStream(context), value as Int)
+            }
+        }
+    }
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun getMinValue(context: Context) =
+        createAudioHelper(context).getMinVolume(getAudioStream(context))
+
+    override fun getMaxValue(context: Context) =
+        createAudioHelper(context).getMaxVolume(getAudioStream(context))
+
+    override fun createWidget(context: Context) = VolumeSeekBarPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as VolumeSeekBarPreference).setStream(getAudioStream(preference.context))
+    }
+
+    open fun createAudioHelper(context: Context) = AudioHelper(context)
+
+    @Suppress("DEPRECATION")
+    fun getAudioStream(context: Context): Int {
+        val audioManager = context.getSystemService(AudioManager::class.java)
+        return when {
+            audioManager.isBluetoothScoOn() -> STREAM_BLUETOOTH_SCO
+            else -> STREAM_VOICE_CALL
+        }
+    }
+
+    companion object {
+        const val KEY = "call_volume"
+    }
+}
+// LINT.ThenChange(CallVolumePreferenceController.java)
diff --git a/src/com/android/settings/notification/CallVolumePreferenceController.java b/src/com/android/settings/notification/CallVolumePreferenceController.java
index d5052270376..d7c5ddca90b 100644
--- a/src/com/android/settings/notification/CallVolumePreferenceController.java
+++ b/src/com/android/settings/notification/CallVolumePreferenceController.java
@@ -22,7 +22,7 @@ import android.text.TextUtils;
 
 import com.android.settings.R;
 
-
+// LINT.IfChange
 public class CallVolumePreferenceController extends VolumeSeekBarPreferenceController {
 
     private AudioManager mAudioManager;
@@ -69,3 +69,4 @@ public class CallVolumePreferenceController extends VolumeSeekBarPreferenceContr
     }
 
 }
+// LINT.ThenChange(CallVolumePreference.kt)
diff --git a/src/com/android/settings/notification/DialPadTonePreference.kt b/src/com/android/settings/notification/DialPadTonePreference.kt
new file mode 100644
index 00000000000..32bc42ea10c
--- /dev/null
+++ b/src/com/android/settings/notification/DialPadTonePreference.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.provider.Settings.System.DTMF_TONE_WHEN_DIALING
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.SwitchPreference
+
+// LINT.IfChange
+class DialPadTonePreference :
+    SwitchPreference(DTMF_TONE_WHEN_DIALING, R.string.dial_pad_tones_title),
+    PreferenceAvailabilityProvider {
+
+    override fun storage(context: Context) = SettingsSystemStore.get(context)
+
+    override fun isAvailable(context: Context) = Utils.isVoiceCapable(context)
+}
+// LINT.ThenChange(DialPadTonePreferenceController.java)
diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java
index 1b05ce21187..bfbf1204af2 100644
--- a/src/com/android/settings/notification/DialPadTonePreferenceController.java
+++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java
@@ -16,24 +16,24 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.System.DTMF_TONE_WHEN_DIALING;
+
 import static com.android.settings.notification.SettingPref.TYPE_SYSTEM;
 
 import android.content.Context;
-import android.provider.Settings.System;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+// LINT.IfChange
 public class DialPadTonePreferenceController extends SettingPrefController {
 
-    private static final String KEY_DIAL_PAD_TONES = "dial_pad_tones";
-
     public DialPadTonePreferenceController(Context context, SettingsPreferenceFragment parent,
             Lifecycle lifecycle) {
         super(context, parent, lifecycle);
-        mPreference = new SettingPref(
-            TYPE_SYSTEM, KEY_DIAL_PAD_TONES, System.DTMF_TONE_WHEN_DIALING, DEFAULT_ON) {
+        mPreference = new SettingPref(TYPE_SYSTEM, DTMF_TONE_WHEN_DIALING, DTMF_TONE_WHEN_DIALING,
+                DEFAULT_ON) {
             @Override
             public boolean isApplicable(Context context) {
                 return Utils.isVoiceCapable(context);
@@ -42,3 +42,4 @@ public class DialPadTonePreferenceController extends SettingPrefController {
     }
 
 }
+// LINT.ThenChange(DialPadTonePreference.kt)
diff --git a/src/com/android/settings/notification/LockScreenNotificationHideSeenToggleController.java b/src/com/android/settings/notification/LockScreenNotificationHideSeenToggleController.java
new file mode 100644
index 00000000000..3253937de8c
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationHideSeenToggleController.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Controls the toggle that determines whether to hide seen notifications from the lock screen.
+ * Toggle for setting: Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS
+ */
+public class LockScreenNotificationHideSeenToggleController extends TogglePreferenceController
+        implements LifecycleEventObserver {
+
+    private static final int UNSET = 0;
+    static final int ON = 1;
+    static final int OFF = 2;
+    @Nullable private Preference mPreference;
+    private final ContentResolver mContentResolver;
+
+    final ContentObserver mContentObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange, @Nullable Uri uri) {
+            if (mPreference == null) return;
+            updateState(mPreference);
+        }
+    };
+
+    public LockScreenNotificationHideSeenToggleController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        if (event == Lifecycle.Event.ON_RESUME) {
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false, mContentObserver);
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(
+                            Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+        } else if (event == Lifecycle.Event.ON_PAUSE) {
+            mContentResolver.unregisterContentObserver(mContentObserver);
+        }
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        setChecked(lockScreenShowOnlyUnseenNotifications());
+        preference.setVisible(isAvailable());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!Flags.notificationMinimalism()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        if (!lockScreenShowNotification()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return AVAILABLE;
+    }
+
+    /**
+     * @return Whether showing notifications on the lockscreen is enabled.
+     */
+    private boolean lockScreenShowNotification() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, OFF) == ON;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return lockScreenShowOnlyUnseenNotifications();
+    }
+
+    private boolean lockScreenShowOnlyUnseenNotifications() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, (isChecked ? ON : OFF));
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed because Sliceable is deprecated
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationHideSilentToggleController.java b/src/com/android/settings/notification/LockScreenNotificationHideSilentToggleController.java
new file mode 100644
index 00000000000..ad33ec35414
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationHideSilentToggleController.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Controls the toggle that determines whether to show silent notifications when screen locked.
+ * Toggle for: Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS
+ */
+public class LockScreenNotificationHideSilentToggleController extends TogglePreferenceController
+        implements LifecycleEventObserver {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    @Nullable private Preference mPreference;
+    private final ContentResolver mContentResolver;
+
+    final ContentObserver mContentObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange, @Nullable Uri uri) {
+            if (mPreference == null) return;
+            updateState(mPreference);
+        }
+    };
+
+    public LockScreenNotificationHideSilentToggleController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        if (event == Lifecycle.Event.ON_RESUME) {
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false, mContentObserver);
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(
+                            Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+        } else if (event == Lifecycle.Event.ON_PAUSE) {
+            mContentResolver.unregisterContentObserver(mContentObserver);
+        }
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        setChecked(hideSilentNotificationsWhenLocked());
+        preference.setVisible(isAvailable());
+    }
+
+    private boolean hideSilentNotificationsWhenLocked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, OFF) == OFF;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!lockScreenShowNotification()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return AVAILABLE;
+    }
+
+    /**
+     * @return Whether showing notifications on the lockscreen is enabled.
+     */
+    private boolean lockScreenShowNotification() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, OFF) == ON;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return hideSilentNotificationsWhenLocked();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, (isChecked ? OFF : ON));
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index f1857de34d0..619cdfb0404 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -37,6 +37,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.server.notification.Flags;
 import com.android.settings.R;
 import com.android.settings.RestrictedListPreference;
 import com.android.settings.Utils;
@@ -94,6 +95,13 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
+        // Hide the preference when the lock screen notification page shows
+        if (Flags.notificationLockScreenSettings()) {
+            setVisible(screen, mSettingKey, false);
+            setVisible(screen, mWorkSettingKey, false);
+            setVisible(screen, mWorkSettingCategoryKey, false);
+            return;
+        }
         mLockscreen = screen.findPreference(mSettingKey);
         if (mLockscreen == null) {
             Log.i(TAG, "Preference not found: " + mSettingKey);
diff --git a/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleController.java b/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleController.java
new file mode 100644
index 00000000000..738714dc162
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleController.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+
+import android.app.KeyguardManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import java.util.List;
+
+/**
+ * Controls the toggle that determines whether to show sensitive notifications on the lock screen
+ * when locked.
+ * Toggle for: Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS
+ */
+public class LockScreenNotificationShowSensitiveToggleController
+        extends TogglePreferenceController implements LifecycleEventObserver {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+    @VisibleForTesting
+    static final String KEY_SHOW_SENSITIVE = "lock_screen_notification_show_sensitive_toggle";
+    @VisibleForTesting
+    static final String KEY_SHOW_SENSITIVE_WORK_PROFILE =
+            "work_profile_show_sensitive_notif_toggle";
+    @Nullable private RestrictedSwitchPreference mPreference;
+    private final ContentResolver mContentResolver;
+    private UserManager mUserManager;
+    private KeyguardManager mKeyguardManager;
+    @VisibleForTesting
+    int mWorkProfileUserId;
+
+    final ContentObserver mContentObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange, @Nullable Uri uri) {
+            updateState(mPreference);
+        }
+    };
+
+    public LockScreenNotificationShowSensitiveToggleController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+
+        mUserManager = context.getSystemService(UserManager.class);
+        mKeyguardManager = context.getSystemService(KeyguardManager.class);
+        mWorkProfileUserId = UserHandle.myUserId();
+        final List<UserInfo> profiles = mUserManager.getProfiles(UserHandle.myUserId());
+
+        for (UserInfo profile: profiles) {
+            if (profile.isManagedProfile()
+                    && profile.getUserHandle().getIdentifier() != UserHandle.myUserId()) {
+                mWorkProfileUserId = profile.getUserHandle().getIdentifier();
+            }
+        }
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        if (event == Lifecycle.Event.ON_RESUME) {
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false, mContentObserver);
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(
+                            Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+        } else if (event == Lifecycle.Event.ON_PAUSE) {
+            mContentResolver.unregisterContentObserver(mContentObserver);
+        }
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        int userId = getUserId();
+
+        if (mPreference != null && userId != UserHandle.USER_NULL) {
+            mPreference.setDisabledByAdmin(getEnforcedAdmin(userId));
+        }
+    }
+
+    private RestrictedLockUtils.EnforcedAdmin getEnforcedAdmin(int userId) {
+        RestrictedLockUtils.EnforcedAdmin admin =
+                RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
+                        mContext, KEYGUARD_DISABLE_SECURE_NOTIFICATIONS, userId);
+        if (admin != null) {
+            return admin;
+        }
+        admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
+                mContext, KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS, userId);
+        return admin;
+    }
+
+    private int getUserId() {
+        return KEY_SHOW_SENSITIVE.equals(getPreferenceKey())
+                ? UserHandle.myUserId() : mWorkProfileUserId;
+    }
+
+    @Override
+    public void updateState(@Nullable Preference preference) {
+        if (preference == null) return;
+        setChecked(showSensitiveContentOnlyWhenUnlocked());
+        preference.setVisible(isAvailable());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // hide setting if no lock screen notification
+        if (!lockScreenShowNotification()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        // hide setting if no screen lock
+        if (!isLockScreenSecure()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        // For the work profile toggle
+        if (KEY_SHOW_SENSITIVE_WORK_PROFILE.equals(getPreferenceKey())) {
+            // hide work profile setting if no work profile
+            if (mWorkProfileUserId == UserHandle.myUserId()) {
+                return CONDITIONALLY_UNAVAILABLE;
+            }
+
+            // specifically the work profile setting requires the work profile to be unlocked
+            if (mKeyguardManager.isDeviceLocked(mWorkProfileUserId)) {
+                return CONDITIONALLY_UNAVAILABLE;
+            }
+        }
+
+        return AVAILABLE;
+    }
+
+    /**
+     * @return Whether showing notifications on the lockscreen is enabled.
+     */
+    private boolean lockScreenShowNotification() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, ON) != OFF;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return showSensitiveContentOnlyWhenUnlocked();
+    }
+
+    private boolean showSensitiveContentOnlyWhenUnlocked() {
+        int userId = getUserId();
+        if (!isLockScreenSecure()) return false;
+        if (getEnforcedAdmin(userId) != null) return true;
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, ON, userId) == OFF;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                (isChecked ? OFF : ON), getUserId()
+        );
+    }
+
+    private boolean isLockScreenSecure() {
+        return FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(mContext)
+                .isSecure(UserHandle.myUserId());
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationsGlobalPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationsGlobalPreferenceController.java
new file mode 100644
index 00000000000..7c7664e5da9
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationsGlobalPreferenceController.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.server.notification.Flags;
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+
+public class LockScreenNotificationsGlobalPreferenceController
+        extends SettingsMainSwitchPreferenceController
+        implements LifecycleEventObserver {
+
+    public static final int ON = 1;
+    public static final int OFF = 0;
+    private final ContentResolver mContentResolver;
+    private final ContentObserver mContentObserver;
+    @Nullable private Preference mPreference;
+
+
+    public LockScreenNotificationsGlobalPreferenceController(
+            @NonNull Context context,
+            @NonNull String preferenceKey
+    ) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange, @Nullable Uri uri) {
+                if (mPreference == null) return;
+                updateState(mPreference);
+            }
+        };
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        super.updateState(preference);
+        setChecked(lockScreenShowNotifications());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // TODO: b/367455695 - remove this when the feature flag is removed!
+        return Flags.notificationLockScreenSettings() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return lockScreenShowNotifications();
+    }
+
+    private boolean lockScreenShowNotifications() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, OFF) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, (isChecked ? ON : OFF));
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return NO_RES;
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        if (event == Lifecycle.Event.ON_RESUME) {
+            mContentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS),
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+        } else {
+            mContentResolver.unregisterContentObserver(mContentObserver);
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java
new file mode 100644
index 00000000000..61ac27485db
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+// TODO(b/367455695): remove controller when the feature flag is removed!
+
+/**
+ * Controller for lock screen notifications settings page.
+ */
+public class LockScreenNotificationsPreferencePageController extends BasePreferenceController {
+
+    public LockScreenNotificationsPreferencePageController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Flags.notificationLockScreenSettings() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java
new file mode 100644
index 00000000000..ef53e2da829
--- /dev/null
+++ b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Fragment for notifications on lock screen preference page.
+ */
+@SearchIndexable
+public class LockScreenNotificationsPreferencePageFragment extends DashboardFragment {
+
+    @Override
+    public int getMetricsCategory() {
+        //TODO(b/367455695): create a new metrics category
+        return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.lock_screen_notifications_settings;
+    }
+    @Override
+    protected String getLogTag() {
+        return "LockScreenNotificationsPreferenceFragment";
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.lock_screen_notifications_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Flags.notificationLockScreenSettings();
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java b/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java
new file mode 100644
index 00000000000..03875566621
--- /dev/null
+++ b/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM;
+import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class LockscreenNotificationMinimalismPreferenceController
+        extends TogglePreferenceController {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    public LockscreenNotificationMinimalismPreferenceController(
+            Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                LOCK_SCREEN_NOTIFICATION_MINIMALISM, isChecked ? ON : OFF);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // Hide when the notifications on lock screen settings page flag is enabled.
+        if (Flags.notificationLockScreenSettings()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        if (!Flags.notificationMinimalism()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        int lockScreenNotif = Settings.Secure.getInt(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);
+        if (lockScreenNotif == 0) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_notifications;
+    }
+}
diff --git a/src/com/android/settings/notification/MediaVolumePreference.kt b/src/com/android/settings/notification/MediaVolumePreference.kt
new file mode 100644
index 00000000000..a6d9c4111d2
--- /dev/null
+++ b/src/com/android/settings/notification/MediaVolumePreference.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.media.AudioManager.STREAM_MUSIC
+import android.os.UserManager
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.RangeValue
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+open class MediaVolumePreference :
+    PreferenceMetadata,
+    PreferenceBinding,
+    PersistentPreference<Int>,
+    RangeValue,
+    PreferenceAvailabilityProvider,
+    PreferenceIconProvider,
+    PreferenceRestrictionMixin {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.media_volume_option_title
+
+    override fun getIcon(context: Context) =
+        when {
+            VolumeHelper.isMuted(context, STREAM_MUSIC) -> R.drawable.ic_media_stream_off
+            else -> R.drawable.ic_media_stream
+        }
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_media_volume)
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
+
+    override fun storage(context: Context): KeyValueStore {
+        val helper = createAudioHelper(context)
+        return object : NoOpKeyedObservable<String>(), KeyValueStore {
+            override fun contains(key: String) = key == KEY
+
+            @Suppress("UNCHECKED_CAST")
+            override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+                helper.getStreamVolume(STREAM_MUSIC) as T
+
+            override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+                helper.setStreamVolume(STREAM_MUSIC, value as Int)
+            }
+        }
+    }
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun getMinValue(context: Context) =
+        createAudioHelper(context).getMinVolume(STREAM_MUSIC)
+
+    override fun getMaxValue(context: Context) =
+        createAudioHelper(context).getMaxVolume(STREAM_MUSIC)
+
+    override fun createWidget(context: Context) = VolumeSeekBarPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as VolumeSeekBarPreference).apply {
+            setStream(STREAM_MUSIC)
+            setMuteIcon(R.drawable.ic_media_stream_off)
+            setListener { updateContentDescription(this) }
+        }
+    }
+
+    open fun createAudioHelper(context: Context) = AudioHelper(context)
+
+    private fun updateContentDescription(preference: VolumeSeekBarPreference) {
+        when {
+            preference.isMuted ->
+                preference.updateContentDescription(
+                    preference.context.getString(
+                        R.string.volume_content_description_silent_mode,
+                        preference.title,
+                    )
+                )
+            else -> preference.updateContentDescription(preference.title)
+        }
+    }
+
+    companion object {
+        const val KEY = "media_volume"
+    }
+}
+// LINT.ThenChange(MediaVolumePreferenceController.java)
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index e70cf95e232..431806a494d 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -42,6 +42,7 @@ import com.android.settingslib.media.BluetoothMediaDevice;
 import com.android.settingslib.media.MediaDevice;
 import com.android.settingslib.media.MediaOutputConstants;
 
+// LINT.IfChange
 public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceController {
     private static final String TAG = "MediaVolumePreCtrl";
     private static final String KEY_MEDIA_VOLUME = "media_volume";
@@ -204,3 +205,4 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont
         return MediaOutputIndicatorWorker.class;
     }
 }
+// LINT.ThenChange(MediaVolumePreference.kt)
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index 3f300c0fce3..1adeb644155 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -30,13 +30,15 @@ import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.service.notification.NotificationListenerService;
 import android.text.TextUtils;
 import android.util.Slog;
 import android.view.WindowManager;
@@ -49,6 +51,8 @@ import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
 
+import java.util.List;
+
 /** @hide */
 public class NotificationAccessConfirmationActivity extends Activity
         implements DialogInterface {
@@ -113,6 +117,31 @@ public class NotificationAccessConfirmationActivity extends Activity
             return;
         }
 
+        // Check NLS service info.
+        String requiredPermission = Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE;
+        Intent NLSIntent = new Intent(NotificationListenerService.SERVICE_INTERFACE);
+        List<ResolveInfo> matchedServiceList = getPackageManager().queryIntentServicesAsUser(
+                NLSIntent, /* flags */ 0, mUserId);
+        boolean hasNLSIntentFilter = false;
+        for (ResolveInfo service : matchedServiceList) {
+            if (service.serviceInfo.packageName.equals(mComponentName.getPackageName())) {
+                if (!requiredPermission.equals(service.serviceInfo.permission)) {
+                    Slog.e(LOG_TAG, "Service " + mComponentName + " lacks permission "
+                            + requiredPermission);
+                    finish();
+                    return;
+                }
+                hasNLSIntentFilter = true;
+                break;
+            }
+        }
+        if (!hasNLSIntentFilter) {
+            Slog.e(LOG_TAG, "Service " + mComponentName + " lacks an intent-filter action "
+                    + "for android.service.notification.NotificationListenerService.");
+            finish();
+            return;
+        }
+
         AlertController.AlertParams p = new AlertController.AlertParams(this);
         p.mTitle = getString(
                 R.string.notification_listener_security_warning_title,
@@ -147,19 +176,6 @@ public class NotificationAccessConfirmationActivity extends Activity
     }
 
     private void onAllow() {
-        String requiredPermission = Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE;
-        try {
-            ServiceInfo serviceInfo = getPackageManager().getServiceInfo(mComponentName, 0);
-            if (!requiredPermission.equals(serviceInfo.permission)) {
-                Slog.e(LOG_TAG,
-                        "Service " + mComponentName + " lacks permission " + requiredPermission);
-                return;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Slog.e(LOG_TAG, "Failed to get service info for " + mComponentName, e);
-            return;
-        }
-
         mNm.setNotificationListenerAccessGranted(mComponentName, true);
 
         finish();
@@ -170,12 +186,6 @@ public class NotificationAccessConfirmationActivity extends Activity
         return AlertActivity.dispatchPopulateAccessibilityEvent(this, event);
     }
 
-    @Override
-    public void onBackPressed() {
-        // Suppress finishing the activity on back button press,
-        // consistently with the permission dialog behavior
-    }
-
     @Override
     public void cancel() {
         finish();
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index d6f810c99d1..388e0d7ffaf 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -46,6 +46,7 @@ import android.os.Build;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.service.notification.Adjustment;
 import android.service.notification.ConversationChannelWrapper;
 import android.service.notification.NotificationListenerFilter;
 import android.text.format.DateUtils;
@@ -65,9 +66,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 public class NotificationBackend {
     private static final String TAG = "NotificationBackend";
@@ -651,6 +654,59 @@ public class NotificationBackend {
         return false;
     }
 
+    public boolean isNotificationBundlingSupported() {
+        try {
+            return !sINM.getUnsupportedAdjustmentTypes().contains(Adjustment.KEY_TYPE);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+        return false;
+    }
+
+    public boolean isNotificationBundlingEnabled(Context context) {
+        try {
+            return sINM.getAllowedAssistantAdjustments(context.getPackageName())
+                    .contains(Adjustment.KEY_TYPE);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+        return false;
+    }
+
+    public void setNotificationBundlingEnabled(boolean enabled) {
+        try {
+            if (enabled) {
+                sINM.allowAssistantAdjustment(Adjustment.KEY_TYPE);
+            } else {
+                sINM.disallowAssistantAdjustment(Adjustment.KEY_TYPE);
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
+    public boolean isBundleTypeApproved(@Adjustment.Types int type) {
+        try {
+            int[] approved = sINM.getAllowedAdjustmentKeyTypes();
+            for (int approvedType : approved) {
+                if (type == approvedType) {
+                    return true;
+                }
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+        return false;
+    }
+
+    public void setBundleTypeState(@Adjustment.Types int type, boolean enabled) {
+        try {
+            sINM.setAssistantAdjustmentKeyTypeState(type, enabled);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
     @VisibleForTesting
     void setNm(INotificationManager inm) {
         sINM = inm;
diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
index 7bd78feeb3c..2944b7da459 100644
--- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
+++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
@@ -18,6 +18,7 @@ package com.android.settings.notification;
 
 import android.content.Context;
 import android.media.RingtoneManager;
+import android.media.audio.Flags;
 
 import com.android.settings.Utils;
 
@@ -36,6 +37,9 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
 
     @Override
     public boolean isAvailable() {
+        if (isRingtoneVibrationEnabled()) {
+            return false;
+        }
         return Utils.isVoiceCapable(mContext);
     }
 
@@ -43,4 +47,9 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
     public int getRingtoneType() {
         return RingtoneManager.TYPE_RINGTONE;
     }
+
+    private boolean isRingtoneVibrationEnabled() {
+        return Flags.enableRingtoneHapticsCustomization() && mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported);
+    }
 }
diff --git a/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
index e6e0947149a..49edcb8b769 100644
--- a/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
+++ b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
@@ -18,16 +18,19 @@ package com.android.settings.notification;
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.android.server.notification.Flags;
 import com.android.settings.core.BasePreferenceController;
 
-// TODO: b/291897570 - remove controller when the feature flag is removed!
+// TODO(b/330606963): remove controller when the feature flag is removed!
 /**
  * Controller for polite notifications settings page.
  */
 public class PoliteNotificationsPreferenceController extends BasePreferenceController {
 
-    public PoliteNotificationsPreferenceController(Context context, String preferenceKey) {
+    public PoliteNotificationsPreferenceController(@NonNull Context context,
+            @NonNull String preferenceKey) {
         super(context, preferenceKey);
     }
 
diff --git a/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/src/com/android/settings/notification/RedactNotificationPreferenceController.java
index 4ebf08e0a43..ea52be6d88f 100644
--- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java
@@ -33,6 +33,7 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.server.notification.Flags;
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
@@ -120,6 +121,11 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont
 
     @Override
     public int getAvailabilityStatus() {
+        // Hide when the notifications on lock screen settings page flag is enabled.
+        if (Flags.notificationLockScreenSettings()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
         // hide work profile setting if no work profile
         if (KEY_LOCKSCREEN_WORK_PROFILE_REDACT.equals(getPreferenceKey())
                 && mProfileUserId == UserHandle.myUserId()) {
diff --git a/src/com/android/settings/notification/SeparateRingVolumePreference.kt b/src/com/android/settings/notification/SeparateRingVolumePreference.kt
new file mode 100644
index 00000000000..6a22b120b53
--- /dev/null
+++ b/src/com/android/settings/notification/SeparateRingVolumePreference.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.INotificationManager
+import android.app.NotificationManager
+import android.app.NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Context.NOTIFICATION_SERVICE
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioManager
+import android.media.AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION
+import android.media.AudioManager.RINGER_MODE_NORMAL
+import android.media.AudioManager.RINGER_MODE_SILENT
+import android.media.AudioManager.RINGER_MODE_VIBRATE
+import android.media.AudioManager.STREAM_RING
+import android.os.ServiceManager
+import android.os.UserManager
+import android.os.Vibrator
+import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS
+import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_EFFECTS
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.RangeValue
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.preference.PreferenceBinding
+
+// LINT.IfChange
+open class SeparateRingVolumePreference :
+    PreferenceMetadata,
+    PreferenceBinding,
+    PersistentPreference<Int>,
+    RangeValue,
+    PreferenceAvailabilityProvider,
+    PreferenceIconProvider,
+    PreferenceLifecycleProvider,
+    PreferenceRestrictionMixin {
+
+    private var broadcastReceiver: BroadcastReceiver? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.separate_ring_volume_option_title
+
+    override fun getIcon(context: Context) = context.getIconRes()
+
+    override fun isAvailable(context: Context) = !createAudioHelper(context).isSingleVolume
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
+
+    override fun storage(context: Context): KeyValueStore {
+        val helper = createAudioHelper(context)
+        return object : NoOpKeyedObservable<String>(), KeyValueStore {
+            override fun contains(key: String) = key == KEY
+
+            @Suppress("UNCHECKED_CAST")
+            override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+                helper.getStreamVolume(STREAM_RING) as T
+
+            override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+                helper.setStreamVolume(STREAM_RING, value as Int)
+            }
+        }
+    }
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun getMinValue(context: Context) =
+        createAudioHelper(context).getMinVolume(STREAM_RING)
+
+    override fun getMaxValue(context: Context) =
+        createAudioHelper(context).getMaxVolume(STREAM_RING)
+
+    override fun createWidget(context: Context) = VolumeSeekBarPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as VolumeSeekBarPreference).apply {
+            setStream(STREAM_RING)
+            setMuteIcon(context.getIconRes())
+            updateContentDescription(context.getContentDescription())
+            setListener { updateContentDescription(context.getContentDescription()) }
+            setSuppressionText(context.getSuppressionText())
+        }
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        super.onStart(context)
+        val receiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(receiverContext: Context, intent: Intent) {
+                    context.notifyPreferenceChange(KEY)
+                }
+            }
+        context.registerReceiver(
+            receiver,
+            IntentFilter().apply {
+                addAction(ACTION_EFFECTS_SUPPRESSOR_CHANGED)
+                addAction(INTERNAL_RINGER_MODE_CHANGED_ACTION)
+            },
+        )
+        broadcastReceiver = receiver
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        super.onStop(context)
+        broadcastReceiver?.let { context.unregisterReceiver(it) }
+    }
+
+    open fun createAudioHelper(context: Context) = AudioHelper(context)
+
+    companion object {
+        const val KEY = "separate_ring_volume"
+    }
+}
+
+fun Context.getContentDescription() =
+    when (getEffectiveRingerMode()) {
+        RINGER_MODE_VIBRATE -> getString(R.string.ringer_content_description_vibrate_mode)
+        RINGER_MODE_SILENT -> getString(R.string.ringer_content_description_silent_mode)
+        else -> getString(R.string.separate_ring_volume_option_title)
+    }
+
+fun Context.getIconRes() =
+    when (getEffectiveRingerMode()) {
+        RINGER_MODE_NORMAL -> R.drawable.ic_ring_volume
+        RINGER_MODE_VIBRATE -> R.drawable.ic_volume_ringer_vibrate
+        else -> R.drawable.ic_ring_volume_off
+    }
+
+fun Context.getEffectiveRingerMode(): Int {
+    val hasVibrator = getSystemService(Vibrator::class.java)?.hasVibrator() ?: false
+    val ringerMode =
+        getSystemService(AudioManager::class.java)?.getRingerModeInternal() ?: RINGER_MODE_NORMAL
+    return when {
+        !hasVibrator && ringerMode == RINGER_MODE_VIBRATE -> RINGER_MODE_SILENT
+        else -> ringerMode
+    }
+}
+
+fun Context.getSuppressionText(): String? {
+    val suppressor = NotificationManager.from(this).getEffectsSuppressor()
+    val hints =
+        INotificationManager.Stub.asInterface(ServiceManager.getService(NOTIFICATION_SERVICE))
+            ?.hintsFromListenerNoToken ?: 0
+    return when {
+        (hints and HINT_HOST_DISABLE_CALL_EFFECTS) != 0 ||
+            (hints and HINT_HOST_DISABLE_EFFECTS) != 0 ->
+            SuppressorHelper.getSuppressionText(this, suppressor)
+        else -> null
+    }
+}
+// LINT.ThenChange(SeparateRingVolumePreferenceController.java)
diff --git a/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java b/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
index 91926e3c977..feb976fe8cd 100644
--- a/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
@@ -35,6 +35,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
 /**
  * This slider is used to represent ring volume when ring is separated from notification
  */
+// LINT.IfChange
 public class SeparateRingVolumePreferenceController extends
         RingerModeAffectedVolumePreferenceController {
 
@@ -149,3 +150,4 @@ public class SeparateRingVolumePreferenceController extends
     }
 
 }
+// LINT.ThenChange(SeparateRingVolumePreference.kt)
diff --git a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
index 1addd8220db..fc5fa740359 100644
--- a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
@@ -26,6 +26,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.server.notification.Flags;
 import com.android.settings.R;
 import com.android.settings.RestrictedListPreference;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -63,7 +64,8 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr
 
     @Override
     public boolean isAvailable() {
-        return true;
+        // When notificationLockScreenSettings is enabled, show the lock screen notif settings page
+        return !Flags.notificationLockScreenSettings();
     }
 
     @Override
diff --git a/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java b/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
index a37e29d2347..225fc7c8946 100644
--- a/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
+++ b/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
 import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;
 
 import android.content.Context;
@@ -23,6 +24,7 @@ import android.provider.Settings;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.server.notification.Flags;
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 
@@ -55,6 +57,17 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController
 
     @Override
     public int getAvailabilityStatus() {
+        // Hide when the notifications on lock screen page flag is enabled.
+        if (Flags.notificationLockScreenSettings()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        if (Flags.notificationMinimalism()) {
+            if (!isNotifOnLockScreenEnabled()) {
+                return DISABLED_DEPENDENT_SETTING;
+            }
+            // We want to show the switch when the lock screen notification minimalism flag is on.
+            return AVAILABLE;
+        }
         int setting = Settings.Secure.getInt(mContext.getContentResolver(),
                 LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);
         if (setting == UNSET) {
@@ -68,4 +81,9 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController
     public int getSliceHighlightMenuRes() {
         return R.string.menu_key_notifications;
     }
+
+    private boolean isNotifOnLockScreenEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) == 1;
+    }
 }
diff --git a/src/com/android/settings/notification/SoundScreen.kt b/src/com/android/settings/notification/SoundScreen.kt
new file mode 100644
index 00000000000..c0694b9a7ca
--- /dev/null
+++ b/src/com/android/settings/notification/SoundScreen.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.fragment.app.Fragment
+import com.android.settings.R
+import com.android.settings.Settings.SoundSettingsActivity
+import com.android.settings.flags.Flags
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.sound_settings
+
+    override val keywords: Int
+        get() = R.string.keywords_sounds
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_volume_up_filled
+            else -> R.drawable.ic_volume_up_24dp
+        }
+
+    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystSoundScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass(): Class<out Fragment>? = SoundSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +MediaVolumePreference() order -180
+            +CallVolumePreference() order -170
+            +SeparateRingVolumePreference() order -155
+            +DialPadTonePreference() order -50
+        }
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, SoundSettingsActivity::class.java, metadata?.key)
+
+    companion object {
+        const val KEY = "sound_screen"
+    }
+}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 4575708bbbd..fffb7849bbc 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -29,6 +29,8 @@ import android.os.UserHandle;
 import android.preference.SeekBarVolumizer;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
@@ -111,6 +113,14 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
         if (phoneRingTonePreference != null && openPhoneRingtonePicker) {
             onPreferenceTreeClick(phoneRingTonePreference);
         }
+        if (isCatalystEnabled()) {
+            for (String key : getPreferenceKeysInHierarchy()) {
+                Preference preference = findPreference(key);
+                if (preference instanceof VolumeSeekBarPreference) {
+                    ((VolumeSeekBarPreference) preference).setCallback(mVolumeCallback);
+                }
+            }
+        }
     }
 
     @Override
@@ -321,4 +331,9 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
             mDialogFragment.onListPreferenceUpdated(preference);
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return SoundScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/notification/VolumeHelper.kt b/src/com/android/settings/notification/VolumeHelper.kt
new file mode 100644
index 00000000000..73e490edbc5
--- /dev/null
+++ b/src/com/android/settings/notification/VolumeHelper.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.NotificationManager
+import android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS
+import android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA
+import android.content.Context
+import android.media.AudioManager
+import android.media.AudioManager.*
+import android.provider.Settings.Global.ZEN_MODE_ALARMS
+import android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
+import android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS
+import android.service.notification.ZenModeConfig
+
+class VolumeHelper {
+    companion object {
+        fun isMuted(context: Context, streamType: Int): Boolean {
+            val audioManager = context.getSystemService(AudioManager::class.java)
+            return audioManager.isStreamMute(streamType) && !isZenMuted(context, streamType)
+        }
+
+        fun isZenMuted(context: Context, streamType: Int): Boolean {
+            val notificationManager = context.getSystemService(NotificationManager::class.java)
+            val zenMode = notificationManager.getZenMode()
+            val notificationPolicy = notificationManager.getConsolidatedNotificationPolicy()
+            val isAllowAlarms =
+                (notificationPolicy.priorityCategories and PRIORITY_CATEGORY_ALARMS) != 0
+            val isAllowMedia =
+                (notificationPolicy.priorityCategories and PRIORITY_CATEGORY_MEDIA) != 0
+            val isAllowRinger =
+                !ZenModeConfig.areAllPriorityOnlyRingerSoundsMuted(notificationPolicy)
+            return isNotificationOrRingStream(streamType)
+                    && zenMode == ZEN_MODE_ALARMS || zenMode == ZEN_MODE_NO_INTERRUPTIONS
+                    || (zenMode == ZEN_MODE_IMPORTANT_INTERRUPTIONS
+                    && (!isAllowRinger && isNotificationOrRingStream(streamType)
+                    || !isAllowMedia && isMediaStream(streamType)
+                    || !isAllowAlarms && isAlarmStream(streamType)))
+        }
+
+        private fun isNotificationOrRingStream(streamType: Int) =
+            streamType == STREAM_RING || streamType == STREAM_NOTIFICATION
+
+        private fun isAlarmStream(streamType: Int) = streamType == STREAM_ALARM
+
+        private fun isMediaStream(streamType: Int) = streamType == STREAM_MUSIC
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 17deef9e6f0..73f4582034b 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -33,11 +33,13 @@ import androidx.preference.PreferenceViewHolder;
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 
 /**
  * A tri-state preference allowing a user to specify what gets to bubble.
  */
-public class BubblePreference extends Preference implements RadioGroup.OnCheckedChangeListener {
+public class BubblePreference extends Preference implements RadioGroup.OnCheckedChangeListener,
+        RestrictedPreferenceHelperProvider {
     RestrictedPreferenceHelper mHelper;
 
     private int mSelectedPreference;
@@ -64,6 +66,11 @@ public class BubblePreference extends Preference implements RadioGroup.OnChecked
         setLayoutResource(R.layout.bubble_preference);
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mHelper;
+    }
+
     public void setSelectedPreference(int preference) {
         mSelectedPreference = preference;
         notifyChanged();
diff --git a/src/com/android/settings/notification/app/BundleListPreferenceController.java b/src/com/android/settings/notification/app/BundleListPreferenceController.java
index 82e910cea8f..9ada049ef87 100644
--- a/src/com/android/settings/notification/app/BundleListPreferenceController.java
+++ b/src/com/android/settings/notification/app/BundleListPreferenceController.java
@@ -91,14 +91,27 @@ public class BundleListPreferenceController extends NotificationPreferenceContro
     public void updateState(Preference preference) {
         PreferenceCategory category = (PreferenceCategory) preference;
 
-        createOrUpdatePrefForChannel(category,
-                mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID));
-        createOrUpdatePrefForChannel(category,
-                mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID));
-        createOrUpdatePrefForChannel(category,
-                mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID));
-        createOrUpdatePrefForChannel(category,
-                mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID));
+        NotificationChannel promos = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID);
+        if (promos != null) {
+            createOrUpdatePrefForChannel(category, promos);
+        }
+        NotificationChannel recs = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID);
+        if (recs != null) {
+            createOrUpdatePrefForChannel(category, recs);
+        }
+        NotificationChannel social = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID);
+        if (social != null) {
+            createOrUpdatePrefForChannel(category, social);
+        }
+        NotificationChannel news = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID);
+        if (news != null) {
+            createOrUpdatePrefForChannel(category, news);
+        }
+
+        int preferenceCount = ((PreferenceGroup) preference).getPreferenceCount();
+        if (preferenceCount == 0) {
+            preference.setVisible(false);
+        }
     }
 
     @NonNull
@@ -167,5 +180,4 @@ public class BundleListPreferenceController extends NotificationPreferenceContro
         icon.setTintList(Utils.getColorAccent(mContext));
         return icon;
     }
-
 }
diff --git a/src/com/android/settings/notification/app/SoundPreferenceController.java b/src/com/android/settings/notification/app/SoundPreferenceController.java
index b23b4fc86cb..bc1cb24ce1b 100644
--- a/src/com/android/settings/notification/app/SoundPreferenceController.java
+++ b/src/com/android/settings/notification/app/SoundPreferenceController.java
@@ -101,6 +101,8 @@ public class SoundPreferenceController extends NotificationPreferenceController
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (KEY_SOUND.equals(preference.getKey()) && mFragment != null) {
             NotificationSoundPreference pref = (NotificationSoundPreference) preference;
+            // default to notification
+            pref.setRingtoneType(RingtoneManager.TYPE_NOTIFICATION);
             if (mChannel != null && mChannel.getAudioAttributes() != null) {
                 if (USAGE_ALARM == mChannel.getAudioAttributes().getUsage()) {
                     pref.setRingtoneType(RingtoneManager.TYPE_ALARM);
diff --git a/src/com/android/settings/notification/lockscreen/MinimalismPreferenceController.java b/src/com/android/settings/notification/lockscreen/MinimalismPreferenceController.java
new file mode 100644
index 00000000000..78be16a1d71
--- /dev/null
+++ b/src/com/android/settings/notification/lockscreen/MinimalismPreferenceController.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.lockscreen;
+
+import static android.provider.Settings.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM;
+import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
+
+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;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.IllustrationPreference;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MinimalismPreferenceController
+        extends BasePreferenceController
+        implements LifecycleEventObserver {
+
+    private static final int LS_SHOW_NOTIF_ON = 1;
+    private static final int LS_SHOW_NOTIF_OFF = 0;
+    private static final int LS_MINIMALISM_OFF = 0;
+    private static final int LS_MINIMALISM_ON = 1;
+    private static final String KEY_MINIMALISM_PREFERENCE = "ls_minimalism";
+    private static final String KEY_FULL_LIST_ILLUSTRATION = "full_list_illustration";
+    private static final String KEY_COMPACT_ILLUSTRATION = "compact_illustration";
+    private static final Uri URI_LOCK_SCREEN_NOTIFICATION_MINIMALISM =
+            Settings.Secure.getUriFor(LOCK_SCREEN_NOTIFICATION_MINIMALISM);
+    private static final Uri URI_LOCK_SCREEN_SHOW_NOTIFICATIONS =
+            Settings.Secure.getUriFor(LOCK_SCREEN_SHOW_NOTIFICATIONS);
+
+    @Nullable private LayoutPreference mPreference;
+    @Nullable private TextView mDescView;
+    private Map<Integer, LinearLayout> mButtons = new HashMap<>();
+    private Map<Integer, IllustrationPreference> mIllustrations = new HashMap<>();
+    private final Map<Integer, Integer> mDescriptionTexts = Map.ofEntries(
+            Map.entry(LS_MINIMALISM_OFF, R.string.lock_screen_notifs_full_list_desc),
+            Map.entry(LS_MINIMALISM_ON, R.string.lock_screen_notifs_compact_desc)
+    );
+
+    private final ContentResolver mContentResolver;
+
+    final ContentObserver mContentObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange, @Nullable Uri uri) {
+            refreshState(uri);
+        }
+    };
+
+    public MinimalismPreferenceController(@NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        if (event == Lifecycle.Event.ON_RESUME) {
+            mContentResolver.registerContentObserver(
+                    URI_LOCK_SCREEN_NOTIFICATION_MINIMALISM,
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+            mContentResolver.registerContentObserver(
+                    URI_LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                    /* notifyForDescendants= */ false,
+                    mContentObserver
+            );
+        } else if (event == Lifecycle.Event.ON_PAUSE) {
+            mContentResolver.unregisterContentObserver(mContentObserver);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!Flags.notificationMinimalism()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        if (!lockScreenShowNotification()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return AVAILABLE;
+    }
+
+    /**
+     * @return Whether showing notifications on the lockscreen is enabled.
+     */
+    private boolean lockScreenShowNotification() {
+        return Settings.Secure.getInt(
+                mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                LS_SHOW_NOTIF_OFF
+        ) == LS_SHOW_NOTIF_ON;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY_MINIMALISM_PREFERENCE);
+        mDescView = mPreference.findViewById(R.id.notif_ls_style_desc);
+
+        mButtons = Map.ofEntries(
+                Map.entry(LS_MINIMALISM_OFF,
+                        mPreference.findViewById(R.id.button_full)),
+                Map.entry(LS_MINIMALISM_ON,
+                        mPreference.findViewById(R.id.button_compact))
+        );
+
+        mIllustrations = Map.ofEntries(
+                Map.entry(LS_MINIMALISM_OFF,
+                        screen.findPreference(KEY_FULL_LIST_ILLUSTRATION)),
+                Map.entry(LS_MINIMALISM_ON,
+                        screen.findPreference(KEY_COMPACT_ILLUSTRATION))
+        );
+        mButtons.forEach((value, button) -> button.setOnClickListener(v ->
+                Settings.Secure.putInt(
+                        mContext.getContentResolver(),
+                        Settings.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM,
+                        value
+                )
+        ));
+
+        refreshState(URI_LOCK_SCREEN_NOTIFICATION_MINIMALISM);
+    }
+
+    private void highlightButton(int currentValue) {
+        mButtons.forEach((value, button) -> button.setSelected(currentValue == value));
+    }
+
+    private void highlightIllustration(int currentValue) {
+        mIllustrations.forEach((value, preference)
+                -> preference.setVisible(currentValue == value));
+    }
+
+    private void highlightDescription(int value) {
+        if (mDescView == null) return;
+        Integer descStringId = mDescriptionTexts.get(value);
+        if (descStringId != null) {
+            mDescView.setText(descStringId);
+        }
+    }
+
+    private int getCurrentMinimalismValue() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                LOCK_SCREEN_NOTIFICATION_MINIMALISM, LS_MINIMALISM_ON);
+    }
+
+    private void refreshState(@Nullable Uri uri) {
+        if (mPreference == null) return;
+        if (URI_LOCK_SCREEN_SHOW_NOTIFICATIONS.equals(uri) && !lockScreenShowNotification()) {
+            // hide all preferences when showing notifications on lock screen is disabled
+            mIllustrations.forEach((value, preference)
+                    -> preference.setVisible(false));
+            mPreference.setVisible(false);
+        } else {
+            mPreference.setVisible(isAvailable());
+            int currentValue = getCurrentMinimalismValue();
+            highlightButton(currentValue);
+            highlightIllustration(currentValue);
+            highlightDescription(currentValue);
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/modes/IconUtil.java b/src/com/android/settings/notification/modes/IconUtil.java
index 23817cbd5db..b589a0bef8e 100644
--- a/src/com/android/settings/notification/modes/IconUtil.java
+++ b/src/com/android/settings/notification/modes/IconUtil.java
@@ -23,6 +23,7 @@ import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
@@ -36,6 +37,7 @@ import android.util.StateSet;
 import android.view.Gravity;
 
 import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -81,21 +83,19 @@ class IconUtil {
         Drawable base = composeIcons(
                 context.getResources(),
                 background,
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
                 outerSizePx,
                 modeIcon,
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorOnSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
                 innerSizePx);
 
         Drawable selected = composeIcons(
                 context.getResources(),
                 background,
-                Utils.getColorAttr(context, com.android.internal.R.attr.materialColorPrimary),
+                context.getColor(com.android.internal.R.color.materialColorPrimary),
                 outerSizePx,
                 modeIcon,
-                Utils.getColorAttr(context, com.android.internal.R.attr.materialColorOnPrimary),
+                context.getColor(com.android.internal.R.color.materialColorOnPrimary),
                 innerSizePx);
 
         StateListDrawable result = new StateListDrawable();
@@ -114,13 +114,11 @@ class IconUtil {
     static Drawable makeIconPickerHeader(@NonNull Context context, Drawable icon) {
         return composeIconCircle(
                 context.getResources(),
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
                 context.getResources().getDimensionPixelSize(
                         R.dimen.zen_mode_icon_list_header_circle_diameter),
                 icon,
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorOnSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
                 context.getResources().getDimensionPixelSize(
                         R.dimen.zen_mode_icon_list_header_icon_size));
     }
@@ -151,13 +149,11 @@ class IconUtil {
             @DrawableRes int iconResId) {
         return composeIconCircle(
                 context.getResources(),
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
                 context.getResources().getDimensionPixelSize(
                         R.dimen.zen_mode_circular_icon_diameter),
                 checkNotNull(context.getDrawable(iconResId)),
-                Utils.getColorAttr(context,
-                        com.android.internal.R.attr.materialColorOnSecondaryContainer),
+                context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
                 context.getResources().getDimensionPixelSize(
                         R.dimen.zen_mode_circular_icon_inner_icon_size));
     }
@@ -172,12 +168,10 @@ class IconUtil {
         if (Strings.isNullOrEmpty(displayName)) {
             return composeIconCircle(
                     context.getResources(),
-                    Utils.getColorAttr(context,
-                            com.android.internal.R.attr.materialColorTertiaryContainer),
+                    context.getColor(com.android.internal.R.color.materialColorTertiaryContainer),
                     res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_diameter),
                     checkNotNull(context.getDrawable(R.drawable.ic_zen_mode_generic_contact)),
-                    Utils.getColorAttr(context,
-                            com.android.internal.R.attr.materialColorOnTertiaryContainer),
+                    context.getColor(com.android.internal.R.color.materialColorOnTertiaryContainer),
                     res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_inner_icon_size));
         }
 
@@ -187,14 +181,14 @@ class IconUtil {
         Canvas canvas = new Canvas(bitmap);
 
         Paint circlePaint = new Paint();
-        circlePaint.setColor(Utils.getColorAttrDefaultColor(context,
-                com.android.internal.R.attr.materialColorTertiaryContainer));
+        circlePaint.setColor(context.getColor(
+                com.android.internal.R.color.materialColorTertiaryContainer));
         circlePaint.setFlags(Paint.ANTI_ALIAS_FLAG);
         canvas.drawCircle(diameter / 2f, diameter / 2f, diameter / 2f, circlePaint);
 
         Paint textPaint = new Paint();
-        textPaint.setColor(Utils.getColorAttrDefaultColor(context,
-                com.android.internal.R.attr.materialColorOnTertiaryContainer));
+        textPaint.setColor(context.getColor(
+                com.android.internal.R.color.materialColorOnTertiaryContainer));
         textPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
         textPaint.setTextAlign(Paint.Align.LEFT);
         textPaint.setTextSize(res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_text_size));
@@ -210,12 +204,24 @@ class IconUtil {
         return new BitmapDrawable(context.getResources(), bitmap);
     }
 
+    private static Drawable composeIconCircle(Resources res, @ColorInt int circleColor,
+            @Px int circleDiameterPx, Drawable icon, @ColorInt int iconColor, @Px int iconSizePx) {
+        return composeIconCircle(res, ColorStateList.valueOf(circleColor), circleDiameterPx, icon,
+                ColorStateList.valueOf(iconColor), iconSizePx);
+    }
+
     private static Drawable composeIconCircle(Resources res, ColorStateList circleColor,
             @Px int circleDiameterPx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
         return composeIcons(res, new ShapeDrawable(new OvalShape()), circleColor, circleDiameterPx,
                 icon, iconColor, iconSizePx);
     }
 
+    private static Drawable composeIcons(Resources res, Drawable outer, @ColorInt int outerColor,
+            @Px int outerSizePx, Drawable icon, @ColorInt int iconColor, @Px int iconSizePx) {
+        return composeIcons(res, outer, ColorStateList.valueOf(outerColor), outerSizePx, icon,
+                ColorStateList.valueOf(iconColor), iconSizePx);
+    }
+
     private static Drawable composeIcons(Resources res, Drawable outer, ColorStateList outerColor,
             @Px int outerSizePx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
         Drawable background = mutateDrawable(res, outer);
diff --git a/src/com/android/settings/notification/modes/ZenHelperBackend.java b/src/com/android/settings/notification/modes/ZenHelperBackend.java
index bf9167873cd..5761d361e33 100644
--- a/src/com/android/settings/notification/modes/ZenHelperBackend.java
+++ b/src/com/android/settings/notification/modes/ZenHelperBackend.java
@@ -18,14 +18,20 @@ package com.android.settings.notification.modes;
 
 import android.annotation.Nullable;
 import android.app.INotificationManager;
+import android.app.ZenBypassingApp;
+import android.content.ContentProvider;
 import android.content.Context;
 import android.content.pm.ParceledListSlice;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
 import android.service.notification.ConversationChannelWrapper;
+import android.util.ArrayMap;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -37,8 +43,10 @@ import com.google.common.collect.ImmutableList;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
 /**
  * Class used for Settings-system_server interactions that are not <em>directly</em> related to
@@ -54,6 +62,7 @@ class ZenHelperBackend {
 
     private final Context mContext;
     private final INotificationManager mInm;
+    private final UserManager mUserManager;
 
     static ZenHelperBackend getInstance(Context context) {
         if (sInstance == null) {
@@ -66,25 +75,32 @@ class ZenHelperBackend {
         mContext = context;
         mInm = INotificationManager.Stub.asInterface(
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     /**
-     * Returns all of a user's packages that have at least one channel that will bypass DND
+     * Returns a mapping between a user's packages that have at least one channel that will
+     * bypass DND, and a Boolean indicating whether all of the package's channels bypass.
      */
-    List<String> getPackagesBypassingDnd(int userId,
-            boolean includeConversationChannels) {
+    Map<String, Boolean> getPackagesBypassingDnd(int userId) {
+        Map<String, Boolean> bypassingAppsMap = new HashMap<>();
         try {
-            return mInm.getPackagesBypassingDnd(userId, includeConversationChannels);
+            List<ZenBypassingApp> bypassingApps = mInm.getPackagesBypassingDnd(userId).getList();
+            for (ZenBypassingApp zba : bypassingApps) {
+                bypassingAppsMap.put(zba.getPkg(), zba.doAllChannelsBypass());
+            }
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
-            return new ArrayList<>();
         }
+        return bypassingAppsMap;
     }
 
+    /** Returns all conversation channels for profiles of the current user. */
     ImmutableList<ConversationChannelWrapper> getAllConversations() {
         return getConversations(false);
     }
 
+    /** Returns all important (priority) conversation channels for profiles of the current user. */
     ImmutableList<ConversationChannelWrapper> getImportantConversations() {
         return getConversations(true);
     }
@@ -97,7 +113,9 @@ class ZenHelperBackend {
                     onlyImportant);
             if (parceledList != null) {
                 for (ConversationChannelWrapper conversation : parceledList.getList()) {
-                    if (!conversation.getNotificationChannel().isDemoted()) {
+                    if (conversation.getShortcutInfo() != null
+                            && conversation.getNotificationChannel() != null
+                            && !conversation.getNotificationChannel().isDemoted()) {
                         list.add(conversation);
                     }
                 }
@@ -109,38 +127,52 @@ class ZenHelperBackend {
         }
     }
 
-    record Contact(long id, @Nullable String displayName, @Nullable Uri photoUri) { }
+    record Contact(UserHandle user, long contactId, @Nullable String displayName,
+                   @Nullable Uri photoUri) { }
 
+    /** Returns all contacts for profiles of the current user. */
     ImmutableList<Contact> getAllContacts() {
-        try (Cursor cursor = queryAllContactsData()) {
-            return getContactsFromCursor(cursor);
-        }
+        return getContactsForUserProfiles(this::queryAllContactsData);
     }
 
+    /** Returns all starred contacts for profiles of the current user. */
     ImmutableList<Contact> getStarredContacts() {
-        try (Cursor cursor = queryStarredContactsData()) {
-            return getContactsFromCursor(cursor);
-        }
+        return getContactsForUserProfiles(this::queryStarredContactsData);
     }
 
-    private ImmutableList<Contact> getContactsFromCursor(Cursor cursor) {
-        ImmutableList.Builder<Contact> list = new ImmutableList.Builder<>();
+    private ImmutableList<Contact> getContactsForUserProfiles(
+            Function<UserHandle, Cursor> userQuery) {
+        ImmutableList.Builder<Contact> contacts = new ImmutableList.Builder<>();
+        for (UserHandle user : mUserManager.getAllProfiles()) {
+            try (Cursor cursor = userQuery.apply(user)) {
+                loadContactsFromCursor(user, cursor, contacts);
+            }
+        }
+        return contacts.build();
+    }
+
+    private void loadContactsFromCursor(UserHandle user, Cursor cursor,
+            ImmutableList.Builder<Contact> contactsListBuilder) {
         if (cursor != null && cursor.moveToFirst()) {
             do {
                 long id = cursor.getLong(0);
                 String name = Strings.emptyToNull(cursor.getString(1));
                 String photoUriStr = cursor.getString(2);
                 Uri photoUri = !Strings.isNullOrEmpty(photoUriStr) ? Uri.parse(photoUriStr) : null;
-                list.add(new Contact(id, name, photoUri));
+                contactsListBuilder.add(new Contact(user, id, name,
+                        ContentProvider.maybeAddUserId(photoUri, user.getIdentifier())));
             } while (cursor.moveToNext());
         }
-        return list.build();
     }
 
     int getAllContactsCount() {
-        try (Cursor cursor = queryAllContactsData()) {
-            return cursor != null ? cursor.getCount() : 0;
+        int count = 0;
+        for (UserHandle user : mUserManager.getEnabledProfiles()) {
+            try (Cursor cursor = queryAllContactsData(user)) {
+                count += (cursor != null ? cursor.getCount() : 0);
+            }
         }
+        return count;
     }
 
     private static final String[] CONTACTS_PROJECTION = new String[] {
@@ -149,17 +181,17 @@ class ZenHelperBackend {
             ContactsContract.Contacts.PHOTO_THUMBNAIL_URI
     };
 
-    private Cursor queryStarredContactsData() {
+    private Cursor queryStarredContactsData(UserHandle user) {
         return mContext.getContentResolver().query(
-                ContactsContract.Contacts.CONTENT_URI,
+                ContentProvider.maybeAddUserId(Contacts.CONTENT_URI, user.getIdentifier()),
                 CONTACTS_PROJECTION,
                 /* selection= */ ContactsContract.Data.STARRED + "=1", /* selectionArgs= */ null,
                 /* sortOrder= */ ContactsContract.Contacts.DISPLAY_NAME_PRIMARY);
     }
 
-    private Cursor queryAllContactsData() {
+    private Cursor queryAllContactsData(UserHandle user) {
         return mContext.getContentResolver().query(
-                ContactsContract.Contacts.CONTENT_URI,
+                ContentProvider.maybeAddUserId(Contacts.CONTENT_URI, user.getIdentifier()),
                 CONTACTS_PROJECTION,
                 /* selection= */ null, /* selectionArgs= */ null,
                 /* sortOrder= */ ContactsContract.Contacts.DISPLAY_NAME_PRIMARY);
diff --git a/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceController.java
index 922ac5ecf5b..a01406ff836 100644
--- a/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceController.java
@@ -22,7 +22,9 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.text.BidiFormatter;
@@ -35,7 +37,6 @@ import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.app.AppChannelsBypassingDndSettings;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -44,7 +45,9 @@ import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.AppPreference;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Adds a preference to the PreferenceScreen for each notification channel that can bypass DND.
@@ -54,7 +57,8 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere
     public static final String KEY_NO_APPS = "all_none";
     private static final String KEY = "zen_mode_bypassing_apps_list";
 
-    @Nullable private final NotificationBackend mNotificationBackend;
+    @Nullable private final ZenHelperBackend mHelperBackend;
+    private final UserManager mUserManager;
 
     @Nullable @VisibleForTesting ApplicationsState mApplicationsState;
     @VisibleForTesting PreferenceCategory mPreferenceCategory;
@@ -64,18 +68,18 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere
     @Nullable private Fragment mHostFragment;
 
     public ZenModeAllBypassingAppsPreferenceController(Context context, @Nullable Application app,
-            @Nullable Fragment host, @Nullable NotificationBackend notificationBackend) {
-        this(context, app == null ? null : ApplicationsState.getInstance(app), host,
-                notificationBackend);
+            @Nullable Fragment host, @Nullable ZenHelperBackend helperBackend) {
+        this(context, app == null ? null : ApplicationsState.getInstance(app), host, helperBackend);
     }
 
     private ZenModeAllBypassingAppsPreferenceController(Context context,
             @Nullable ApplicationsState appState, @Nullable Fragment host,
-            @Nullable NotificationBackend notificationBackend) {
+            @Nullable ZenHelperBackend helperBackend) {
         super(context);
-        mNotificationBackend = notificationBackend;
         mApplicationsState = appState;
         mHostFragment = host;
+        mHelperBackend = helperBackend;
+        mUserManager = context.getSystemService(UserManager.class);
 
         if (mApplicationsState != null && host != null) {
             mAppSession = mApplicationsState.newSession(mAppSessionCallbacks, host.getLifecycle());
@@ -140,19 +144,25 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere
         }
 
         boolean doAnyAppsPassCriteria = false;
+        Map<Integer, Map<String, Boolean>> packagesBypassingDndByUser = new HashMap<>();
+        for (UserHandle userHandle : mUserManager.getUserProfiles()) {
+            packagesBypassingDndByUser.put(userHandle.getIdentifier(),
+                    mHelperBackend.getPackagesBypassingDnd(userHandle.getIdentifier()));
+        }
         for (ApplicationsState.AppEntry app : apps) {
             String pkg = app.info.packageName;
             final String key = getKey(pkg, app.info.uid);
-            final int appChannels = mNotificationBackend.getChannelCount(pkg, app.info.uid);
-            final int appChannelsBypassingDnd = mNotificationBackend
-                    .getNotificationChannelsBypassingDnd(pkg, app.info.uid).getList().size();
-            if (appChannelsBypassingDnd > 0) {
+            boolean doesAppBypassDnd = false;
+            int userId = UserHandle.getUserId(app.info.uid);
+            Map<String, Boolean> packagesBypassingDnd =
+                    packagesBypassingDndByUser.getOrDefault(userId, new HashMap<>());
+            if (packagesBypassingDnd.containsKey(pkg)) {
                 doAnyAppsPassCriteria = true;
+                doesAppBypassDnd = true;
             }
-
             Preference pref = mPreferenceCategory.findPreference(key);
             if (pref == null) {
-                if (appChannelsBypassingDnd > 0) {
+                if (doesAppBypassDnd) {
                     // does not exist but should
                     pref = new AppPreference(mPrefContext);
                     pref.setKey(key);
@@ -172,14 +182,14 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere
                     });
                     pref.setTitle(BidiFormatter.getInstance().unicodeWrap(app.label));
                     updateIcon(pref, app);
-                    if (appChannels > appChannelsBypassingDnd) {
-                        pref.setSummary(R.string.zen_mode_bypassing_apps_summary_some);
-                    } else {
+                    if (packagesBypassingDnd.get(pkg)) {
                         pref.setSummary(R.string.zen_mode_bypassing_apps_summary_all);
+                    } else {
+                        pref.setSummary(R.string.zen_mode_bypassing_apps_summary_some);
                     }
                     mPreferenceCategory.addPreference(pref);
                 }
-            } else if (appChannelsBypassingDnd == 0) {
+            } else if (!doesAppBypassDnd) {
                 // exists but shouldn't anymore
                 mPreferenceCategory.removePreference(pref);
             }
diff --git a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
index c133f515f30..e0e36f6495f 100644
--- a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
@@ -161,8 +161,7 @@ class ZenModeAppsLinkPreferenceController extends AbstractZenModePreferenceContr
         Multimap<Integer, String> packagesBypassingDnd = HashMultimap.create();
         for (UserHandle userHandle : mUserManager.getUserProfiles()) {
             packagesBypassingDnd.putAll(userHandle.getIdentifier(),
-                    mHelperBackend.getPackagesBypassingDnd(userHandle.getIdentifier(),
-                            /* includeConversationChannels= */ false));
+                    mHelperBackend.getPackagesBypassingDnd(userHandle.getIdentifier()).keySet());
         }
 
         return ImmutableList.copyOf(
diff --git a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
index c44661a9d09..b1f5d75b480 100644
--- a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
@@ -29,6 +29,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
 
+import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -58,6 +59,8 @@ public class ZenModeAppsPreferenceController extends
                 pref.setExtraWidgetOnClickListener(p -> {
                     launchPrioritySettings();
                 });
+                pref.setExtraWidgetContentDescription(
+                        mContext.getString(R.string.zen_mode_apps_priority_apps_settings));
             }
         }
         super.displayPreference(screen);
diff --git a/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java
index 097b40db3d3..4275f221332 100644
--- a/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java
@@ -40,6 +40,11 @@ class ZenModeBlurbPreferenceController extends AbstractZenModePreferenceControll
         super(context, key);
     }
 
+    @Override
+    public boolean isAvailable(@NonNull ZenMode zenMode) {
+        return !zenMode.isCustomManual();
+    }
+
     @Override
     void updateState(Preference preference, @NonNull ZenMode zenMode) {
         preference.setTitle(getModeBlurb(zenMode));
diff --git a/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java
index de1adc7cb0a..cd358bf00f1 100644
--- a/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java
@@ -17,7 +17,9 @@
 package com.android.settings.notification.modes;
 
 import android.content.Context;
+import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -32,6 +34,7 @@ class ZenModeEditDonePreferenceController extends AbstractZenModePreferenceContr
 
     private final Runnable mConfirmSave;
     @Nullable private Button mButton;
+    private boolean mHasValidName;
 
     ZenModeEditDonePreferenceController(@NonNull Context context, @NonNull String key,
             Runnable confirmSave) {
@@ -46,15 +49,22 @@ class ZenModeEditDonePreferenceController extends AbstractZenModePreferenceContr
         if (pref != null) {
             mButton = pref.findViewById(R.id.done);
             if (mButton != null) {
-                mButton.setOnClickListener(v -> mConfirmSave.run());
+                mButton.setOnClickListener(this::onButtonClick);
             }
         }
     }
 
+    private void onButtonClick(View view) {
+        if (mHasValidName) {
+            mConfirmSave.run();
+        } else {
+            Toast.makeText(mContext, R.string.zen_mode_edit_name_empty_error, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    }
+
     @Override
     void updateState(Preference preference, @NonNull ZenMode zenMode) {
-        if (mButton != null) {
-            mButton.setEnabled(!zenMode.getName().isBlank());
-        }
+        mHasValidName = !zenMode.getName().isBlank();
     }
 }
diff --git a/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java
index 78cbfe0488b..6b490d6113d 100644
--- a/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java
@@ -17,9 +17,11 @@
 package com.android.settings.notification.modes;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
 
 import android.content.Context;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.widget.EditText;
 
@@ -28,14 +30,18 @@ import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.widget.LayoutPreference;
 
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.util.function.Consumer;
 
 class ZenModeEditNamePreferenceController extends AbstractZenModePreferenceController {
 
     private final Consumer<String> mModeNameSetter;
+    @Nullable private TextInputLayout mInputLayout;
     @Nullable private EditText mEditText;
     private boolean mIsSettingText;
 
@@ -50,7 +56,8 @@ class ZenModeEditNamePreferenceController extends AbstractZenModePreferenceContr
         super.displayPreference(screen);
         if (mEditText == null) {
             LayoutPreference pref = checkNotNull(screen.findPreference(getPreferenceKey()));
-            mEditText = pref.findViewById(android.R.id.edit);
+            mInputLayout = checkNotNull(pref.findViewById(R.id.edit_input_layout));
+            mEditText = checkNotNull(pref.findViewById(android.R.id.edit));
 
             mEditText.addTextChangedListener(new TextWatcher() {
                 @Override
@@ -61,9 +68,11 @@ class ZenModeEditNamePreferenceController extends AbstractZenModePreferenceContr
 
                 @Override
                 public void afterTextChanged(Editable s) {
-                    if (!mIsSettingText) {
-                        mModeNameSetter.accept(s.toString());
+                    if (mIsSettingText) {
+                        return;
                     }
+                    mModeNameSetter.accept(s.toString());
+                    updateErrorState(s.toString());
                 }
             });
         }
@@ -79,9 +88,20 @@ class ZenModeEditNamePreferenceController extends AbstractZenModePreferenceContr
                 if (!modeName.equals(currentText)) {
                     mEditText.setText(modeName);
                 }
+                updateErrorState(modeName);
             } finally {
                 mIsSettingText = false;
             }
         }
     }
+
+    private void updateErrorState(String currentName) {
+        checkState(mInputLayout != null);
+        if (TextUtils.isEmpty(currentName)) {
+            mInputLayout.setError(
+                    mContext.getString(R.string.zen_mode_edit_name_empty_error));
+        } else {
+            mInputLayout.setError(null);
+        }
+    }
 }
diff --git a/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java b/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java
index d1bd493482a..3e51462aefc 100644
--- a/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java
@@ -38,7 +38,8 @@ public class ZenModeNotifVisFragment extends ZenModeFragmentBase {
         prefControllers.add(new ZenModeNotifVisPreferenceController(context,
                 "zen_effect_light", ZenPolicy.VISUAL_EFFECT_LIGHTS, null, mBackend));
         prefControllers.add(new ZenModeNotifVisPreferenceController(context,
-                "zen_effect_peek", ZenPolicy.VISUAL_EFFECT_PEEK, null, mBackend));
+                "zen_effect_peek", ZenPolicy.VISUAL_EFFECT_PEEK,
+                new int[] {ZenPolicy.VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend));
         prefControllers.add(new ZenModeNotifVisPreferenceController(context,
                 "zen_effect_status", ZenPolicy.VISUAL_EFFECT_STATUS_BAR,
                 new int[] {ZenPolicy.VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend));
diff --git a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
index 11b65bd21f5..4dfb242c239 100644
--- a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
@@ -28,22 +28,28 @@ import static android.service.notification.ZenPolicy.PEOPLE_TYPE_UNSET;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.icu.text.MessageFormat;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Contacts;
 import android.service.notification.ZenPolicy;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.notification.app.ConversationListSettings;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -53,6 +59,7 @@ import com.google.common.collect.ImmutableSet;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -85,16 +92,18 @@ class ZenModePrioritySendersPreferenceController
     private static final Intent STARRED_CONTACTS_INTENT =
             new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION)
                     .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK  | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-    private static final Intent FALLBACK_INTENT = new Intent(Intent.ACTION_MAIN)
+    private static final Intent FALLBACK_CONTACTS_INTENT = new Intent(Intent.ACTION_MAIN)
             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
 
     private final ZenHelperBackend mHelperBackend;
+    private final UserManager mUserManager;
     private final PackageManager mPackageManager;
     private PreferenceCategory mPreferenceCategory;
     private final LinkedHashMap<String, SelectorWithWidgetPreference> mOptions =
             new LinkedHashMap<>();
 
     private final ZenModeSummaryHelper mZenModeSummaryHelper;
+    @Nullable private Dialog mProfileSelectDialog;
 
     public ZenModePrioritySendersPreferenceController(Context context, String key,
             boolean isMessages, ZenModesBackend backend, ZenHelperBackend helperBackend) {
@@ -105,11 +114,12 @@ class ZenModePrioritySendersPreferenceController
         String contactsPackage = context.getString(R.string.config_contacts_package_name);
         ALL_CONTACTS_INTENT.setPackage(contactsPackage);
         STARRED_CONTACTS_INTENT.setPackage(contactsPackage);
-        FALLBACK_INTENT.setPackage(contactsPackage);
+        FALLBACK_CONTACTS_INTENT.setPackage(contactsPackage);
 
+        mUserManager = mContext.getSystemService(UserManager.class);
         mPackageManager = mContext.getPackageManager();
-        if (!FALLBACK_INTENT.hasCategory(Intent.CATEGORY_APP_CONTACTS)) {
-            FALLBACK_INTENT.addCategory(Intent.CATEGORY_APP_CONTACTS);
+        if (!FALLBACK_CONTACTS_INTENT.hasCategory(Intent.CATEGORY_APP_CONTACTS)) {
+            FALLBACK_CONTACTS_INTENT.addCategory(Intent.CATEGORY_APP_CONTACTS);
         }
         mZenModeSummaryHelper = new ZenModeSummaryHelper(mContext, mHelperBackend);
     }
@@ -118,25 +128,27 @@ class ZenModePrioritySendersPreferenceController
     public void displayPreference(PreferenceScreen screen) {
         mPreferenceCategory = checkNotNull(screen.findPreference(getPreferenceKey()));
         if (mPreferenceCategory.getPreferenceCount() == 0) {
-            makeSelectorPreference(KEY_STARRED,
-                    com.android.settings.R.string.zen_mode_from_starred, mIsMessages, true);
-            makeSelectorPreference(KEY_CONTACTS,
-                    com.android.settings.R.string.zen_mode_from_contacts, mIsMessages, true);
+            makeSelectorPreference(KEY_STARRED, R.string.zen_mode_from_starred,
+                    R.string.zen_mode_from_starred_settings, mIsMessages, true);
+            makeSelectorPreference(KEY_CONTACTS, R.string.zen_mode_from_contacts,
+                    R.string.zen_mode_from_contacts_settings, mIsMessages, true);
             if (mIsMessages) {
                 // "Any conversations" will only be available as option if it is the current value.
                 // Because it's confusing and we don't want users setting it up that way, but apps
                 // could create such ZenPolicies and we must show that.
                 makeSelectorPreference(KEY_ANY_CONVERSATIONS,
-                        com.android.settings.R.string.zen_mode_from_all_conversations, true,
+                        R.string.zen_mode_from_all_conversations,
+                        R.string.zen_mode_from_conversations_settings, true,
                         /* isVisibleByDefault= */ false);
                 makeSelectorPreference(KEY_IMPORTANT_CONVERSATIONS,
-                        com.android.settings.R.string.zen_mode_from_important_conversations, true,
+                        R.string.zen_mode_from_important_conversations,
+                        R.string.zen_mode_from_conversations_settings, true,
                         true);
             }
             makeSelectorPreference(KEY_ANY,
-                    com.android.settings.R.string.zen_mode_from_anyone, mIsMessages, true);
+                    R.string.zen_mode_from_anyone, null, mIsMessages, true);
             makeSelectorPreference(KEY_NONE,
-                    com.android.settings.R.string.zen_mode_none_messages, mIsMessages, true);
+                    R.string.zen_mode_none_messages, null, mIsMessages, true);
         }
         super.displayPreference(screen);
     }
@@ -229,8 +241,9 @@ class ZenModePrioritySendersPreferenceController
         return CONVERSATION_SENDERS_UNSET;
     }
 
-    private void makeSelectorPreference(String key, int titleId,
-            boolean isCheckbox, boolean isVisibleByDefault) {
+    private void makeSelectorPreference(String key, @StringRes int titleId,
+            @Nullable @StringRes Integer settingsContentDescriptionResId, boolean isCheckbox,
+            boolean isVisibleByDefault) {
         final SelectorWithWidgetPreference pref =
                 new SelectorWithWidgetPreference(mPreferenceCategory.getContext(), isCheckbox);
         pref.setKey(key);
@@ -241,6 +254,9 @@ class ZenModePrioritySendersPreferenceController
         View.OnClickListener widgetClickListener = getWidgetClickListener(key);
         if (widgetClickListener != null) {
             pref.setExtraWidgetOnClickListener(widgetClickListener);
+            pref.setExtraWidgetContentDescription(settingsContentDescriptionResId != null
+                    ? mContext.getString(settingsContentDescriptionResId)
+                    : null);
         }
 
         mPreferenceCategory.addPreference(pref);
@@ -262,32 +278,49 @@ class ZenModePrioritySendersPreferenceController
         }
 
         return v -> {
-            if (KEY_STARRED.equals(key)
-                    && STARRED_CONTACTS_INTENT.resolveActivity(mPackageManager) != null) {
-                mContext.startActivity(STARRED_CONTACTS_INTENT);
-            } else if (KEY_CONTACTS.equals(key)
-                    && ALL_CONTACTS_INTENT.resolveActivity(mPackageManager) != null) {
-                mContext.startActivity(ALL_CONTACTS_INTENT);
+            if (KEY_STARRED.equals(key)) {
+                startContactsActivity(STARRED_CONTACTS_INTENT);
+            } else if (KEY_CONTACTS.equals(key)) {
+                startContactsActivity(ALL_CONTACTS_INTENT);
             } else if (KEY_ANY_CONVERSATIONS.equals(key)
                     || KEY_IMPORTANT_CONVERSATIONS.equals(key)) {
                 new SubSettingLauncher(mContext)
                         .setDestination(ConversationListSettings.class.getName())
                         .setSourceMetricsCategory(SettingsEnums.DND_MESSAGES)
                         .launch();
-            } else {
-                mContext.startActivity(FALLBACK_INTENT);
             }
         };
     }
 
+    private void startContactsActivity(Intent preferredIntent) {
+        Intent intent = preferredIntent.resolveActivity(mPackageManager) != null
+                ? preferredIntent : FALLBACK_CONTACTS_INTENT;
+
+        List<UserHandle> userProfiles = mUserManager.getEnabledProfiles();
+        if (userProfiles.size() <= 1) {
+            mContext.startActivity(intent);
+            return;
+        }
+
+        mProfileSelectDialog = ProfileSelectDialog.createDialog(mContext, userProfiles,
+                position -> {
+                    mContext.startActivityAsUser(intent, userProfiles.get(position));
+                    if (mProfileSelectDialog != null) {
+                        mProfileSelectDialog.dismiss();
+                        mProfileSelectDialog = null;
+                    }
+                });
+        mProfileSelectDialog.show();
+    }
+
     private boolean isStarredIntentValid() {
         return STARRED_CONTACTS_INTENT.resolveActivity(mPackageManager) != null
-                || FALLBACK_INTENT.resolveActivity(mPackageManager) != null;
+                || FALLBACK_CONTACTS_INTENT.resolveActivity(mPackageManager) != null;
     }
 
     private boolean isContactsIntentValid() {
         return ALL_CONTACTS_INTENT.resolveActivity(mPackageManager) != null
-                || FALLBACK_INTENT.resolveActivity(mPackageManager) != null;
+                || FALLBACK_CONTACTS_INTENT.resolveActivity(mPackageManager) != null;
     }
 
     void updateSummaries() {
diff --git a/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java b/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java
index 1f5438d08eb..21f34a2005d 100644
--- a/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java
@@ -48,15 +48,17 @@ public class ZenModeSelectBypassingAppsFragment extends ZenModeFragmentBase impl
         } else {
             app = null;
         }
-        return buildPreferenceControllers(context, app, this, new NotificationBackend());
+        return buildPreferenceControllers(context, app, this, new NotificationBackend(),
+                new ZenHelperBackend(context));
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             @Nullable Application app, @Nullable Fragment host,
-            @Nullable NotificationBackend notificationBackend) {
+            @Nullable NotificationBackend notificationBackend,
+            @Nullable ZenHelperBackend zenHelperBackend) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new ZenModeAllBypassingAppsPreferenceController(context, app, host,
-                notificationBackend));
+                zenHelperBackend));
         controllers.add(new ZenModeAddBypassingAppsPreferenceController(context, app, host,
                 notificationBackend));
         return controllers;
@@ -86,7 +88,7 @@ public class ZenModeSelectBypassingAppsFragment extends ZenModeFragmentBase impl
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {
-                    return buildPreferenceControllers(context, null, null, null);
+                    return buildPreferenceControllers(context, null, null, null, null);
                 }
             };
 }
diff --git a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
index e4c3f32e3db..651b7cc035e 100644
--- a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
@@ -27,10 +27,10 @@ import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
 import com.android.settingslib.widget.LayoutPreference;
@@ -51,11 +51,10 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo
     private final SimpleDateFormat mShortDayFormat = new SimpleDateFormat("EEEEE");
     private final SimpleDateFormat mLongDayFormat = new SimpleDateFormat("EEEE");
 
-    private static final String TAG = "ZenModeSetSchedulePreferenceController";
-    private Fragment mParent;
+    private DashboardFragment mParent;
     private ZenModeConfig.ScheduleInfo mSchedule;
 
-    ZenModeSetSchedulePreferenceController(Context context, Fragment parent, String key,
+    ZenModeSetSchedulePreferenceController(Context context, DashboardFragment parent, String key,
             ZenModesBackend backend) {
         super(context, key, backend);
         mParent = parent;
@@ -154,11 +153,7 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo
 
     private View.OnClickListener timePickerLauncher(int hour, int minute,
             ZenModeTimePickerFragment.TimeSetter timeSetter) {
-        return v -> {
-            final ZenModeTimePickerFragment frag = new ZenModeTimePickerFragment(mContext, hour,
-                    minute, timeSetter);
-            frag.show(mParent.getParentFragmentManager(), TAG);
-        };
+        return v -> ZenModeTimePickerFragment.show(mParent, hour, minute, timeSetter);
     }
 
     protected static int[] getDaysOfWeekForLocale(Calendar c) {
@@ -204,10 +199,10 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo
             // day label.
             dayToggle.setTextOn(mShortDayFormat.format(c.getTime()));
             dayToggle.setTextOff(mShortDayFormat.format(c.getTime()));
-            String state = dayEnabled
-                    ? mContext.getString(com.android.internal.R.string.capital_on)
-                    : mContext.getString(com.android.internal.R.string.capital_off);
-            dayToggle.setStateDescription(mLongDayFormat.format(c.getTime()) + ", " + state);
+            dayToggle.setContentDescription(mLongDayFormat.format(c.getTime()));
+            dayToggle.setStateDescription(mContext.getString(dayEnabled
+                    ? com.android.internal.R.string.capital_on
+                    : com.android.internal.R.string.capital_off));
 
             dayToggle.setChecked(dayEnabled);
             dayToggle.setOnCheckedChangeListener((buttonView, isChecked) -> {
diff --git a/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java b/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
index 483b8f07d20..1ee43fbfe43 100644
--- a/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
+++ b/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
@@ -498,29 +498,30 @@ class ZenModeSummaryHelper {
             MessageFormat msgFormat = new MessageFormat(
                     mContext.getString(R.string.zen_modes_summary_some_active),
                     Locale.getDefault());
-
-            Map<String, Object> args = new HashMap<>();
-            args.put("count", activeModes.size());
-            args.put("mode_1", activeModes.get(0).getName());
-            if (activeModes.size() >= 2) {
-                args.put("mode_2", activeModes.get(1).getName());
-                if (activeModes.size() == 3) {
-                    args.put("mode_3", activeModes.get(2).getName());
-                }
-            }
-
-            return msgFormat.format(args);
+            return buildModesSummary(msgFormat, activeModes);
         } else {
-            int automaticModeCount = (int) modes.stream()
-                    .filter(m -> m.isEnabled() && !m.isManualDnd() && !m.isCustomManual())
-                    .count();
-
+            List<ZenMode> modesExcludingImplicit = modes.stream()
+                    .filter(m -> m.getKind() != ZenMode.Kind.IMPLICIT)
+                    .toList();
             MessageFormat msgFormat = new MessageFormat(
-                    mContext.getString(R.string.zen_modes_summary_none_active),
+                    mContext.getString(R.string.zen_modes_summary),
                     Locale.getDefault());
-            Map<String, Object> msgArgs = Map.of("count", automaticModeCount);
-            return msgFormat.format(msgArgs);
+            return buildModesSummary(msgFormat, modesExcludingImplicit);
         }
     }
 
+    private static String buildModesSummary(MessageFormat msgFormat, List<ZenMode> modes) {
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", modes.size());
+        if (modes.size() >= 1) {
+            args.put("mode_1", modes.get(0).getName());
+            if (modes.size() >= 2) {
+                args.put("mode_2", modes.get(1).getName());
+                if (modes.size() >= 3) {
+                    args.put("mode_3", modes.get(2).getName());
+                }
+            }
+        }
+        return msgFormat.format(args);
+    }
 }
diff --git a/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java b/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java
index 3fa53946477..4594e5cbc9c 100644
--- a/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java
@@ -16,10 +16,11 @@
 
 package com.android.settings.notification.modes;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import android.app.Dialog;
 import android.app.TimePickerDialog;
 import android.app.settings.SettingsEnums;
-import android.content.Context;
 import android.os.Bundle;
 import android.text.format.DateFormat;
 import android.widget.TimePicker;
@@ -27,37 +28,54 @@ import android.widget.TimePicker;
 import androidx.annotation.NonNull;
 
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.dashboard.DashboardFragment;
 
 /**
  * Dialog that shows when a user selects a (start or end) time to edit for a schedule-based mode.
  */
 public class ZenModeTimePickerFragment extends InstrumentedDialogFragment implements
         TimePickerDialog.OnTimeSetListener {
-    private final Context mContext;
-    private final TimeSetter mTimeSetter;
-    private final int mHour;
-    private final int mMinute;
 
-    public ZenModeTimePickerFragment(Context context, int hour, int minute,
+    private static final String TAG = "ZenModeTimePickerFragment";
+
+    private TimeSetter mTimeSetter;
+    private int mHour;
+    private int mMinute;
+
+    public static void show(DashboardFragment parent, int hour, int minute,
             @NonNull TimeSetter timeSetter) {
-        super();
-        mContext = context;
-        mHour = hour;
-        mMinute = minute;
-        mTimeSetter = timeSetter;
+        ZenModeTimePickerFragment fragment = new ZenModeTimePickerFragment();
+        fragment.mHour = hour;
+        fragment.mMinute = minute;
+        fragment.mTimeSetter = timeSetter;
+
+        fragment.show(parent.getParentFragmentManager(), TAG);
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mTimeSetter == null) {
+            // Probably the dialog fragment was recreated after its activity was destroyed.
+            // It's pointless to re-show the dialog if we can't do anything when its options are
+            // selected, so we don't.
+            dismiss();
+        }
+    }
+
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new TimePickerDialog(mContext, this, mHour, mMinute,
-                DateFormat.is24HourFormat(mContext));
+        return new TimePickerDialog(getContext(), this, mHour, mMinute,
+                DateFormat.is24HourFormat(getContext()));
     }
 
     /**
      * Calls the provided TimeSetter's setTime() method when a time is set on the TimePicker.
      */
+    @Override
     public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-        mTimeSetter.setTime(hourOfDay, minute);
+        checkNotNull(mTimeSetter).setTime(hourOfDay, minute);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
index 193363585f1..13d5c6e9904 100644
--- a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
@@ -40,6 +40,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settingslib.PrimarySwitchPreference;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -108,7 +109,9 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
                     tryParseScheduleConditionId(mode.getRule().getConditionId());
             if (schedule != null) {
                 preference.setTitle(SystemZenRules.getTimeSummary(mContext, schedule));
-                preference.setSummary(SystemZenRules.getShortDaysSummary(mContext, schedule));
+                preference.setSummary(Utils.createAccessibleSequence(
+                        SystemZenRules.getDaysOfWeekShort(mContext, schedule),
+                        SystemZenRules.getDaysOfWeekFull(mContext, schedule)));
             } else {
                 // Fallback, but shouldn't happen.
                 Log.wtf(TAG, "SCHEDULE_TIME mode without schedule: " + mode);
@@ -174,8 +177,8 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
         @DrawableRes int icon;
         if (mode.getType() == TYPE_BEDTIME) {
             icon = com.android.internal.R.drawable.ic_zen_mode_type_schedule_time; // Clock
-        } else if (mode.getType() == TYPE_DRIVING) {
-            icon = com.android.internal.R.drawable.ic_zen_mode_type_driving; // Car
+        } else if (mode.getType() == TYPE_DRIVING && configurationIntent != null) {
+            icon = R.drawable.ic_zen_mode_trigger_with_settings; // Gear
         } else {
             icon = configurationIntent != null ? R.drawable.ic_zen_mode_trigger_with_activity
                     : R.drawable.ic_zen_mode_trigger_without_activity;
diff --git a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
index 0909c6f5f2e..4b1ffd095f0 100644
--- a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
+++ b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.notification.modes;
 
+import static com.android.settings.Utils.createAccessibleSequence;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.widget.TextView;
@@ -28,6 +30,7 @@ import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.Utils;
 import com.android.settingslib.notification.modes.ZenIconLoader;
 import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModeDescriptions;
 
 import com.google.common.base.Strings;
 
@@ -42,6 +45,7 @@ class ZenModesListItemPreference extends RestrictedPreference {
     private final Context mContext;
     private final ZenIconLoader mIconLoader;
     private final Executor mUiExecutor;
+    private final ZenModeDescriptions mDescriptions;
     private ZenMode mZenMode;
 
     private TextView mTitleView;
@@ -58,6 +62,7 @@ class ZenModesListItemPreference extends RestrictedPreference {
         mContext = context;
         mIconLoader = iconLoader;
         mUiExecutor = uiExecutor;
+        mDescriptions = new ZenModeDescriptions(context);
         setZenMode(zenMode);
         setKey(zenMode.getId());
     }
@@ -89,20 +94,17 @@ class ZenModesListItemPreference extends RestrictedPreference {
         }
 
         setTitle(mZenMode.getName());
-        String dynamicDescription = zenMode.getDynamicDescription(mContext);
-        CharSequence statusText = switch (mZenMode.getStatus()) {
-            case ENABLED_AND_ACTIVE ->
-                    Strings.isNullOrEmpty(dynamicDescription)
-                            ? mContext.getString(R.string.zen_mode_active_text)
-                            : mContext.getString(
-                                    R.string.zen_mode_format_status_and_trigger,
-                                    mContext.getString(R.string.zen_mode_active_text),
-                                    dynamicDescription);
-            case ENABLED -> dynamicDescription;
-            case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user);
-            case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_needs_setup);
-        };
-        setSummary(statusText);
+        ZenMode.Status status = zenMode.getStatus();
+        String statusText = getStatusText(status, mDescriptions.getTriggerDescription(zenMode));
+        String triggerDescriptionForA11y = mDescriptions.getTriggerDescriptionForAccessibility(
+                zenMode);
+
+        if (triggerDescriptionForA11y != null) {
+            setSummary(createAccessibleSequence(statusText,
+                    getStatusText(status, triggerDescriptionForA11y)));
+        } else {
+            setSummary(statusText);
+        }
 
         setIconSize(ICON_SIZE_SMALL);
         FutureUtil.whenDone(
@@ -116,6 +118,21 @@ class ZenModesListItemPreference extends RestrictedPreference {
         updateTextColor(zenMode);
     }
 
+    private String getStatusText(ZenMode.Status status, String triggerDescription) {
+        return switch (status) {
+            case ENABLED_AND_ACTIVE ->
+                    Strings.isNullOrEmpty(triggerDescription)
+                            ? mContext.getString(R.string.zen_mode_active_text)
+                            : mContext.getString(
+                                    R.string.zen_mode_format_status_and_trigger,
+                                    mContext.getString(R.string.zen_mode_active_text),
+                                    triggerDescription);
+            case ENABLED -> Strings.nullToEmpty(triggerDescription);
+            case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user);
+            case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_needs_setup);
+        };
+    }
+
     private void updateTextColor(@Nullable ZenMode zenMode) {
         boolean isActive = zenMode != null && zenMode.isActive();
         if (mTitleView != null) {
diff --git a/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
index 5f317814b22..904b554e28d 100644
--- a/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
@@ -30,18 +30,15 @@ import android.view.MenuItem;
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.utils.ManagedServiceSettings;
 import com.android.settings.utils.ZenServiceListing;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-@SearchIndexable
 public class ZenModeAutomationSettings extends ZenModeSettingsBase {
     public static final String DELETE = "DELETE_RULE";
     protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
@@ -133,25 +130,4 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
                 return super.onOptionsItemSelected(item);
         }
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) {
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-                    keys.add(ZenModeAddAutomaticRulePreferenceController.KEY);
-                    keys.add(ZenModeAutomaticRulesPreferenceController.KEY);
-                    return keys;
-                }
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null, null, null);
-                }
-            };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index c85b06bef38..2eb87c5c1aa 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -172,9 +172,6 @@ public class ZenModeBackend {
     }
 
     protected void saveVisualEffectsPolicy(int category, boolean suppress) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_UPDATED, 1);
-
         int suppressedEffects = getNewSuppressedEffects(suppress, category);
         savePolicy(mPolicy.priorityCategories, mPolicy.priorityCallSenders,
                 mPolicy.priorityMessageSenders, suppressedEffects,
diff --git a/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
index c2962dc83bc..2e5d33fca7a 100644
--- a/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
@@ -29,16 +29,13 @@ import android.content.Context;
 import android.os.Bundle;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@SearchIndexable
 public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implements Indexable {
 
     @Override
@@ -88,16 +85,4 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
     public int getMetricsCategory() {
         return SettingsEnums.ZEN_WHAT_TO_BLOCK;
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) {
-
-            @Override
-            public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-                return buildPreferenceControllers(context, null);
-            }
-        };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
index 89a80f06b6a..64489cb4e98 100644
--- a/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
@@ -25,15 +25,12 @@ import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@SearchIndexable
 public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
         Indexable {
     private final String TAG = "ZenBypassingApps";
@@ -74,17 +71,4 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
     public int getMetricsCategory() {
         return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS;
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) {
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null, null, null);
-                }
-            };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
index 93e97b1d2cd..76c6fef50c8 100644
--- a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
@@ -18,14 +18,11 @@ package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +30,6 @@ import java.util.List;
 /**
  * DND Calls Settings page to determine which priority senders can bypass DND.
  */
-@SearchIndexable
 public class ZenModeCallsSettings extends ZenModeSettingsBase {
 
     @Override
@@ -64,27 +60,4 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase {
     public int getMetricsCategory() {
         return SettingsEnums.DND_CALLS;
     }
-
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                boolean enabled) {
-            final ArrayList<SearchIndexableResource> result = new ArrayList<>();
-
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.zen_mode_calls_settings;
-            result.add(sir);
-            return result;
-        }
-
-        @Override
-        public List<AbstractPreferenceController> createPreferenceControllers(
-                Context context) {
-            return buildPreferenceControllers(context, null);
-        }
-    };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
index 3405c435ba3..d05016e3a3a 100644
--- a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
@@ -18,14 +18,11 @@ package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +31,6 @@ import java.util.List;
  * DND Messages Settings page to determine which priority senders can bypass DND.
  * "Messages" include SMS, MMS, and messaging apps.
  */
-@SearchIndexable
 public class ZenModeMessagesSettings extends ZenModeSettingsBase {
 
     @Override
@@ -62,27 +58,4 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase {
     public int getMetricsCategory() {
         return SettingsEnums.DND_MESSAGES;
     }
-
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                boolean enabled) {
-            final ArrayList<SearchIndexableResource> result = new ArrayList<>();
-
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.zen_mode_messages_settings;
-            result.add(sir);
-            return result;
-        }
-
-        @Override
-        public List<AbstractPreferenceController> createPreferenceControllers(
-                Context context) {
-            return buildPreferenceControllers(context, null);
-        }
-    };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
index 2b66482584b..ec491d8358a 100644
--- a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -26,16 +26,13 @@ import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@SearchIndexable
 public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexable {
 
     @Override
@@ -74,18 +71,4 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
     public int getMetricsCategory() {
         return SettingsEnums.DND_PEOPLE;
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_people_settings) {
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null, null, null,
-                            null, null);
-                }
-            };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
index f121430738a..162f3a01aab 100644
--- a/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
@@ -21,17 +21,14 @@ import android.content.Context;
 import android.os.Bundle;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.Indexable;
 import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase implements Indexable {
 
     @Override
@@ -72,16 +69,4 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS;
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) {
-
-            @Override
-            public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-                return buildPreferenceControllers(context, null);
-            }
-        };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
index a707e534d74..368528cd294 100644
--- a/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -42,10 +42,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,7 +53,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
 
-@SearchIndexable
 public class ZenModeSettings extends ZenModeSettingsBase {
     @Override
     public void onResume() {
@@ -354,25 +351,4 @@ public class ZenModeSettings extends ZenModeSettingsBase {
             return "";
         }
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_settings) {
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = super.getNonIndexableKeys(context);
-                    keys.add(ZenModeDurationPreferenceController.KEY);
-                    return keys;
-                }
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(Context
-                        context) {
-                    return buildPreferenceControllers(context, null, null,
-                            null, null);
-                }
-            };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
index 61e84fcb2c7..8863677533a 100644
--- a/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
@@ -20,11 +20,9 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +30,6 @@ import java.util.List;
 /**
  * Settings > Sound > Do Not Disturb > Alarms & Other Interruptions
  */
-@SearchIndexable
 public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implements Indexable {
 
     @Override
@@ -61,22 +58,4 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement
     public int getMetricsCategory() {
         return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY;
     }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) {
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-                    return keys;
-                }
-
-            @Override
-            public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-                return buildPreferenceControllers(context, null);
-            }
-        };
 }
diff --git a/src/com/android/settings/notification/zen/ZenOnboardingActivity.java b/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
deleted file mode 100644
index 151341cc4e8..00000000000
--- a/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
+++ /dev/null
@@ -1,208 +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.app.Activity;
-import android.app.Flags;
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.RadioButton;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.R;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-
-public class ZenOnboardingActivity extends Activity {
-
-    private static final String TAG = "ZenOnboardingActivity";
-
-    @VisibleForTesting
-    static final String PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME =
-            "pref_zen_suggestion_first_display_time_ms";
-    @VisibleForTesting
-    static final long ALWAYS_SHOW_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
-
-    View mNewSetting;
-    View mKeepCurrentSetting;
-    RadioButton mNewSettingButton;
-    RadioButton mKeepCurrentSettingButton;
-
-    private NotificationManager mNm;
-    private MetricsLogger mMetrics;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setNotificationManager(getSystemService(NotificationManager.class));
-        setMetricsLogger(new MetricsLogger());
-
-        Context context = getApplicationContext();
-        Settings.Secure.putInt(context.getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, 1);
-
-        setupUI();
-    }
-
-    @VisibleForTesting
-    protected void setupUI() {
-        setContentView(R.layout.zen_onboarding);
-
-        mNewSetting = findViewById(R.id.zen_onboarding_new_setting);
-        mKeepCurrentSetting = findViewById(R.id.zen_onboarding_current_setting);
-        mNewSettingButton = findViewById(R.id.zen_onboarding_new_setting_button);
-        mKeepCurrentSettingButton = findViewById(R.id.zen_onboarding_current_setting_button);
-
-        View.OnClickListener newSettingClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mKeepCurrentSettingButton.setChecked(false);
-                mNewSettingButton.setChecked(true);
-            }
-        };
-
-        View.OnClickListener currentSettingClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mKeepCurrentSettingButton.setChecked(true);
-                mNewSettingButton.setChecked(false);
-            }
-        };
-
-        mNewSetting.setOnClickListener(newSettingClickListener);
-        mNewSettingButton.setOnClickListener(newSettingClickListener);
-
-        mKeepCurrentSetting.setOnClickListener(currentSettingClickListener);
-        mKeepCurrentSettingButton.setOnClickListener(currentSettingClickListener);
-
-        mKeepCurrentSettingButton.setChecked(true);
-        mMetrics.visible(SettingsEnums.SETTINGS_ZEN_ONBOARDING);
-    }
-
-    @VisibleForTesting
-    protected void setNotificationManager(NotificationManager nm) {
-        mNm = nm;
-    }
-
-    @VisibleForTesting
-    protected void setMetricsLogger(MetricsLogger ml) {
-        mMetrics = ml;
-    }
-
-    public void launchSettings(View button) {
-        mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_SETTINGS);
-        Intent settings = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(getPackageName());
-        settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        startActivity(settings);
-    }
-
-    public void save(View button) {
-        NotificationManager.Policy policy = mNm.getNotificationPolicy();
-
-        if (mNewSettingButton.isChecked()) {
-            NotificationManager.Policy newPolicy = new NotificationManager.Policy(
-                    Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
-                    Policy.PRIORITY_SENDERS_STARRED,
-                    policy.priorityMessageSenders,
-                    NotificationManager.Policy.getAllSuppressedVisualEffects());
-            if (Flags.modesApi()) {
-                mNm.setNotificationPolicy(newPolicy, /* fromUser= */ true);
-            } else {
-                mNm.setNotificationPolicy(newPolicy);
-            }
-            mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_OK);
-        } else {
-            mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
-        }
-
-        Settings.Secure.putInt(getApplicationContext().getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_UPDATED, 1);
-
-        finishAndRemoveTask();
-    }
-
-    public static boolean isSuggestionComplete(Context context) {
-        if (wasZenUpdated(context)) {
-            return true;
-        }
-
-        if (showSuggestion(context) || withinShowTimeThreshold(context)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private static boolean wasZenUpdated(Context context) {
-        // ZEN_SETTINGS_UPDATED is true for:
-        // - fresh P+ device
-        // - if zen visual effects values were changed by the user in Settings
-        NotificationManager nm = context.getSystemService(NotificationManager.class);
-        if (NotificationManager.Policy.areAllVisualEffectsSuppressed(
-                nm.getNotificationPolicy().suppressedVisualEffects)) {
-            Settings.Secure.putInt(context.getContentResolver(),
-                    Settings.Secure.ZEN_SETTINGS_UPDATED, 1);
-        }
-        return Settings.Secure.getInt(context.getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 0;
-    }
-
-    private static boolean showSuggestion(Context context) {
-        // SHOW_ZEN_SETTINGS_SUGGESTION is by default true, but false when:
-        // - user manually turns on dnd
-
-        // SHOW_ZEN_SETTINGS_SUGGESTION is also true when:
-        // - automatic rule has started DND and user has not seen the first use dialog
-        return Settings.Secure.getInt(context.getContentResolver(),
-                Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, 0) != 0;
-
-    }
-
-    private static boolean withinShowTimeThreshold(Context context) {
-        final SuggestionFeatureProvider featureProvider =
-                FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider();
-        final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
-        final long currentTimeMs = System.currentTimeMillis();
-        final long firstDisplayTimeMs;
-
-        if (!prefs.contains(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME)) {
-            firstDisplayTimeMs = currentTimeMs;
-            prefs.edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
-        } else {
-            firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, -1);
-        }
-
-        final long showTimeMs = firstDisplayTimeMs + ALWAYS_SHOW_THRESHOLD;
-        final boolean stillShow = currentTimeMs < showTimeMs;
-
-        Log.d(TAG, "still show zen suggestion based on time: " + stillShow + " showTimeMs="
-            + showTimeMs);
-        return stillShow;
-    }
-}
diff --git a/src/com/android/settings/notification/zen/ZenSuggestionActivity.java b/src/com/android/settings/notification/zen/ZenSuggestionActivity.java
deleted file mode 100644
index b535a3e900e..00000000000
--- a/src/com/android/settings/notification/zen/ZenSuggestionActivity.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.android.settings.notification.zen;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-
-public class ZenSuggestionActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // start up zen settings activity
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(getPackageName());
-        startActivity(settingsIntent);
-
-        // start up onboarding activity
-        Intent onboardingActivity = new Intent(Settings.ZEN_MODE_ONBOARDING)
-                .setPackage(getPackageName());
-        startActivity(onboardingActivity);
-
-        finish();
-    }
-}
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index aba9eddce21..eb7d66708b6 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -213,8 +213,15 @@ public class ChooseLockPassword extends SettingsActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
-        ThemeHelper.trySetDynamicColor(this);
+        if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
+            if (!ThemeHelper.trySetSuwTheme(this)) {
+                setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
+                ThemeHelper.trySetDynamicColor(this);
+            }
+        } else {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            ThemeHelper.trySetDynamicColor(this);
+        }
         super.onCreate(savedInstanceState);
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index c331991a486..8c4c621242f 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -168,8 +168,16 @@ public class ChooseLockPattern extends SettingsActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
-        ThemeHelper.trySetDynamicColor(this);
+        if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
+            if (!ThemeHelper.trySetSuwTheme(this)) {
+                setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
+                ThemeHelper.trySetDynamicColor(this);
+            }
+        } else {
+
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            ThemeHelper.trySetDynamicColor(this);
+        }
         super.onCreate(savedInstanceState);
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index d656934a26b..7827b4b8d11 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -21,6 +21,7 @@ import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER;
+import static android.content.Intent.EXTRA_PACKAGE_NAME;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 
 import static com.android.systemui.biometrics.Utils.toBitmap;
@@ -152,8 +153,10 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
                     == BiometricPrompt.AUTHENTICATION_RESULT_TYPE_DEVICE_CREDENTIAL;
             ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils, mUserManager,
                     mDevicePolicyManager, mUserId, isStrongAuth);
-            ConfirmDeviceCredentialUtils.checkForPendingIntent(
-                    ConfirmDeviceCredentialActivity.this);
+            if (isInternalActivity()) {
+                ConfirmDeviceCredentialUtils.checkForPendingIntent(
+                        ConfirmDeviceCredentialActivity.this);
+            }
 
             setResult(Activity.RESULT_OK);
             finish();
@@ -244,7 +247,14 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
         promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager);
         promptInfo.setAuthenticators(mBiometricsAuthenticators);
         promptInfo.setNegativeButtonText(negativeButtonText);
-        promptInfo.setRealCallerForConfirmDeviceCredentialActivity(getCallingActivity());
+
+        final String callerPackageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
+        if (isInternalActivity() && callerPackageName != null) {
+            promptInfo.setRealCallerForConfirmDeviceCredentialActivity(
+                    new ComponentName(callerPackageName, ""));
+        } else {
+            promptInfo.setRealCallerForConfirmDeviceCredentialActivity(getCallingActivity());
+        }
 
         if (android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt()
@@ -377,7 +387,14 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
                 setBiometricPromptPropertiesForPrivateProfile(promptInfo);
                 showBiometricPrompt(promptInfo, effectiveUserId);
                 launchedBiometric = true;
+            } else if (Flags.privateSpaceBp()) {
+                promptInfo.setAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL);
+                setBiometricPromptPropertiesForPrivateProfile(promptInfo);
+                showBiometricPrompt(promptInfo, mUserId);
+                launchedBiometric = true;
             } else {
+                // TODO(b/376328272): Remove custom private space behavior
+                mDetails = Utils.getConfirmCredentialStringForUser(this, mUserId, credentialType);
                 showConfirmCredentials();
                 launchedCDC = true;
             }
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index de3ee517779..60ddfdc4fad 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -78,7 +78,15 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
             setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
         }
-        ThemeHelper.trySetDynamicColor(this);
+
+        if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
+            if (!ThemeHelper.trySetSuwTheme(this)) {
+                setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
+                ThemeHelper.trySetDynamicColor(this);
+            }
+        } else {
+            ThemeHelper.trySetDynamicColor(this);
+        }
         super.onCreate(savedState);
 
         if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index ead79d74d71..a09db22c215 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -39,6 +39,7 @@ import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.Editable;
 import android.text.InputType;
@@ -65,9 +66,13 @@ import com.android.internal.widget.LockscreenCredential;
 import com.android.internal.widget.TextViewInputDisabler;
 import com.android.settings.R;
 import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.Utils;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
 
+import com.google.android.setupdesign.util.ThemeHelper;
+
 import java.util.ArrayList;
 
 public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
@@ -83,6 +88,18 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
     public static class InternalActivity extends ConfirmLockPassword {
     }
 
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
+            if (!ThemeHelper.trySetSuwTheme(this)) {
+                setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
+                ThemeHelper.trySetDynamicColor(this);
+            }
+        }
+    }
+
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
@@ -290,6 +307,14 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                         CONFIRM_WORK_PROFILE_PIN_HEADER,
                         () -> getString(R.string.lockpassword_confirm_your_work_pin_header));
             }
+            if (android.multiuser.Flags.showCustomUnlockTitleInsidePrivateProfile()
+                    && Utils.isPrivateProfile(mEffectiveUserId, getActivity())
+                    && !UserManager.get(getActivity())
+                    .isQuietModeEnabled(UserHandle.of(mEffectiveUserId))) {
+                return mIsAlpha ? getString(R.string.private_space_confirm_your_password_header)
+                        : getString(R.string.private_space_confirm_your_pin_header);
+            }
+
             return mIsAlpha ? getString(R.string.lockpassword_confirm_your_password_header)
                     : getString(R.string.lockpassword_confirm_your_pin_header);
         }
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 28d790e1912..784e89884b8 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -34,6 +34,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -55,6 +56,7 @@ import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.settings.R;
 import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.Utils;
 import com.android.settingslib.animation.AppearAnimationCreator;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -422,6 +424,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                         CONFIRM_WORK_PROFILE_PATTERN_HEADER,
                         () -> getString(R.string.lockpassword_confirm_your_work_pattern_header));
             }
+            if (android.multiuser.Flags.showCustomUnlockTitleInsidePrivateProfile()
+                    && Utils.isPrivateProfile(mEffectiveUserId, getActivity())
+                    && !UserManager.get(getActivity())
+                    .isQuietModeEnabled(UserHandle.of(mEffectiveUserId))) {
+                return getString(R.string.private_space_confirm_your_pattern_header);
+            }
 
             return getString(R.string.lockpassword_confirm_your_pattern_header);
         }
diff --git a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
index c8a54712067..46aed3c0022 100644
--- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
+++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
@@ -19,7 +19,6 @@ package com.android.settings.privacy;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
@@ -33,7 +32,6 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.utils.ContentCaptureUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public final class EnableContentCaptureWithServiceSettingsPreferenceController
@@ -94,11 +92,7 @@ public final class EnableContentCaptureWithServiceSettingsPreferenceController
 
     private void show(Preference preference) {
         final UserManager userManager = UserManager.get(mContext);
-        final List<UserInfo> userInfos = userManager.getUsers();
-        final ArrayList<UserHandle> userHandles = new ArrayList<>(userInfos.size());
-        for (UserInfo info : userInfos) {
-            userHandles.add(info.getUserHandle());
-        }
+        final List<UserHandle> userHandles = userManager.getEnabledProfiles();
         final Intent intent = preference.getIntent().addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         if (userHandles.size() == 1) {
             mContext.startActivityAsUser(intent, userHandles.get(0));
diff --git a/src/com/android/settings/regionalpreferences/NewFirstDayOfWeekController.java b/src/com/android/settings/regionalpreferences/NewFirstDayOfWeekController.java
new file mode 100644
index 00000000000..bbe4dd682b5
--- /dev/null
+++ b/src/com/android/settings/regionalpreferences/NewFirstDayOfWeekController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.regionalpreferences;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.core.text.util.LocalePreferences;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+
+import java.util.Locale;
+
+/** A controller for the entry of First Day of Week's page */
+public class NewFirstDayOfWeekController extends BasePreferenceController {
+
+    public NewFirstDayOfWeekController(@NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    /**
+     * @return {@link AvailabilityStatus} for the Setting. This status is used to determine if the
+     * Setting should be shown or disabled in Settings. Further, it can be used to produce
+     * appropriate error / warning Slice in the case of unavailability.
+     * </p>
+     * The status is used for the convenience methods: {@link #isAvailable()}, {@link
+     * #isSupported()}
+     * </p>
+     * The inherited class doesn't need to check work profile if android:forWork="true" is set in
+     * preference xml.
+     */
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    @NonNull
+    public CharSequence getSummary() {
+        String record = Settings.System.getString(
+                mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
+        String result = "";
+        if (record != null) {
+            result = LocalePreferences.getFirstDayOfWeek(Locale.forLanguageTag(record), false);
+        }
+
+        if (result.isEmpty()) {
+            result = LocalePreferences.getFirstDayOfWeek(false);
+        }
+        return result.isEmpty()
+            ? mContext.getString(R.string.default_string_of_regional_preference)
+            : RegionalPreferencesDataUtils.dayConverter(mContext, result);
+    }
+}
diff --git a/src/com/android/settings/regionalpreferences/NewNumberingSystemController.java b/src/com/android/settings/regionalpreferences/NewNumberingSystemController.java
new file mode 100644
index 00000000000..ccdb13ffa0f
--- /dev/null
+++ b/src/com/android/settings/regionalpreferences/NewNumberingSystemController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.regionalpreferences;
+
+import android.content.Context;
+import android.os.LocaleList;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.app.LocaleStore;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+import com.android.settings.localepicker.LocaleFeatureProviderImpl;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/** A controller for the entry of Numbering System's page */
+public class NewNumberingSystemController extends BasePreferenceController {
+    private static final String TAG = NewNumberingSystemController.class.getSimpleName();
+
+    private LocaleList mLocaleList;
+    public NewNumberingSystemController(@NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+        // Initialize the supported languages to LocaleInfos
+        LocaleStore.fillCache(context);
+        mLocaleList = getNumberingSystemLocale();
+    }
+
+    /**
+     * @return {@link AvailabilityStatus} for the Setting. This status is used to determine if the
+     * Setting should be shown or disabled in Settings. Further, it can be used to produce
+     * appropriate error / warning Slice in the case of unavailability.
+     * </p>
+     * The status is used for the convenience methods: {@link #isAvailable()}, {@link
+     * #isSupported()}
+     * </p>
+     * The inherited class doesn't need to check work profile if android:forWork="true" is set in
+     * preference xml.
+     */
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return mLocaleList.isEmpty() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    private static LocaleList getNumberingSystemLocale() {
+        LocaleList localeList = LocaleList.getDefault();
+        Set<Locale> localesHasNumberingSystems = new HashSet<>();
+        for (int i = 0; i < localeList.size(); i++) {
+            Locale locale = localeList.get(i);
+            LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(locale);
+            if (localeInfo.hasNumberingSystems()) {
+                localesHasNumberingSystems.add(locale);
+            }
+        }
+        return convertToLocaleList(localesHasNumberingSystems);
+    }
+
+    private static LocaleList convertToLocaleList(Set<Locale> locales) {
+        if (locales.isEmpty()) {
+            return LocaleList.getEmptyLocaleList();
+        }
+        return new LocaleList(locales.stream().toArray(Locale[]::new));
+    }
+
+    @Override
+    @NonNull
+    public CharSequence getSummary() {
+        return new LocaleFeatureProviderImpl().getLocaleNames(getNumberingSystemLocale());
+    }
+}
diff --git a/src/com/android/settings/regionalpreferences/NewRegionalFooterPreferenceController.java b/src/com/android/settings/regionalpreferences/NewRegionalFooterPreferenceController.java
new file mode 100644
index 00000000000..6888833b8c8
--- /dev/null
+++ b/src/com/android/settings/regionalpreferences/NewRegionalFooterPreferenceController.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.regionalpreferences;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+import com.android.settingslib.HelpUtils;
+import com.android.settingslib.widget.FooterPreference;
+
+/**
+ * Preference controller for regional preference footer.
+ */
+public class NewRegionalFooterPreferenceController extends BasePreferenceController {
+
+    private static final String TAG = "NewRegionalFooterPreferenceController";
+
+    public NewRegionalFooterPreferenceController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE_UNSEARCHABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        FooterPreference footerPreference = screen.findPreference(getPreferenceKey());
+        setupFooterPreference(footerPreference);
+    }
+
+    @VisibleForTesting
+    void setupFooterPreference(FooterPreference footerPreference) {
+        if (footerPreference != null) {
+            footerPreference.setLearnMoreAction(v -> openLocaleLearnMoreLink());
+            footerPreference.setLearnMoreText(mContext.getString(
+                    R.string.desc_regional_pref_footer_learn_more));
+        }
+    }
+
+    private void openLocaleLearnMoreLink() {
+        Intent intent = HelpUtils.getHelpIntent(
+                mContext,
+                mContext.getString(R.string.regional_pref_footer_learn_more_link),
+                mContext.getClass().getName());
+        if (intent != null) {
+            mContext.startActivity(intent);
+        } else {
+            Log.w(TAG, "HelpIntent is null");
+        }
+    }
+}
diff --git a/src/com/android/settings/regionalpreferences/NewTemperatureUnitController.java b/src/com/android/settings/regionalpreferences/NewTemperatureUnitController.java
new file mode 100644
index 00000000000..2910dc58f61
--- /dev/null
+++ b/src/com/android/settings/regionalpreferences/NewTemperatureUnitController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.regionalpreferences;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.core.text.util.LocalePreferences;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
+
+import java.util.Locale;
+
+/** A controller for the entry of Temperature units' page */
+public class NewTemperatureUnitController extends BasePreferenceController {
+    private static final String TAG = NewTemperatureUnitController.class.getSimpleName();
+    public NewTemperatureUnitController(@NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    /**
+     * @return {@link AvailabilityStatus} for the Setting. This status is used to determine if the
+     * Setting should be shown or disabled in Settings. Further, it can be used to produce
+     * appropriate error / warning Slice in the case of unavailability.
+     * </p>
+     * The status is used for the convenience methods: {@link #isAvailable()}, {@link
+     * #isSupported()}
+     * </p>
+     * The inherited class doesn't need to check work profile if android:forWork="true" is set in
+     * preference xml.
+     */
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    @NonNull
+    public CharSequence getSummary() {
+        String record = Settings.System.getString(
+                mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
+        String result = "";
+        if (record != null) {
+            result = LocalePreferences.getTemperatureUnit(Locale.forLanguageTag(record), false);
+        }
+
+        if (result.isEmpty()) {
+            result = LocalePreferences.getTemperatureUnit(false);
+        }
+
+        return result.isEmpty()
+            ? mContext.getString(R.string.default_string_of_regional_preference)
+            : RegionalPreferencesDataUtils.temperatureUnitsConverter(mContext, result);
+    }
+}
diff --git a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java
index de0d386ccae..9f0c4041ebf 100644
--- a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java
+++ b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java
@@ -35,8 +35,8 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.TickButtonPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import java.util.Locale;
 
@@ -138,13 +138,13 @@ public class NumberingSystemItemController extends BasePreferenceController {
         for (String localeTag : locales) {
             Locale supportedLocale = Locale.forLanguageTag(localeTag);
             if (isSameBaseLocale(targetLocale, supportedLocale)) {
-                TickButtonPreference pref = new TickButtonPreference(mContext);
+                SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference(mContext);
                 String numberingName = getNumberingSystem(supportedLocale);
                 pref.setTitle(numberingName);
                 String key = supportedLocale.getUnicodeLocaleType(
                         ExtensionTypes.NUMBERING_SYSTEM);
                 pref.setKey(key == null ? RegionalPreferencesDataUtils.DEFAULT_VALUE : key);
-                pref.setSelected(isSameNumberingSystem(targetLocale, supportedLocale));
+                pref.setChecked(isSameNumberingSystem(targetLocale, supportedLocale));
                 screen.addPreference(pref);
             }
         }
@@ -168,11 +168,12 @@ public class NumberingSystemItemController extends BasePreferenceController {
 
     private void handleNumberSystemSelect(Preference preference) {
         for (int i = 0; i < mPreferenceScreen.getPreferenceCount(); i++) {
-            TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(i);
+            SelectorWithWidgetPreference pref =
+                    (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(i);
             Log.i(TAG, "[onPreferenceClick] key is " + pref.getKey());
             if (pref.getKey().equals(preference.getKey())) {
                 String numberingSystem = pref.getKey();
-                pref.setSelected(true);
+                pref.setChecked(true);
                 Locale updatedLocale =
                         saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage),
                                 numberingSystem);
@@ -188,7 +189,7 @@ public class NumberingSystemItemController extends BasePreferenceController {
                 mParentFragment.setArguments(bundle);
                 continue;
             }
-            pref.setSelected(false);
+            pref.setChecked(false);
         }
     }
 
diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java
index 8be0043e822..dda057984fc 100644
--- a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java
+++ b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java
@@ -24,8 +24,8 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.TickButtonPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 /** A base controller for handling all regional preferences controllers. */
 public abstract class RegionalPreferenceListBasePreferenceController extends
@@ -54,15 +54,14 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
         String[] unitValues = getUnitValues();
 
         for (int i = 0; i < unitValues.length; i++) {
-            TickButtonPreference pref = new TickButtonPreference(mContext);
+            SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference(mContext);
             mPreferenceCategory.addPreference(pref);
             final String item = unitValues[i];
             final String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(
                     mContext, getExtensionTypes());
             pref.setTitle(getPreferenceTitle(item));
             pref.setKey(item);
-            pref.setOnPreferenceClickListener(clickedPref -> {
-                setSelected(pref);
+            pref.setOnClickListener(v -> {
                 RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(),
                         item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE)
                                 ? null : item);
@@ -70,20 +69,8 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
                         getMetricsActionKey() == SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK ? ""
                                 : getPreferenceTitle(value) + " > " + getPreferenceTitle(item);
                 mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), metrics);
-                return true;
             });
-            pref.setSelected(!value.isEmpty() && item.equals(value));
-        }
-    }
-
-    private void setSelected(TickButtonPreference preference) {
-        for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {
-            TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(i);
-            if (pref.getKey().equals(preference.getKey())) {
-                pref.setSelected(true);
-                continue;
-            }
-            pref.setSelected(false);
+            pref.setChecked(!value.isEmpty() && item.equals(value));
         }
     }
 
diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferencesCategoryController.java b/src/com/android/settings/regionalpreferences/RegionalPreferencesCategoryController.java
new file mode 100644
index 00000000000..ad524a4ed3c
--- /dev/null
+++ b/src/com/android/settings/regionalpreferences/RegionalPreferencesCategoryController.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.regionalpreferences;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.flags.Flags;
+import com.android.settings.widget.PreferenceCategoryController;
+
+public class RegionalPreferencesCategoryController extends PreferenceCategoryController {
+    public RegionalPreferencesCategoryController(@NonNull Context context, @NonNull String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferencesController.java b/src/com/android/settings/regionalpreferences/RegionalPreferencesController.java
index 5e5fc9d2175..f194659c00b 100644
--- a/src/com/android/settings/regionalpreferences/RegionalPreferencesController.java
+++ b/src/com/android/settings/regionalpreferences/RegionalPreferencesController.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.os.SystemProperties;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
 
 /** A controller for the entry of Regional preferences */
 public class RegionalPreferencesController  extends BasePreferenceController {
@@ -42,6 +43,9 @@ public class RegionalPreferencesController  extends BasePreferenceController {
      */
     @Override
     public int getAvailabilityStatus() {
+        if (Flags.regionalPreferencesApiEnabled()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
         return SystemProperties.getBoolean(FEATURE_PROPERTY, true)
                 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java b/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
index 848febcf2d2..8b1e749ef79 100644
--- a/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
+++ b/src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
@@ -17,9 +17,11 @@
 package com.android.settings.regionalpreferences;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.flags.Flags;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
@@ -55,5 +57,13 @@ public class RegionalPreferencesEntriesFragment extends DashboardFragment {
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.regional_preference_main_page);
+            new BaseSearchIndexProvider(R.xml.regional_preference_main_page) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    if (Flags.regionalPreferencesApiEnabled()) {
+                        return false;
+                    }
+                    return true;
+                }
+            };
 }
diff --git a/src/com/android/settings/restriction/UserRestrictionBindingHelper.kt b/src/com/android/settings/restriction/UserRestrictionBindingHelper.kt
new file mode 100644
index 00000000000..16104de782f
--- /dev/null
+++ b/src/com/android/settings/restriction/UserRestrictionBindingHelper.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.restriction
+
+import android.content.Context
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.preference.PreferenceScreenBindingHelper
+import com.android.settingslib.preference.PreferenceScreenBindingHelper.Companion.CHANGE_REASON_STATE
+
+/** Helper to rebind preference immediately when user restriction is changed. */
+class UserRestrictionBindingHelper(
+    context: Context,
+    private val screenBindingHelper: PreferenceScreenBindingHelper,
+) : AutoCloseable {
+    private val restrictionKeysToPreferenceKeys: Map<String, MutableSet<String>> =
+        mutableMapOf<String, MutableSet<String>>()
+            .apply {
+                screenBindingHelper.forEachRecursively {
+                    val metadata = it.metadata
+                    if (metadata is PreferenceRestrictionMixin) {
+                        for (restrictionKey in metadata.restrictionKeys) {
+                            getOrPut(restrictionKey) { mutableSetOf() }.add(metadata.key)
+                        }
+                    }
+                }
+            }
+            .toMap()
+
+    private val userRestrictionObserver: KeyedObserver<String?>?
+
+    init {
+        if (restrictionKeysToPreferenceKeys.isEmpty()) {
+            userRestrictionObserver = null
+        } else {
+            val observer =
+                KeyedObserver<String?> { restrictionKey, _ ->
+                    restrictionKey?.let { notifyRestrictionChanged(it) }
+                }
+            UserRestrictions.addObserver(context, observer, HandlerExecutor.main)
+            userRestrictionObserver = observer
+        }
+    }
+
+    private fun notifyRestrictionChanged(restrictionKey: String) {
+        val keys = restrictionKeysToPreferenceKeys[restrictionKey] ?: return
+        for (key in keys) screenBindingHelper.notifyChange(key, CHANGE_REASON_STATE)
+    }
+
+    override fun close() {
+        userRestrictionObserver?.let { UserRestrictions.removeObserver(it) }
+    }
+}
diff --git a/src/com/android/settings/restriction/UserRestrictions.kt b/src/com/android/settings/restriction/UserRestrictions.kt
new file mode 100644
index 00000000000..1fa68307a4a
--- /dev/null
+++ b/src/com/android/settings/restriction/UserRestrictions.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.restriction
+
+import android.content.Context
+import android.os.Bundle
+import android.os.IUserRestrictionsListener
+import android.os.UserManager
+import com.android.settingslib.datastore.KeyedDataObservable
+import com.android.settingslib.datastore.KeyedObserver
+import java.util.concurrent.Executor
+import java.util.concurrent.atomic.AtomicBoolean
+
+/** Helper class to monitor user restriction changes. */
+object UserRestrictions {
+    private val observable = KeyedDataObservable<String>()
+
+    private val userRestrictionsListener =
+        object : IUserRestrictionsListener.Stub() {
+            override fun onUserRestrictionsChanged(
+                userId: Int,
+                newRestrictions: Bundle,
+                prevRestrictions: Bundle,
+            ) {
+                // there is no API to remove listener, do a quick check to avoid unnecessary work
+                if (!observable.hasAnyObserver()) return
+
+                val changedKeys = mutableSetOf<String>()
+                val keys = newRestrictions.keySet() + prevRestrictions.keySet()
+                for (key in keys) {
+                    if (newRestrictions.getBoolean(key) != prevRestrictions.getBoolean(key)) {
+                        changedKeys.add(key)
+                    }
+                }
+
+                for (key in changedKeys) observable.notifyChange(key, 0)
+            }
+        }
+
+    private val listenerAdded = AtomicBoolean()
+
+    fun addObserver(context: Context, observer: KeyedObserver<String?>, executor: Executor) {
+        context.addUserRestrictionsListener()
+        observable.addObserver(observer, executor)
+    }
+
+    fun addObserver(
+        context: Context,
+        key: String,
+        observer: KeyedObserver<String>,
+        executor: Executor,
+    ) {
+        context.addUserRestrictionsListener()
+        observable.addObserver(key, observer, executor)
+    }
+
+    private fun Context.addUserRestrictionsListener() {
+        if (listenerAdded.getAndSet(true)) return
+        // surprisingly, there is no way to remove the listener
+        applicationContext
+            .getSystemService(UserManager::class.java)
+            .addUserRestrictionsListener(userRestrictionsListener)
+    }
+
+    fun removeObserver(observer: KeyedObserver<String?>) = observable.removeObserver(observer)
+
+    fun removeObserver(key: String, observer: KeyedObserver<String>) =
+        observable.removeObserver(key, observer)
+}
diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java
index dc197821fcb..de536dcf3a3 100644
--- a/src/com/android/settings/search/CustomSiteMapRegistry.java
+++ b/src/com/android/settings/search/CustomSiteMapRegistry.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.search;
 
+import android.app.Flags;
 import android.util.ArrayMap;
 
 import com.android.settings.backup.UserBackupSettingsActivity;
@@ -55,8 +56,10 @@ public class CustomSiteMapRegistry {
                 ConnectedDeviceDashboardFragment.class.getName());
         CUSTOM_SITE_MAP.put(UserBackupSettingsActivity.class.getName(),
                 SystemDashboardFragment.class.getName());
-        CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),
-                ZenModeRestrictNotificationsSettings.class.getName());
+        if (!Flags.modesUi()) {
+            CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),
+                    ZenModeRestrictNotificationsSettings.class.getName());
+        }
         CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(),
                 SystemNavigationGestureSettings.class.getName());
     }
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index b62aeae9382..b1c65a7c3c0 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -128,22 +128,12 @@ public final class CredentialStorage extends FragmentActivity {
 
         final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyProperties.UID_SELF);
 
-        if (uid != KeyProperties.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {
-            final int dstUserId = UserHandle.getUserId(uid);
-
-            // Restrict install target to the wifi uid.
-            if (uid != Process.WIFI_UID) {
+        if (uid != KeyProperties.UID_SELF && uid != Process.WIFI_UID) {
+            if (!UserHandle.isSameUser(uid, Process.myUid())) {
                 Log.e(TAG, "Failed to install credentials as uid " + uid + ": cross-user installs"
                         + " may only target wifi uids");
                 return true;
             }
-
-            final Intent installIntent = new Intent(ACTION_INSTALL)
-                    .setPackage(getPackageName())
-                    .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
-                    .putExtras(bundle);
-            startActivityAsUser(installIntent, new UserHandle(dstUserId));
-            return true;
         }
 
         String alias = bundle.getString(Credentials.EXTRA_USER_KEY_ALIAS, null);
diff --git a/src/com/android/settings/security/LockScreenPreferenceScreen.kt b/src/com/android/settings/security/LockScreenPreferenceScreen.kt
new file mode 100644
index 00000000000..3c00b428ebd
--- /dev/null
+++ b/src/com/android/settings/security/LockScreenPreferenceScreen.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.R
+import com.android.settings.Settings.LockScreenSettingsActivity
+import com.android.settings.display.AmbientDisplayAlwaysOnPreference
+import com.android.settings.flags.Flags
+import com.android.settings.notification.LockScreenNotificationPreferenceController
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+open class LockScreenPreferenceScreen : PreferenceScreenCreator, PreferenceSummaryProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.lockscreen_settings_title
+
+    override val keywords: Int
+        get() = R.string.keywords_ambient_display_screen
+
+    override fun getSummary(context: Context): CharSequence? =
+        context.getString(LockScreenNotificationPreferenceController.getSummaryResource(context))
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystLockscreenFromDisplaySettings()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = LockscreenDashboardFragment::class.java
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, LockScreenSettingsActivity::class.java, metadata?.key)
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +AmbientDisplayAlwaysOnPreference()
+        }
+
+    companion object {
+        const val KEY = "lockscreen_from_display_settings"
+    }
+}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 2e4a1f28917..ef4c778549c 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -29,6 +29,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -54,8 +56,6 @@ import java.util.List;
 public class LockscreenDashboardFragment extends DashboardFragment
         implements OwnerInfoPreferenceController.OwnerInfoCallback {
 
-    public static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
-
     private static final String TAG = "LockscreenDashboardFragment";
 
     @VisibleForTesting
@@ -109,7 +109,9 @@ public class LockscreenDashboardFragment extends DashboardFragment
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        use(AmbientDisplayAlwaysOnPreferenceController.class).setConfig(getConfig(context));
+        if (!isCatalystEnabled()) {
+            use(AmbientDisplayAlwaysOnPreferenceController.class).setConfig(getConfig(context));
+        }
         use(AmbientDisplayNotificationsPreferenceController.class).setConfig(getConfig(context));
         use(DoubleTapScreenPreferenceController.class).setConfig(getConfig(context));
         use(PickupGesturePreferenceController.class).setConfig(getConfig(context));
@@ -160,6 +162,11 @@ public class LockscreenDashboardFragment extends DashboardFragment
         }
     }
 
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return LockScreenPreferenceScreen.KEY;
+    }
+
     private AmbientDisplayConfiguration getConfig(Context context) {
         if (mConfig == null) {
             mConfig = new AmbientDisplayConfiguration(context);
diff --git a/src/com/android/settings/service/PreferenceService.kt b/src/com/android/settings/service/PreferenceService.kt
new file mode 100644
index 00000000000..3a677629afd
--- /dev/null
+++ b/src/com/android/settings/service/PreferenceService.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.service
+
+import android.os.Binder
+import android.os.OutcomeReceiver
+import android.os.Process
+import android.service.settings.preferences.GetValueRequest
+import android.service.settings.preferences.GetValueResult
+import android.service.settings.preferences.MetadataRequest
+import android.service.settings.preferences.MetadataResult
+import android.service.settings.preferences.SetValueRequest
+import android.service.settings.preferences.SetValueResult
+import android.service.settings.preferences.SettingsPreferenceService
+import com.android.settingslib.graph.PreferenceGetterApiHandler
+import com.android.settingslib.graph.PreferenceSetterApiHandler
+import com.android.settingslib.ipc.ApiPermissionChecker
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.lang.Exception
+
+class PreferenceService : SettingsPreferenceService() {
+
+    private val scope = CoroutineScope(Job() + Dispatchers.Main)
+
+    private val getApiHandler = PreferenceGetterApiHandler(1, ApiPermissionChecker.alwaysAllow())
+    private val setApiHandler = PreferenceSetterApiHandler(2, ApiPermissionChecker.alwaysAllow())
+
+    override fun onGetAllPreferenceMetadata(
+        request: MetadataRequest,
+        callback: OutcomeReceiver<MetadataResult, Exception>
+    ) {
+        // TODO(379750656): Update graph API to be usable outside SettingsLib
+        callback.onError(UnsupportedOperationException("Not yet supported"))
+    }
+
+    override fun onGetPreferenceValue(
+        request: GetValueRequest,
+        callback: OutcomeReceiver<GetValueResult, Exception>
+    ) {
+        scope.launch(Dispatchers.IO) {
+            val apiRequest = transformFrameworkGetValueRequest(request)
+            val response = getApiHandler.invoke(application, Process.myUid(),
+                Binder.getCallingPid(), apiRequest)
+            val result = transformCatalystGetValueResponse(
+                this@PreferenceService,
+                request,
+                response
+            )
+            if (result == null) {
+                callback.onError(IllegalStateException("No response"))
+            } else {
+                callback.onResult(result)
+            }
+        }
+    }
+
+    override fun onSetPreferenceValue(
+        request: SetValueRequest,
+        callback: OutcomeReceiver<SetValueResult, Exception>
+    ) {
+        scope.launch(Dispatchers.IO) {
+            val apiRequest = transformFrameworkSetValueRequest(request)
+            if (apiRequest == null) {
+                callback.onResult(
+                    SetValueResult.Builder(SetValueResult.RESULT_INVALID_REQUEST).build()
+                )
+            } else {
+                val response = setApiHandler.invoke(application, Process.myUid(),
+                    Binder.getCallingPid(), apiRequest)
+
+                callback.onResult(transformCatalystSetValueResponse(response))
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt b/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt
new file mode 100644
index 00000000000..7a4c7fc9dff
--- /dev/null
+++ b/src/com/android/settings/service/PreferenceServiceRequestTransformer.kt
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.service
+
+import android.content.Context
+import android.service.settings.preferences.GetValueRequest
+import android.service.settings.preferences.GetValueResult
+import android.service.settings.preferences.SetValueRequest
+import android.service.settings.preferences.SetValueResult
+import android.service.settings.preferences.SettingsPreferenceMetadata
+import android.service.settings.preferences.SettingsPreferenceValue
+import com.android.settingslib.graph.PreferenceCoordinate
+import com.android.settingslib.graph.PreferenceGetterErrorCode
+import com.android.settingslib.graph.PreferenceGetterFlags
+import com.android.settingslib.graph.PreferenceGetterRequest
+import com.android.settingslib.graph.PreferenceGetterResponse
+import com.android.settingslib.graph.PreferenceSetterRequest
+import com.android.settingslib.graph.PreferenceSetterResult
+import com.android.settingslib.graph.preferenceValueProto
+import com.android.settingslib.graph.proto.PreferenceProto
+import com.android.settingslib.graph.proto.PreferenceValueProto
+import com.android.settingslib.graph.getText
+import com.android.settingslib.graph.toIntent
+import com.android.settingslib.metadata.SensitivityLevel
+
+/** Translate Framework GET VALUE request to Catalyst GET VALUE request */
+fun transformFrameworkGetValueRequest(
+    request: GetValueRequest,
+    flags: Int = PreferenceGetterFlags.ALL
+): PreferenceGetterRequest {
+    val coord = PreferenceCoordinate(request.screenKey, request.preferenceKey)
+    return PreferenceGetterRequest(
+        arrayOf(coord),
+        flags
+    )
+}
+
+/** Translate Catalyst GET VALUE result to Framework GET VALUE result */
+fun transformCatalystGetValueResponse(
+    context: Context,
+    request: GetValueRequest,
+    response: PreferenceGetterResponse
+): GetValueResult? {
+    val coord = PreferenceCoordinate(request.screenKey, request.preferenceKey)
+    val errorResponse = response.errors[coord]
+    val valueResponse = response.preferences[coord]
+    when {
+        errorResponse != null -> {
+            val errorCode = when (errorResponse) {
+                PreferenceGetterErrorCode.NOT_FOUND -> GetValueResult.RESULT_UNSUPPORTED
+                PreferenceGetterErrorCode.DISALLOW -> GetValueResult.RESULT_DISALLOW
+                else -> GetValueResult.RESULT_INTERNAL_ERROR
+            }
+            return GetValueResult.Builder(errorCode).build()
+        }
+        valueResponse != null -> {
+            val resultBuilder = GetValueResult.Builder(GetValueResult.RESULT_OK)
+            resultBuilder.setMetadata(valueResponse.toMetadata(context, coord.screenKey))
+            val prefValue = valueResponse.value
+            when (prefValue.valueCase.number) {
+                PreferenceValueProto.BOOLEAN_VALUE_FIELD_NUMBER -> {
+                    resultBuilder.setValue(
+                        SettingsPreferenceValue.Builder(
+                            SettingsPreferenceValue.TYPE_BOOLEAN
+                        ).setBooleanValue(prefValue.booleanValue)
+                            .build()
+                    )
+                    return resultBuilder.build()
+                }
+                PreferenceValueProto.INT_VALUE_FIELD_NUMBER -> {
+                    resultBuilder.setValue(
+                        SettingsPreferenceValue.Builder(
+                            SettingsPreferenceValue.TYPE_INT
+                        ).setIntValue(prefValue.intValue)
+                            .build()
+                    )
+                    return resultBuilder.build()
+                }
+            }
+            return GetValueResult.Builder(
+                GetValueResult.RESULT_UNSUPPORTED
+            ).build()
+        }
+        else -> return null
+    }
+}
+
+/** Translate Framework SET VALUE request to Catalyst SET VALUE request */
+fun transformFrameworkSetValueRequest(request: SetValueRequest): PreferenceSetterRequest? {
+    val valueProto = when (request.preferenceValue.type) {
+        SettingsPreferenceValue.TYPE_BOOLEAN -> preferenceValueProto {
+            booleanValue = request.preferenceValue.booleanValue
+        }
+        SettingsPreferenceValue.TYPE_INT -> preferenceValueProto {
+            intValue = request.preferenceValue.intValue
+        }
+        else -> null
+    }
+    return valueProto?.let {
+        PreferenceSetterRequest(request.screenKey, request.preferenceKey, it)
+    }
+}
+
+/** Translate Catalyst SET VALUE result to Framework SET VALUE result */
+fun transformCatalystSetValueResponse(@PreferenceSetterResult response: Int): SetValueResult {
+   val resultCode = when (response) {
+        PreferenceSetterResult.OK -> SetValueResult.RESULT_OK
+        PreferenceSetterResult.UNAVAILABLE -> SetValueResult.RESULT_UNAVAILABLE
+        PreferenceSetterResult.DISABLED -> SetValueResult.RESULT_DISABLED
+        PreferenceSetterResult.UNSUPPORTED -> SetValueResult.RESULT_UNSUPPORTED
+        PreferenceSetterResult.DISALLOW -> SetValueResult.RESULT_DISALLOW
+        PreferenceSetterResult.REQUIRE_APP_PERMISSION ->
+            SetValueResult.RESULT_REQUIRE_APP_PERMISSION
+        PreferenceSetterResult.REQUIRE_USER_AGREEMENT -> SetValueResult.RESULT_REQUIRE_USER_CONSENT
+        PreferenceSetterResult.RESTRICTED -> SetValueResult.RESULT_RESTRICTED
+       PreferenceSetterResult.INVALID_REQUEST -> SetValueResult.RESULT_INVALID_REQUEST
+        else -> SetValueResult.RESULT_INTERNAL_ERROR
+    }
+    return SetValueResult.Builder(resultCode).build()
+}
+
+private fun PreferenceProto.toMetadata(
+    context: Context,
+    screenKey: String
+): SettingsPreferenceMetadata {
+    val sensitivity = when (sensitivityLevel) {
+        SensitivityLevel.NO_SENSITIVITY -> SettingsPreferenceMetadata.NO_SENSITIVITY
+        SensitivityLevel.LOW_SENSITIVITY -> SettingsPreferenceMetadata.EXPECT_POST_CONFIRMATION
+        SensitivityLevel.MEDIUM_SENSITIVITY -> SettingsPreferenceMetadata.EXPECT_PRE_CONFIRMATION
+        else -> SettingsPreferenceMetadata.NO_DIRECT_ACCESS
+    }
+    return SettingsPreferenceMetadata.Builder(screenKey, key)
+        .setTitle(title.getText(context))
+        .setSummary(summary.getText(context))
+        .setEnabled(enabled)
+        .setAvailable(available)
+        .setRestricted(restricted)
+        .setWritable(persistent)
+        .setLaunchIntent(launchIntent.toIntent())
+        .setWriteSensitivity(sensitivity)
+        .build()
+}
diff --git a/src/com/android/settings/sim/PreferredSimDialogFragment.java b/src/com/android/settings/sim/PreferredSimDialogFragment.java
index 96c0eb61a75..aa42f3cb8f8 100644
--- a/src/com/android/settings/sim/PreferredSimDialogFragment.java
+++ b/src/com/android/settings/sim/PreferredSimDialogFragment.java
@@ -21,10 +21,12 @@ import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -91,8 +93,12 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
         }
 
         if (dialog == null) {
-            Log.d(TAG, "Dialog is null.");
-            dismiss();
+            dismiss("Dialog is null.");
+            return;
+        }
+        Context context = getContext();
+        if (context == null) {
+            dismiss("getContext is null.");
             return;
         }
 
@@ -100,24 +106,44 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
         if (info == null || (info.isEmbedded()
             && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
                 || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())))) {
-            dismiss();
+            dismiss("SubscriptionInfo is null or other esim's cases.");
             return;
         }
         Log.d(TAG, "SubscriptionInfo: " + info);
+        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+        if (telephonyManager == null) {
+            dismiss("TelephonyManager is null.");
+            return;
+        }
+        telephonyManager = telephonyManager.createForSubscriptionId(info.getSubscriptionId());
+        if (telephonyManager.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)) {
+            dismiss("mobile data is on.");
+            final SimDialogActivity activity = (SimDialogActivity) getActivity();
+            if (activity != null) {
+                activity.finish();
+            }
+            return;
+        }
+
         final CharSequence simName =
-                SubscriptionUtil.getUniqueSubscriptionDisplayName(info, getContext());
+                SubscriptionUtil.getUniqueSubscriptionDisplayName(info, context);
         final String title =
-                getContext().getString(
+                context.getString(
                         getTitleResId(),
                         simName);
         final String message =
-                getContext().getString(
+                context.getString(
                         R.string.sim_preferred_message,
                         simName);
         dialog.setTitle(title);
         dialog.setMessage(message);
     }
 
+    private void dismiss(String log) {
+        Log.d(TAG, log);
+        dismiss();
+    }
+
     @Override
     public void updateDialog() {
         updateDialog((AlertDialog) getDialog());
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index 3d9d41cb6bf..44fd43f7d19 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -42,6 +42,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -91,6 +92,11 @@ public class SimSelectNotification extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        UserManager userManager = context.getSystemService(UserManager.class);
+        if (userManager != null && !userManager.isMainUser()) {
+            Log.d(TAG, "The userId is not the main user");
+            return;
+        }
         if (!SubscriptionUtil.isSimHardwareVisible(context)) {
             Log.w(TAG, "Received unexpected intent with null action.");
             return;
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index e116422c7b9..060fa26f879 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -41,6 +41,7 @@ import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.media.MediaOutputConstants;
+import com.android.settingslib.media.PhoneMediaDevice;
 
 import java.util.List;
 
@@ -132,6 +133,12 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
+        // Always use media switcher to control routing in desktop.
+        if (PhoneMediaDevice.inputRoutingEnabledAndIsDesktop(mContext)) {
+            mPreference.setVisible(true);
+            return;
+        }
+
         mPreference.setVisible(!Utils.isAudioModeOngoingCall(mContext)
                 && (enableOutputSwitcherForSystemRouting() ? true : mMediaController != null));
     }
@@ -153,8 +160,10 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
         }
 
         mPreference.setEnabled(true);
-        if (Utils.isAudioModeOngoingCall(mContext)) {
-            // Ongoing call status, switch entry for media will be disabled.
+        if (Utils.isAudioModeOngoingCall(mContext) &&
+                !PhoneMediaDevice.inputRoutingEnabledAndIsDesktop(mContext)) {
+            // Ongoing call status, switch entry for media will be disabled, unless input routing is
+            // enabled in desktop.
             mPreference.setVisible(false);
             preference.setSummary(
                     mContext.getText(R.string.media_out_summary_ongoing_call_state));
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index 8b481797907..7702db6bcde 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -42,6 +42,7 @@ import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
 import com.android.settings.spa.app.specialaccess.TurnScreenOnAppsAppListProvider
 import com.android.settings.spa.app.specialaccess.UseFullScreenIntentAppListProvider
 import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider
+import com.android.settings.spa.app.specialaccess.WriteSystemPreferencesAppListProvider
 import com.android.settings.spa.app.storage.StorageAppListPageProvider
 import com.android.settings.spa.core.instrumentation.SpaLogMetricsProvider
 import com.android.settings.spa.core.instrumentation.SpaLogProvider
@@ -80,6 +81,7 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
             NfcTagAppsSettingsProvider,
             LongBackgroundTasksAppListProvider,
             TurnScreenOnAppsAppListProvider,
+            WriteSystemPreferencesAppListProvider,
         )
     }
 
diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index fa9cee2c899..78fb8df123b 100644
--- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -34,6 +34,7 @@ import androidx.navigation.navArgument
 import com.android.settings.R
 import com.android.settings.applications.AppInfoBase
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment
+import com.android.settings.development.Enable16kUtils
 import com.android.settings.flags.Flags
 import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
 import com.android.settings.spa.app.appcompat.UserAspectRatioAppPreference
@@ -42,6 +43,7 @@ import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListPro
 import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider
 import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider
 import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider
+import com.android.settings.spa.app.specialaccess.WriteSystemPreferencesAppListProvider
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
 import com.android.settingslib.spa.framework.compose.navigator
 import com.android.settingslib.spa.widget.scaffold.RegularScaffold
@@ -140,18 +142,20 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
 
         AppButtons(packageInfoPresenter, isHibernationSwitchEnabledStateFlow)
 
-        AppSettingsPreference(app)
-        AppAllServicesPreference(app)
-        AppNotificationPreference(app)
-        AppPermissionPreference(app)
-        AppStoragePreference(app)
-        InstantAppDomainsPreference(app)
-        AppDataUsagePreference(app)
-        AppTimeSpentPreference(app)
-        AppBatteryPreference(app)
-        AppLocalePreference(app)
-        AppOpenByDefaultPreference(app)
-        DefaultAppShortcuts(app)
+        Category {
+            AppSettingsPreference(app)
+            AppAllServicesPreference(app)
+            AppNotificationPreference(app)
+            AppPermissionPreference(app)
+            AppStoragePreference(app)
+            InstantAppDomainsPreference(app)
+            AppDataUsagePreference(app)
+            AppTimeSpentPreference(app)
+            AppBatteryPreference(app)
+            AppLocalePreference(app)
+            AppOpenByDefaultPreference(app)
+            DefaultAppShortcuts(app)
+        }
 
         Category(title = stringResource(R.string.unused_apps_category)) {
             HibernationSwitchPreference(app, isHibernationSwitchEnabledStateFlow)
@@ -165,6 +169,8 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
             InstallUnknownAppsListProvider.InfoPageEntryItem(app)
             InteractAcrossProfilesDetailsPreference(app)
             AlarmsAndRemindersAppListProvider.InfoPageEntryItem(app)
+            WriteSystemPreferencesAppListProvider.InfoPageEntryItem(app)
+            Enable16KbAppCompatPreference(app)
         }
 
         Category(title = stringResource(R.string.app_install_details_group_title)) {
diff --git a/src/com/android/settings/spa/app/appinfo/Enable16KbAppCompatPreference.kt b/src/com/android/settings/spa/app/appinfo/Enable16KbAppCompatPreference.kt
new file mode 100644
index 00000000000..b6606cf881a
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/Enable16KbAppCompatPreference.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa.app.appinfo
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.util.Log
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.android.settings.R
+import com.android.settings.development.Enable16kUtils
+import com.android.settings.flags.Flags
+import com.android.settingslib.spa.framework.compose.OverridableFlow
+import com.android.settingslib.spa.widget.preference.SwitchPreference
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import kotlinx.coroutines.flow.flow
+
+@Composable
+fun Enable16KbAppCompatPreference(
+    app: ApplicationInfo
+) {
+    val context = LocalContext.current
+    val presenter = remember(app) { Enable16KbAppCompatSwitchPresenter(context, app) }
+    if (!presenter.isAvailable()) return
+
+    val isCheckedState = presenter.isCheckedFlow.collectAsStateWithLifecycle(initialValue = null)
+    SwitchPreference(remember {
+        object : SwitchPreferenceModel {
+            override val title =
+                context.getString(R.string.enable_16k_app_compat_title)
+
+            override val summary = {
+                context.getString(R.string.enable_16k_app_compat_details)
+            }
+
+            override val checked = {
+                isCheckedState.value
+            }
+
+            override val onCheckedChange = presenter::onCheckedChange
+        }
+    })
+}
+
+private class Enable16KbAppCompatSwitchPresenter(context: Context, private val app: ApplicationInfo) {
+    private val packageManager = context.packageManager
+    fun isAvailable(): Boolean {
+        return Enable16kUtils.isUsing16kbPages() && Flags.pageSizeAppCompatSetting()
+    }
+
+    private val isChecked = OverridableFlow(flow {
+        emit(packageManager.isPageSizeCompatEnabled(app.packageName))
+    })
+
+    val isCheckedFlow = isChecked.flow
+    fun onCheckedChange(newChecked: Boolean) {
+        try {
+            packageManager.setPageSizeAppCompatFlagsSettingsOverride(app.packageName, newChecked)
+            isChecked.override(newChecked)
+        } catch (e: RuntimeException) {
+            Log.e("Enable16KbAppCompat", "Failed to set" +
+                    "setPageSizeAppCompatModeSettingsOverride", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
index 8dbcb14e83b..36fe93e2f27 100644
--- a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
+++ b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
@@ -29,6 +29,8 @@ import android.os.UserHandle
 import android.util.Log
 import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
+import com.android.settings.Utils
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment
 import com.android.settings.flags.FeatureFlags
 import com.android.settings.flags.FeatureFlagsImpl
 import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
@@ -116,6 +118,16 @@ class PackageInfoPresenter(
 
     private fun isForThisApp(intent: Intent) = packageName == intent.data?.schemeSpecificPart
 
+    private fun requireAuthAndExecute(action: () -> Unit) {
+        if (Utils.isProtectedPackage(context, packageName)) {
+            AppInfoDashboardFragment.showLockScreen(context) {
+                action()
+            }
+        } else {
+            action()
+        }
+    }
+
     /** Enables this package. */
     fun enable() {
         logAction(SettingsEnums.ACTION_SETTINGS_ENABLE_APP)
@@ -129,17 +141,21 @@ class PackageInfoPresenter(
     /** Disables this package. */
     fun disable() {
         logAction(SettingsEnums.ACTION_SETTINGS_DISABLE_APP)
-        coroutineScope.launch(Dispatchers.IO) {
-            userPackageManager.setApplicationEnabledSetting(
-                packageName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0
-            )
+        requireAuthAndExecute {
+            coroutineScope.launch(Dispatchers.IO) {
+                userPackageManager.setApplicationEnabledSetting(
+                    packageName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0
+                )
+            }
         }
     }
 
     /** Starts the uninstallation activity. */
     fun startUninstallActivity(forAllUsers: Boolean = false) {
         logAction(SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP)
-        context.startUninstallActivity(packageName, userHandle, forAllUsers)
+        requireAuthAndExecute {
+            context.startUninstallActivity(packageName, userHandle, forAllUsers)
+        }
     }
 
     /** Clears this instant app. */
@@ -153,17 +169,19 @@ class PackageInfoPresenter(
     /** Force stops this package. */
     fun forceStop() {
         logAction(SettingsEnums.ACTION_APP_FORCE_STOP)
-        coroutineScope.launch(Dispatchers.Default) {
-            Log.d(TAG, "Stopping package $packageName")
-            if (android.app.Flags.appRestrictionsApi()) {
-                val uid = userPackageManager.getPackageUid(packageName, 0)
-                context.activityManager.noteAppRestrictionEnabled(
-                    packageName, uid,
-                    ActivityManager.RESTRICTION_LEVEL_FORCE_STOPPED, true,
-                    ActivityManager.RESTRICTION_REASON_USER, "settings",
-                    ActivityManager.RESTRICTION_SOURCE_USER, 0)
+        requireAuthAndExecute {
+            coroutineScope.launch(Dispatchers.Default) {
+                Log.d(TAG, "Stopping package $packageName")
+                if (android.app.Flags.appRestrictionsApi()) {
+                    val uid = userPackageManager.getPackageUid(packageName, 0)
+                    context.activityManager.noteAppRestrictionEnabled(
+                        packageName, uid,
+                        ActivityManager.RESTRICTION_LEVEL_FORCE_STOPPED, true,
+                        ActivityManager.RESTRICTION_REASON_USER, "settings",
+                        ActivityManager.RESTRICTION_SOURCE_USER, 0)
+                }
+                context.activityManager.forceStopPackageAsUser(packageName, userId)
             }
-            context.activityManager.forceStopPackageAsUser(packageName, userId)
         }
     }
 
diff --git a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
index f077506bc3c..5c27f5bfad0 100644
--- a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
+++ b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
@@ -107,7 +107,7 @@ class BatteryOptimizationModeAppListModel(
         PowerAllowlistBackend.getInstance(context).refreshList()
         return recordListFlow.filterItem {
             val appOptimizationMode = BatteryOptimizeUtils(context, it.app.uid, it.app.packageName)
-                .getAppOptimizationMode(/* refreshList */ false);
+                .getAppOptimizationMode(/* refreshList */ false, /* ignoreUnknownMode */ true);
             when (OptimizationModeSpinnerItem.entries.getOrNull(option)) {
                 OptimizationModeSpinnerItem.Restricted ->
                     appOptimizationMode == BatteryOptimizeUtils.MODE_RESTRICTED
diff --git a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
index 06d5b488e73..d6fe7160dbf 100644
--- a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
+++ b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
@@ -56,6 +56,7 @@ class InstallUnknownAppsListModel(private val context: Context) :
             UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
             UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
         )
+    override val switchifBlockedByAdminOverrideCheckedValueTo = false
     override val enhancedConfirmationKey: String = AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES
 
     override fun transformItem(app: ApplicationInfo) =
diff --git a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
index 41e5c849eed..c9ff8a05618 100644
--- a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
+++ b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
@@ -70,6 +70,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
                 WifiControlAppListProvider,
                 LongBackgroundTasksAppListProvider,
                 TurnScreenOnAppsAppListProvider,
+                WriteSystemPreferencesAppListProvider,
             )
             .map { it.buildAppListInjectEntry().setLink(fromPage = owner).build() }
     }
diff --git a/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferences.kt b/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferences.kt
new file mode 100644
index 00000000000..e4b9ef146d7
--- /dev/null
+++ b/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferences.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa.app.specialaccess
+
+import android.Manifest
+import android.app.AppOpsManager
+import android.content.Context
+import com.android.settings.R
+import com.android.settingslib.spaprivileged.model.app.AppOps
+import com.android.settingslib.spaprivileged.model.app.PackageManagers
+import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
+import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
+import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+object WriteSystemPreferencesAppListProvider : TogglePermissionAppListProvider {
+    override val permissionType = "WriteSystemPreferences"
+    override fun createModel(context: Context) = WriteSystemPreferencesAppListModel(context)
+}
+
+class WriteSystemPreferencesAppListModel(context: Context) : AppOpPermissionListModel(context) {
+    override val pageTitleResId = R.string.write_system_preferences_page_title
+    override val switchTitleResId = R.string.write_system_preferences_switch_title
+    override val footerResId = R.string.write_system_preferences_footer_description
+    override val appOps = AppOps(
+        op = AppOpsManager.OP_WRITE_SYSTEM_PREFERENCES,
+        setModeByUid = true,
+    )
+    override val permission = Manifest.permission.WRITE_SYSTEM_PREFERENCES
+
+    override fun filter(userIdFlow: Flow<Int>, recordListFlow: Flow<List<AppOpPermissionRecord>>):
+            Flow<List<AppOpPermissionRecord>> {
+        return super.filter(userIdFlow, recordListFlow).map { recordList ->
+            recordList.filter { app ->
+                // Only apps that have READ_SYSTEM_PREFERENCES can utilize WRITE_SYSTEM_PREFERENCES.
+                // This write permission is (currently) non-functionality without the corresponding
+                // read permission, and the read permission can only be granted via pre-grant or
+                // role. As such, we don't show apps that are "requesting" this permission without
+                // holding the read permission, as it would create confusion and not provide them
+                // any functionality.
+                with (PackageManagers) {
+                    app.app.hasGrantPermission(Manifest.permission.READ_SYSTEM_PREFERENCES)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferencesPreferenceController.kt b/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferencesPreferenceController.kt
new file mode 100644
index 00000000000..fb808fa8199
--- /dev/null
+++ b/src/com/android/settings/spa/app/specialaccess/WriteSystemPreferencesPreferenceController.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa.app.specialaccess
+
+import android.content.Context
+import androidx.preference.Preference
+import com.android.settings.core.BasePreferenceController
+import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
+import com.android.settingslib.flags.Flags
+
+class WriteSystemPreferencesPreferenceController(
+    context: Context, key: String
+)  : BasePreferenceController(context, key) {
+    override fun getAvailabilityStatus(): Int {
+        return if (Flags.settingsCatalyst() && Flags.writeSystemPreferencePermissionEnabled()) {
+            AVAILABLE
+        } else {
+            UNSUPPORTED_ON_DEVICE
+        }
+    }
+
+    override fun handlePreferenceTreeClick(preference: Preference?): Boolean {
+        return if (preference?.key == mPreferenceKey) {
+            mContext.startSpaActivity(WriteSystemPreferencesAppListProvider.getAppListRoute())
+            true
+        } else {
+            false
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/spa/network/SimsSection.kt b/src/com/android/settings/spa/network/SimsSection.kt
index bd55b32a5e8..fa7fa448950 100644
--- a/src/com/android/settings/spa/network/SimsSection.kt
+++ b/src/com/android/settings/spa/network/SimsSection.kt
@@ -21,7 +21,6 @@ import android.content.Intent
 import android.os.UserManager
 import android.telephony.SubscriptionInfo
 import android.telephony.euicc.EuiccManager
-import androidx.compose.foundation.layout.Column
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.SimCard
@@ -44,6 +43,7 @@ import com.android.settings.network.telephony.euicc.EuiccRepository
 import com.android.settings.network.telephony.phoneNumberFlow
 import com.android.settingslib.spa.widget.preference.PreferenceModel
 import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import com.android.settingslib.spa.widget.ui.Category
 import com.android.settingslib.spa.widget.ui.SettingsIcon
 import com.android.settingslib.spaprivileged.model.enterprise.Restrictions
 import com.android.settingslib.spaprivileged.template.preference.RestrictedPreference
@@ -53,7 +53,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun SimsSection(subscriptionInfoList: List<SubscriptionInfo>) {
-    Column {
+    Category {
         for (subInfo in subscriptionInfoList) {
             SimPreference(subInfo)
         }
@@ -137,9 +137,9 @@ private fun AddSim() {
     }
 }
 
-fun startAddSimFlow(context: Context) {
-    val intent = Intent(EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION)
-    intent.setPackage(Utils.PHONE_PACKAGE_NAME)
-    intent.putExtra(EuiccManager.EXTRA_FORCE_PROVISION, true)
-    context.startActivity(intent)
+fun startAddSimFlow(context: Context) = context.startActivity(getAddSimIntent())
+
+fun getAddSimIntent() = Intent(EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION).apply {
+    setPackage(Utils.PHONE_PACKAGE_NAME)
+    putExtra(EuiccManager.EXTRA_FORCE_PROVISION, true)
 }
diff --git a/src/com/android/settings/spa/preference/ComposePreference.kt b/src/com/android/settings/spa/preference/ComposePreference.kt
index 55a469c492f..91b2d8ac81a 100644
--- a/src/com/android/settings/spa/preference/ComposePreference.kt
+++ b/src/com/android/settings/spa/preference/ComposePreference.kt
@@ -26,6 +26,14 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.android.settings.R
 import com.android.settingslib.spa.framework.theme.SettingsTheme
+import com.android.settingslib.widget.GroupSectionDividerMixin
+
+open class ComposeMainSwitchPreference @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0,
+) : ComposePreference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin
 
 open class ComposePreference @JvmOverloads constructor(
     context: Context,
diff --git a/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt b/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt
index 2c0955b42b0..b94f52c8d40 100644
--- a/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt
+++ b/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt
@@ -38,9 +38,17 @@ class SpaSearchLandingActivity : Activity() {
         finish()
     }
 
-    private fun isValidCall() =
-        PasswordUtils.getCallingAppPackageName(activityToken) ==
+    private fun isValidCall(): Boolean {
+        val callingAppPackageName = PasswordUtils.getCallingAppPackageName(activityToken)
+        if (callingAppPackageName == packageName) {
+            // SettingsIntelligence sometimes starts SearchResultTrampoline first, in this case,
+            // SearchResultTrampoline checks if the call is valid, then SearchResultTrampoline will
+            // start this activity, allow this use case.
+            return true
+        }
+        return callingAppPackageName ==
             featureFactory.searchFeatureProvider.getSettingsIntelligencePkgName(this)
+    }
 
     companion object {
         @VisibleForTesting
diff --git a/src/com/android/settings/system/reset/ResetNetworkConfirm.kt b/src/com/android/settings/system/reset/ResetNetworkConfirm.kt
index b353f69d9db..3412825b62d 100644
--- a/src/com/android/settings/system/reset/ResetNetworkConfirm.kt
+++ b/src/com/android/settings/system/reset/ResetNetworkConfirm.kt
@@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums
 import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Looper
+import android.telecom.TelecomManager
 import android.telephony.SubscriptionManager
 import android.util.Log
 import android.view.LayoutInflater
@@ -89,7 +90,12 @@ class ResetNetworkConfirm : InstrumentedFragment() {
     /** Configure the UI for the final confirmation interaction */
     private fun View.establishFinalConfirmationState() {
         requireViewById<View>(R.id.execute_reset_network).setOnClickListener {
-            showResetInternetDialog();
+            val tm = context.getSystemService(TelecomManager::class.java)
+            if (tm != null && tm.isInCall) {
+                showResetInternetDialog();
+            } else {
+                onResetClicked()
+            }
         }
     }
 
@@ -138,9 +144,13 @@ class ResetNetworkConfirm : InstrumentedFragment() {
      * settings to its factory-default state.
      */
     @VisibleForTesting
-    suspend fun onResetClicked() {
-        showProgressDialog()
-        resetNetwork()
+    fun onResetClicked() {
+        if (!Utils.isMonkeyRunning() && !resetStarted) {
+            resetStarted = true
+            viewLifecycleOwner.lifecycleScope.launch {
+                showProgressDialog()
+                resetNetwork() }
+        }
     }
 
     private fun showProgressDialog() {
@@ -165,10 +175,7 @@ class ResetNetworkConfirm : InstrumentedFragment() {
         val builder = AlertDialog.Builder(requireContext())
         val resetInternetClickListener =
             DialogInterface.OnClickListener { dialog, which ->
-                if (!Utils.isMonkeyRunning() && !resetStarted) {
-                    resetStarted = true
-                    viewLifecycleOwner.lifecycleScope.launch { onResetClicked() }
-                }
+                onResetClicked()
             }
 
         builder.setTitle(R.string.reset_your_internet_title)
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index fe90a2a25b8..2dc5b2d60d6 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -46,8 +46,6 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
                 restrictedSwitchPreference.setVisible(true);
                 if (mUserCaps.mDisallowAddUserSetByAdmin) {
                     restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
-                } else if (mUserCaps.mDisallowAddUser) {
-                    restrictedSwitchPreference.setVisible(false);
                 }
             } else {
                 restrictedSwitchPreference.setDisabledByAdmin(
@@ -62,7 +60,11 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
         if (!mUserCaps.isAdmin()) {
             return DISABLED_FOR_USER;
         } else if (android.multiuser.Flags.newMultiuserSettingsUx()) {
-            return AVAILABLE;
+            if (mUserCaps.mDisallowAddUser && !mUserCaps.mDisallowAddUserSetByAdmin) {
+                return DISABLED_FOR_USER;
+            } else {
+                return AVAILABLE;
+            }
         } else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
             return DISABLED_FOR_USER;
         } else {
diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java
index 60e92a8c2ce..9dd1f84c86a 100644
--- a/src/com/android/settings/users/UserCapabilities.java
+++ b/src/com/android/settings/users/UserCapabilities.java
@@ -36,6 +36,7 @@ public class UserCapabilities {
     boolean mIsAdmin;
     boolean mIsGuest;
     boolean mIsEphemeral;
+    boolean mUserSwitchingUiEnabled;
     boolean mUserSwitcherEnabled;
     boolean mCanAddGuest;
     boolean mDisallowAddUser;
@@ -68,7 +69,8 @@ public class UserCapabilities {
         caps.mCanAddRestrictedProfile =
                 offerRestricted && !dpm.isDeviceManaged() && userManager.isUserTypeEnabled(
                         UserManager.USER_TYPE_FULL_RESTRICTED);
-
+        caps.mUserSwitchingUiEnabled = context.getResources().getBoolean(
+                com.android.internal.R.bool.config_allowChangeUserSwitcherEnabled);
         caps.updateAddUserCapabilities(context);
         return caps;
     }
@@ -134,6 +136,7 @@ public class UserCapabilities {
                 ", mEnforcedAdmin=" + mEnforcedAdmin +
                 ", mDisallowSwitchUser=" + mDisallowSwitchUser +
                 ", mDisallowAddUserSetByAdmin=" + mDisallowAddUserSetByAdmin +
+                ", mUserSwitchingUiEnabled=" + mUserSwitchingUiEnabled +
                 ", mUserSwitcherEnabled=" + mUserSwitcherEnabled +
                 '}';
     }
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 8afab9678f4..ec4a4ff2558 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -354,6 +354,8 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
 
         mGrantAdminPref.setChecked(mUserInfo.isAdmin());
 
+        mSwitchUserPref.setVisible(mUserCaps.mUserSwitchingUiEnabled);
+
         mSwitchUserPref.setTitle(
                 context.getString(com.android.settingslib.R.string.user_switch_to_user,
                         mUserInfo.name));
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index a0137df728f..28d2f4f33bd 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -287,7 +287,7 @@ public class UserSettings extends SettingsPreferenceFragment
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
         switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title));
-        if (!mUserCaps.mIsGuest) {
+        if (!mUserCaps.mIsGuest && mUserCaps.mUserSwitchingUiEnabled) {
             switchBar.show();
         } else {
             switchBar.hide();
@@ -465,7 +465,7 @@ public class UserSettings extends SettingsPreferenceFragment
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         int pos = 0;
         if (!isCurrentUserAdmin() && (canSwitchUserNow() || Flags.newMultiuserSettingsUx())
-                && !isCurrentUserGuest()) {
+                && !isCurrentUserGuest() && !mUserManager.isProfile()) {
             String nickname = mUserManager.getUserName();
             MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
                     getResources().getString(R.string.user_remove_user_menu, nickname));
@@ -1834,6 +1834,24 @@ public class UserSettings extends SettingsPreferenceFragment
                             MultiUserSwitchBarController.class.getName();
 
                     rawData.add(allowMultipleUsersResult);
+
+                    SearchIndexableRaw addUserData = new SearchIndexableRaw(context);
+                    addUserData.key = KEY_ADD_USER;
+
+                    // Dynamically set the title of addUser preference
+                    final UserCapabilities userCaps = UserCapabilities.create(context);
+                    if (!userCaps.mCanAddRestrictedProfile) {
+                        addUserData.title = context.getString(
+                                com.android.settingslib.R.string.user_add_user);
+                    } else {
+                        addUserData.title = context.getString(
+                                R.string.user_add_user_or_profile_menu);
+                    }
+                    addUserData.screenTitle = context.getString(R.string.user_settings_title);
+                    addUserData.iconResId = R.drawable.ic_add_40dp;
+
+                    rawData.add(addUserData);
+
                     return rawData;
                 }
 
@@ -1842,6 +1860,10 @@ public class UserSettings extends SettingsPreferenceFragment
                         boolean suppressAllPage) {
                     final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
                             suppressAllPage);
+                    if (TextUtils.isEmpty(context.getString(
+                            com.android.internal.R.string.config_supervisedUserCreationPackage))) {
+                        niks.add(KEY_ADD_SUPERVISED_USER);
+                    }
                     AddUserWhenLockedPreferenceController controller =
                             new AddUserWhenLockedPreferenceController(
                                     context, KEY_ADD_USER_WHEN_LOCKED);
diff --git a/src/com/android/settings/utils/ContextUtils.kt b/src/com/android/settings/utils/ContextUtils.kt
new file mode 100644
index 00000000000..76b13906ad8
--- /dev/null
+++ b/src/com/android/settings/utils/ContextUtils.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import java.util.Locale
+
+/** Returns the locale of context. */
+fun Context.getLocale(): Locale {
+    val configuration = resources.configuration ?: return Locale.getDefault()
+    val locales = configuration.locales
+    return if (locales.isEmpty) configuration.locale else locales.get(0)
+}
diff --git a/src/com/android/settings/utils/IntentUtils.kt b/src/com/android/settings/utils/IntentUtils.kt
new file mode 100644
index 00000000000..dbdfa23ce06
--- /dev/null
+++ b/src/com/android/settings/utils/IntentUtils.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.Activity
+import android.content.Context
+import android.content.Intent
+import com.android.settings.SettingsActivity
+
+/**
+ * Returns the [Intent] to start given settings activity and locate the preference.
+ *
+ * @param context context
+ * @param activityClass activity to start
+ * @param key preference key to locate
+ */
+fun makeLaunchIntent(context: Context, activityClass: Class<out Activity>, key: String?) =
+    Intent(context, activityClass).apply {
+        if (key != null) putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)
+    }
diff --git a/src/com/android/settings/vpn2/AppDialog.java b/src/com/android/settings/vpn2/AppDialog.java
index 815b28bf27b..b1229992855 100644
--- a/src/com/android/settings/vpn2/AppDialog.java
+++ b/src/com/android/settings/vpn2/AppDialog.java
@@ -56,7 +56,7 @@ class AppDialog extends AlertDialog implements DialogInterface.OnClickListener {
     @Override
     protected void onCreate(Bundle savedState) {
         setTitle(mLabel);
-        setMessage(getContext().getString(R.string.vpn_version, mPackageInfo.versionName));
+        setMessage(getContext().getString(R.string.vpn_version_info, mPackageInfo.versionName));
 
         createButtons();
         super.onCreate(savedState);
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 82ef58bb145..68b44695264 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -29,10 +29,12 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceGroupAdapter;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
@@ -41,40 +43,35 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.accessibility.AccessibilityUtil;
+import com.android.settingslib.widget.SettingsPreferenceGroupAdapter;
+import com.android.settingslib.widget.SettingsThemeHelper;
 
 import com.google.android.material.appbar.AppBarLayout;
 
-public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
+public class HighlightablePreferenceGroupAdapter extends SettingsPreferenceGroupAdapter {
 
     private static final String TAG = "HighlightableAdapter";
-    @VisibleForTesting
-    static final long DELAY_COLLAPSE_DURATION_MILLIS = 300L;
-    @VisibleForTesting
-    static final long DELAY_HIGHLIGHT_DURATION_MILLIS = 600L;
-    @VisibleForTesting
-    static final long DELAY_HIGHLIGHT_DURATION_MILLIS_A11Y = 300L;
+    @VisibleForTesting static final long DELAY_COLLAPSE_DURATION_MILLIS = 300L;
+    @VisibleForTesting static final long DELAY_HIGHLIGHT_DURATION_MILLIS = 600L;
+    @VisibleForTesting static final long DELAY_HIGHLIGHT_DURATION_MILLIS_A11Y = 300L;
     private static final long HIGHLIGHT_DURATION = 15000L;
     private static final long HIGHLIGHT_FADE_OUT_DURATION = 500L;
     private static final long HIGHLIGHT_FADE_IN_DURATION = 200L;
 
-    @VisibleForTesting
-    final int mHighlightColor;
-    @VisibleForTesting
-    boolean mFadeInAnimated;
+    @VisibleForTesting @DrawableRes final int mHighlightBackgroundRes;
+    @VisibleForTesting boolean mFadeInAnimated;
 
     private final Context mContext;
-    private final int mNormalBackgroundRes;
-    private final String mHighlightKey;
+    private final @DrawableRes int mNormalBackgroundRes;
+    private final @Nullable String mHighlightKey;
     private boolean mHighlightRequested;
     private int mHighlightPosition = RecyclerView.NO_POSITION;
 
-
     /**
      * Tries to override initial expanded child count.
-     * <p/>
-     * Initial expanded child count will be ignored if:
-     * 1. fragment contains request to highlight a particular row.
-     * 2. count value is invalid.
+     *
+     * <p>Initial expanded child count will be ignored if: 1. fragment contains request to highlight
+     * a particular row. 2. count value is invalid.
      */
     public static void adjustInitialExpandedChildCount(SettingsPreferenceFragment host) {
         if (host == null) {
@@ -101,21 +98,21 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
         screen.setInitialExpandedChildrenCount(initialCount);
     }
 
-    public HighlightablePreferenceGroupAdapter(PreferenceGroup preferenceGroup, String key,
+    public HighlightablePreferenceGroupAdapter(
+            @NonNull PreferenceGroup preferenceGroup,
+            @Nullable String key,
             boolean highlightRequested) {
         super(preferenceGroup);
         mHighlightKey = key;
         mHighlightRequested = highlightRequested;
         mContext = preferenceGroup.getContext();
         final TypedValue outValue = new TypedValue();
-        mContext.getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
-                outValue, true /* resolveRefs */);
-        mNormalBackgroundRes = outValue.resourceId;
-        mHighlightColor = mContext.getColor(R.color.preference_highlight_color);
+        mNormalBackgroundRes = R.drawable.preference_background;
+        mHighlightBackgroundRes = R.drawable.preference_background_highlighted;
     }
 
     @Override
-    public void onBindViewHolder(PreferenceViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull PreferenceViewHolder holder, int position) {
         super.onBindViewHolder(holder, position);
         updateBackground(holder, position);
     }
@@ -123,22 +120,23 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
     @VisibleForTesting
     void updateBackground(PreferenceViewHolder holder, int position) {
         View v = holder.itemView;
-        if (position == mHighlightPosition
-                && (mHighlightKey != null
-                && TextUtils.equals(mHighlightKey, getItem(position).getKey()))
+        Preference preference = getItem(position);
+        if (preference != null
+                && position == mHighlightPosition
+                && (mHighlightKey != null && TextUtils.equals(mHighlightKey, preference.getKey()))
                 && v.isShown()) {
             // This position should be highlighted. If it's highlighted before - skip animation.
             v.requestAccessibilityFocus();
-            addHighlightBackground(holder, !mFadeInAnimated);
+            addHighlightBackground(holder, !mFadeInAnimated, position);
         } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) {
             // View with highlight is reused for a view that should not have highlight
-            removeHighlightBackground(holder, false /* animate */);
+            removeHighlightBackground(holder, false /* animate */, position);
         }
     }
 
     /**
-     * A function can highlight a specific setting in recycler view.
-     * note: Before highlighting a setting, screen collapses tool bar with an animation.
+     * A function can highlight a specific setting in recycler view. note: Before highlighting a
+     * setting, screen collapses tool bar with an animation.
      */
     public void requestHighlight(View root, RecyclerView recyclerView, AppBarLayout appBarLayout) {
         if (mHighlightRequested || recyclerView == null || TextUtils.isEmpty(mHighlightKey)) {
@@ -153,21 +151,24 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
         mHighlightRequested = true;
         // Collapse app bar after 300 milliseconds.
         if (appBarLayout != null) {
-            root.postDelayed(() -> {
-                appBarLayout.setExpanded(false, true);
-            }, DELAY_COLLAPSE_DURATION_MILLIS);
+            root.postDelayed(
+                    () -> appBarLayout.setExpanded(false, true),
+                    DELAY_COLLAPSE_DURATION_MILLIS);
         }
 
         // Remove the animator as early as possible to avoid a RecyclerView crash.
         recyclerView.setItemAnimator(null);
         // Scroll to correct position after a short delay.
-        root.postDelayed(() -> {
-            if (ensureHighlightPosition()) {
-                recyclerView.smoothScrollToPosition(mHighlightPosition);
-                highlightAndFocusTargetItem(recyclerView, mHighlightPosition);
-            }
-        }, AccessibilityUtil.isTouchExploreEnabled(mContext)
-                ? DELAY_HIGHLIGHT_DURATION_MILLIS_A11Y : DELAY_HIGHLIGHT_DURATION_MILLIS);
+        root.postDelayed(
+                () -> {
+                    if (ensureHighlightPosition()) {
+                        recyclerView.smoothScrollToPosition(mHighlightPosition);
+                        highlightAndFocusTargetItem(recyclerView, mHighlightPosition);
+                    }
+                },
+                AccessibilityUtil.isTouchExploreEnabled(mContext)
+                        ? DELAY_HIGHLIGHT_DURATION_MILLIS_A11Y
+                        : DELAY_HIGHLIGHT_DURATION_MILLIS);
     }
 
     private void highlightAndFocusTargetItem(RecyclerView recyclerView, int highlightPosition) {
@@ -176,20 +177,23 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
             notifyItemChanged(mHighlightPosition);
             target.itemView.requestFocus();
         } else { // otherwise we're about to scroll to that view (but we might not be scrolling yet)
-            recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-                @Override
-                public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                    if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                        notifyItemChanged(mHighlightPosition);
-                        ViewHolder target = recyclerView
-                                .findViewHolderForAdapterPosition(highlightPosition);
-                        if (target != null) {
-                            target.itemView.requestFocus();
+            recyclerView.addOnScrollListener(
+                    new RecyclerView.OnScrollListener() {
+                        @Override
+                        public void onScrollStateChanged(
+                                @NonNull RecyclerView recyclerView, int newState) {
+                            if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                                notifyItemChanged(mHighlightPosition);
+                                ViewHolder target =
+                                        recyclerView.findViewHolderForAdapterPosition(
+                                                highlightPosition);
+                                if (target != null) {
+                                    target.itemView.requestFocus();
+                                }
+                                recyclerView.removeOnScrollListener(this);
+                            }
                         }
-                        recyclerView.removeOnScrollListener(this);
-                    }
-                }
-            });
+                    });
         }
     }
 
@@ -216,44 +220,54 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
     }
 
     @VisibleForTesting
-    void requestRemoveHighlightDelayed(PreferenceViewHolder holder) {
+    void requestRemoveHighlightDelayed(PreferenceViewHolder holder, int position) {
         final View v = holder.itemView;
-        v.postDelayed(() -> {
-            mHighlightPosition = RecyclerView.NO_POSITION;
-            removeHighlightBackground(holder, true /* animate */);
-        }, HIGHLIGHT_DURATION);
+        v.postDelayed(
+                () -> {
+                    mHighlightPosition = RecyclerView.NO_POSITION;
+                    removeHighlightBackground(holder, true /* animate */, position);
+                },
+                HIGHLIGHT_DURATION);
     }
 
-    private void addHighlightBackground(PreferenceViewHolder holder, boolean animate) {
+    private void addHighlightBackground(
+            PreferenceViewHolder holder, boolean animate, int position) {
         final View v = holder.itemView;
         v.setTag(R.id.preference_highlighted, true);
+        final int backgroundFrom = getBackgroundRes(position, false);
+        final int backgroundTo = getBackgroundRes(position, true);
+
         if (!animate) {
-            v.setBackgroundColor(mHighlightColor);
+            v.setBackgroundResource(backgroundTo);
             Log.d(TAG, "AddHighlight: Not animation requested - setting highlight background");
-            requestRemoveHighlightDelayed(holder);
+            requestRemoveHighlightDelayed(holder, position);
             return;
         }
         mFadeInAnimated = true;
-        final int colorFrom = mNormalBackgroundRes;
-        final int colorTo = mHighlightColor;
-        final ValueAnimator fadeInLoop = ValueAnimator.ofObject(
-                new ArgbEvaluator(), colorFrom, colorTo);
+
+        // TODO(b/377561018): Fix fade-in animation
+        final ValueAnimator fadeInLoop =
+                ValueAnimator.ofObject(new ArgbEvaluator(), backgroundFrom, backgroundTo);
         fadeInLoop.setDuration(HIGHLIGHT_FADE_IN_DURATION);
         fadeInLoop.addUpdateListener(
-                animator -> v.setBackgroundColor((int) animator.getAnimatedValue()));
+                animator -> v.setBackgroundResource((int) animator.getAnimatedValue()));
         fadeInLoop.setRepeatMode(ValueAnimator.REVERSE);
         fadeInLoop.setRepeatCount(4);
         fadeInLoop.start();
         Log.d(TAG, "AddHighlight: starting fade in animation");
         holder.setIsRecyclable(false);
-        requestRemoveHighlightDelayed(holder);
+        requestRemoveHighlightDelayed(holder, position);
     }
 
-    private void removeHighlightBackground(PreferenceViewHolder holder, boolean animate) {
+    private void removeHighlightBackground(
+            PreferenceViewHolder holder, boolean animate, int position) {
         final View v = holder.itemView;
+        int backgroundFrom = getBackgroundRes(position, true);
+        int backgroundTo = getBackgroundRes(position, false);
+
         if (!animate) {
             v.setTag(R.id.preference_highlighted, false);
-            v.setBackgroundResource(mNormalBackgroundRes);
+            v.setBackgroundResource(backgroundTo);
             Log.d(TAG, "RemoveHighlight: No animation requested - setting normal background");
             return;
         }
@@ -263,25 +277,33 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
             Log.d(TAG, "RemoveHighlight: Not highlighted - skipping");
             return;
         }
-        int colorFrom = mHighlightColor;
-        int colorTo = mNormalBackgroundRes;
 
         v.setTag(R.id.preference_highlighted, false);
-        final ValueAnimator colorAnimation = ValueAnimator.ofObject(
-                new ArgbEvaluator(), colorFrom, colorTo);
+        // TODO(b/377561018): Fix fade-out animation
+        final ValueAnimator colorAnimation =
+                ValueAnimator.ofObject(new ArgbEvaluator(), backgroundFrom, backgroundTo);
         colorAnimation.setDuration(HIGHLIGHT_FADE_OUT_DURATION);
         colorAnimation.addUpdateListener(
-                animator -> v.setBackgroundColor((int) animator.getAnimatedValue()));
-        colorAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                // Animation complete - the background is now white. Change to mNormalBackgroundRes
-                // so it is white and has ripple on touch.
-                v.setBackgroundResource(mNormalBackgroundRes);
-                holder.setIsRecyclable(true);
-            }
-        });
+                animator -> v.setBackgroundResource((int) animator.getAnimatedValue()));
+        colorAnimation.addListener(
+                new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(@NonNull Animator animation) {
+                        // Animation complete - the background needs to be the target background.
+                        v.setBackgroundResource(backgroundTo);
+                        holder.setIsRecyclable(true);
+                    }
+                });
         colorAnimation.start();
         Log.d(TAG, "Starting fade out animation");
     }
+
+    private @DrawableRes int getBackgroundRes(int position, boolean isHighlighted) {
+        if (SettingsThemeHelper.isExpressiveTheme(mContext)) {
+            Log.d(TAG, "[Expressive Theme] get rounded background, highlight = " + isHighlighted);
+            return getRoundCornerDrawableRes(position, false, isHighlighted);
+        } else {
+            return (isHighlighted) ? mHighlightBackgroundRes : mNormalBackgroundRes;
+        }
+    }
 }
diff --git a/src/com/android/settings/widget/LabeledSeekBarPreference.java b/src/com/android/settings/widget/LabeledSeekBarPreference.java
index 6300bd3b318..88ffa6b8f68 100644
--- a/src/com/android/settings/widget/LabeledSeekBarPreference.java
+++ b/src/com/android/settings/widget/LabeledSeekBarPreference.java
@@ -56,10 +56,10 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
     private final int mTextStartId;
     private final int mTextEndId;
     private final int mTickMarkId;
-    private final int mIconStartId;
-    private final int mIconEndId;
-    private final int mIconStartContentDescriptionId;
-    private final int mIconEndContentDescriptionId;
+    private int mIconStartId;
+    private int mIconEndId;
+    private int mIconStartContentDescriptionId;
+    private int mIconEndContentDescriptionId;
     private OnPreferenceChangeListener mStopListener;
     private SeekBar.OnSeekBarChangeListener mSeekBarChangeListener;
 
@@ -110,6 +110,38 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
         return mSeekBar;
     }
 
+    /** Set the start icon of the Seekbar. */
+    public void setIconStart(int iconStartId) {
+        if (mIconStartId != iconStartId) {
+            mIconStartId = iconStartId;
+            notifyChanged();
+        }
+    }
+
+    /** Set the description resource id of the start icon. */
+    public void setIconStartContentDescription(int iconStartContentDescriptionId) {
+        if (mIconStartContentDescriptionId != iconStartContentDescriptionId) {
+            mIconStartContentDescriptionId = iconStartContentDescriptionId;
+            notifyChanged();
+        }
+    }
+
+    /** Set the end icon of the Seekbar. */
+    public void setIconEnd(int iconEndId) {
+        if (mIconEndId != iconEndId) {
+            mIconEndId = iconEndId;
+            notifyChanged();
+        }
+    }
+
+    /** Set the description resource id of the end icon. */
+    public void setIconEndContentDescription(int iconEndContentDescriptionId) {
+        if (mIconEndContentDescriptionId != iconEndContentDescriptionId) {
+            mIconEndContentDescriptionId = iconEndContentDescriptionId;
+            notifyChanged();
+        }
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
diff --git a/src/com/android/settings/widget/MainSwitchBarMetadata.kt b/src/com/android/settings/widget/MainSwitchBarMetadata.kt
new file mode 100644
index 00000000000..f55cfd03789
--- /dev/null
+++ b/src/com/android/settings/widget/MainSwitchBarMetadata.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget
+
+import android.content.Context
+import androidx.preference.Preference
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.TwoStatePreference
+import com.android.settingslib.preference.PreferenceBindingPlaceholder
+import com.android.settingslib.preference.TwoStatePreferenceBinding
+
+/** Base metadata of `MainSwitchBar`. */
+interface MainSwitchBarMetadata :
+    TwoStatePreference, TwoStatePreferenceBinding, PreferenceBindingPlaceholder {
+
+    override fun createWidget(context: Context) = MainSwitchBarPreference(context, this)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as MainSwitchBarPreference).updateVisibility()
+    }
+}
diff --git a/src/com/android/settings/widget/MainSwitchBarPreference.kt b/src/com/android/settings/widget/MainSwitchBarPreference.kt
new file mode 100644
index 00000000000..6ed887790c8
--- /dev/null
+++ b/src/com/android/settings/widget/MainSwitchBarPreference.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.widget.CompoundButton
+import android.widget.CompoundButton.OnCheckedChangeListener
+import androidx.preference.TwoStatePreference
+import com.android.settings.SettingsActivity
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.widget.MainSwitchBar
+
+/** Preference abstraction of the [MainSwitchBar] in settings activity. */
+class MainSwitchBarPreference(context: Context, private val metadata: MainSwitchBarMetadata) :
+    TwoStatePreference(context), OnCheckedChangeListener {
+
+    private val mainSwitchBar: MainSwitchBar = (context as SettingsActivity).switchBar
+
+    override fun setTitle(title: CharSequence?) {
+        mainSwitchBar.setTitle(title)
+    }
+
+    override fun setSummary(summary: CharSequence?) {
+        mainSwitchBar.setSummary(summary)
+    }
+
+    override fun setEnabled(enabled: Boolean) {
+        mainSwitchBar.isEnabled = enabled
+    }
+
+    // Preference.setVisible is final, we cannot override it
+    fun updateVisibility() {
+        // always make preference invisible, the UI visibility is reflected on MainSwitchBar
+        isVisible = false
+        if ((metadata as? PreferenceAvailabilityProvider)?.isAvailable(context) != false) {
+            mainSwitchBar.show()
+        } else {
+            mainSwitchBar.hide()
+        }
+    }
+
+    override fun setChecked(checked: Boolean) {
+        // remove listener to update UI only
+        mainSwitchBar.removeOnSwitchChangeListener(this)
+        mainSwitchBar.isChecked = checked
+        mainSwitchBar.addOnSwitchChangeListener(this)
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        mainSwitchBar.addOnSwitchChangeListener(this)
+    }
+
+    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
+        // prevent user from toggling the switch before data store operation is done
+        isEnabled = false
+        // once data store is updated, isEnabled will be reset due to rebind
+        persistBoolean(isChecked)
+    }
+
+    override fun onDetached() {
+        mainSwitchBar.removeOnSwitchChangeListener(this)
+        super.onDetached()
+    }
+}
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index d68a91afca8..121458c714a 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -86,7 +86,13 @@ public abstract class RadioButtonPickerFragment extends SettingsPreferenceFragme
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
+        if (isCatalystEnabled()) {
+            PreferenceScreen preferenceScreen = createPreferenceScreen();
+            setPreferenceScreen(preferenceScreen);
+            updateActivityTitleWithScreenTitle(preferenceScreen);
+        } else {
+            super.onCreatePreferences(savedInstanceState, rootKey);
+        }
         try {
             // Check if the xml specifies if static preferences should go on the top or bottom
             final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(getContext(),
diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java
index c76a5de4535..86552422467 100644
--- a/src/com/android/settings/widget/RestrictedAppPreference.java
+++ b/src/com/android/settings/widget/RestrictedAppPreference.java
@@ -27,6 +27,7 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 import com.android.settingslib.widget.AppPreference;
 
 /**
@@ -34,7 +35,8 @@ import com.android.settingslib.widget.AppPreference;
  * {@link com.android.settingslib.RestrictedPreferenceHelper}.
  * Used to show policy transparency on {@link AppPreference}.
  */
-public class RestrictedAppPreference extends AppPreference {
+public class RestrictedAppPreference extends AppPreference implements
+        RestrictedPreferenceHelperProvider {
     private RestrictedPreferenceHelper mHelper;
     private String userRestriction;
 
@@ -58,6 +60,11 @@ public class RestrictedAppPreference extends AppPreference {
         this.userRestriction = userRestriction;
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mHelper;
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 9f6d787e841..046320fe376 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -23,13 +23,16 @@ import android.util.AttributeSet;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import androidx.annotation.NonNull;
 import androidx.preference.PreferenceViewHolder;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
 import com.android.settings.widget.SettingsMainSwitchBar.OnBeforeCheckedChangeListener;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 import com.android.settingslib.core.instrumentation.SettingsJankMonitor;
+import com.android.settingslib.widget.GroupSectionDividerMixin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +43,7 @@ import java.util.List;
  * to enable or disable the preferences on the page.
  */
 public class SettingsMainSwitchPreference extends TwoStatePreference implements
-        OnCheckedChangeListener {
+        OnCheckedChangeListener, RestrictedPreferenceHelperProvider, GroupSectionDividerMixin {
 
     private final List<OnBeforeCheckedChangeListener> mBeforeCheckedChangeListeners =
             new ArrayList<>();
@@ -71,6 +74,11 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
         init(context, attrs);
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mRestrictedHelper;
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
@@ -232,6 +240,11 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
         if (mMainSwitchBar != null) {
             mMainSwitchBar.setTitle(getTitle());
             mMainSwitchBar.setDisabledByAdmin(mEnforcedAdmin);
+
+            // Disable the focusability of the switch bar. The parent FrameLayout
+            // will be the only focusable view for the Main Switch Bar to avoid
+            // duplicate a11y focus.
+            mMainSwitchBar.setFocusable(false);
         }
     }
 
diff --git a/src/com/android/settings/wifi/WifiSwitchPreference.kt b/src/com/android/settings/wifi/WifiSwitchPreference.kt
new file mode 100644
index 00000000000..2a18d3f5616
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSwitchPreference.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.wifi.WifiManager
+import android.os.UserManager
+import android.provider.Settings
+import android.util.Log
+import android.widget.Toast
+import androidx.preference.Preference
+import androidx.preference.Preference.OnPreferenceChangeListener
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.network.SatelliteRepository
+import com.android.settings.network.SatelliteWarningDialogActivity
+import com.android.settingslib.RestrictedSwitchPreference
+import com.android.settingslib.WirelessUtils
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import com.android.settingslib.preference.SwitchPreferenceBinding
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+// LINT.IfChange
+class WifiSwitchPreference :
+    SwitchPreference(KEY, R.string.wifi),
+    SwitchPreferenceBinding,
+    OnPreferenceChangeListener,
+    PreferenceLifecycleProvider,
+    PreferenceRestrictionMixin {
+
+    override val keywords: Int
+        get() = R.string.keywords_wifi
+
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_CHANGE_WIFI_STATE)
+
+    override val useAdminDisabledSummary: Boolean
+        get() = true
+
+    override fun createWidget(context: Context) = RestrictedSwitchPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.onPreferenceChangeListener = this
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        val context = preference.context
+
+        // Show dialog and do nothing under satellite mode.
+        if (context.isSatelliteOn()) {
+            context.startActivity(
+                Intent(context, SatelliteWarningDialogActivity::class.java)
+                    .putExtra(
+                        SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG,
+                        SatelliteWarningDialogActivity.TYPE_IS_WIFI,
+                    )
+            )
+            return false
+        }
+
+        // Show toast message if Wi-Fi is not allowed in airplane mode
+        if (newValue == true && !context.isRadioAllowed()) {
+            Toast.makeText(context, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show()
+            return false
+        }
+
+        return true
+    }
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        when {
+            (value == true && !context.isRadioAllowed()) || context.isSatelliteOn() ->
+                ReadWritePermit.DISALLOW
+            else -> ReadWritePermit.ALLOW
+        }
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.LOW_SENSITIVITY
+
+    override fun storage(context: Context): KeyValueStore = WifiSwitchStore(context)
+
+    @Suppress("UNCHECKED_CAST")
+    private class WifiSwitchStore(private val context: Context) :
+        AbstractKeyedDataObservable<String>(), KeyValueStore {
+
+        private var broadcastReceiver: BroadcastReceiver? = null
+
+        override fun contains(key: String) =
+            key == KEY && context.getSystemService(WifiManager::class.java) != null
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
+            context.getSystemService(WifiManager::class.java)?.isWifiEnabled as T?
+
+        @Suppress("DEPRECATION")
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value is Boolean) {
+                context.getSystemService(WifiManager::class.java)?.isWifiEnabled = value
+            }
+        }
+
+        override fun onFirstObserverAdded() {
+            broadcastReceiver =
+                object : BroadcastReceiver() {
+                    override fun onReceive(context: Context, intent: Intent) {
+                        val wifiState = intent.wifiState
+                        // do not notify for enabling/disabling state
+                        if (
+                            wifiState == WifiManager.WIFI_STATE_ENABLED ||
+                                wifiState == WifiManager.WIFI_STATE_DISABLED
+                        ) {
+                            notifyChange(KEY, DataChangeReason.UPDATE)
+                        }
+                    }
+                }
+            context.registerReceiver(
+                broadcastReceiver,
+                IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION),
+            )
+        }
+
+        override fun onLastObserverRemoved() {
+            broadcastReceiver?.let { context.unregisterReceiver(it) }
+        }
+    }
+
+    companion object {
+        const val TAG = "WifiSwitchPreference"
+        const val KEY = "main_toggle_wifi"
+
+        private fun Context.isRadioAllowed() =
+            WirelessUtils.isRadioAllowed(this, Settings.Global.RADIO_WIFI)
+
+        private fun Context.isSatelliteOn() =
+            try {
+                SatelliteRepository(this)
+                    .requestIsSessionStarted(Executors.newSingleThreadExecutor())
+                    .get(2000, TimeUnit.MILLISECONDS)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error to get satellite status : $e")
+                false
+            }
+
+        private val Intent.wifiState
+            get() = getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN)
+    }
+}
+// LINT.ThenChange(WifiSwitchPreferenceController.java)
diff --git a/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt b/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
new file mode 100644
index 00000000000..f6056f4ce8f
--- /dev/null
+++ b/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.calling
+
+import android.content.Context
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import android.telephony.ims.ImsMmTelManager
+import android.util.Log
+import com.android.settings.R
+import com.android.settings.network.ims.WifiCallingQueryImsState
+import com.android.settings.network.telephony.wificalling.WifiCallingRepository
+import com.android.settings.widget.SettingsMainSwitchPreference
+import com.android.settings.wifi.calling.WifiCallingSettingsForSub.getCarrierActivityIntent
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.NoOpKeyedObservable
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.TwoStatePreference
+import com.android.settingslib.preference.TwoStatePreferenceBinding
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+
+/**
+ * Metadata of the "Use Wi-Fi calling" preference.
+ *
+ * TODO(b/372732219): apply metadata to UI
+ */
+class WifiCallingMainSwitchPreference(private val subId: Int) :
+    TwoStatePreference, TwoStatePreferenceBinding, PreferenceAvailabilityProvider {
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.wifi_calling_main_switch_title
+
+    override fun isEnabled(context: Context) =
+        context.isCallStateIdle(subId) &&
+            WifiCallingQueryImsState(context, subId).isAllowUserControl
+
+    override fun isAvailable(context: Context) =
+        SubscriptionManager.isValidSubscriptionId(subId) &&
+            runBlocking { WifiCallingRepository(context, subId).wifiCallingReadyFlow().first() }
+
+    override fun createWidget(context: Context) = SettingsMainSwitchPreference(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        when {
+            value == true &&
+                (DisclaimerItemFactory.create(context, subId).isNotEmpty() ||
+                    getCarrierActivityIntent(context, subId) != null) ->
+                ReadWritePermit.REQUIRE_USER_AGREEMENT
+            else -> ReadWritePermit.ALLOW
+        }
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    override fun storage(context: Context): KeyValueStore = WifiCallingStore(context, subId)
+
+    @Suppress("UNCHECKED_CAST")
+    private class WifiCallingStore(context: Context, private val subId: Int) :
+        NoOpKeyedObservable<String>(), KeyValueStore {
+        private val queryIms = WifiCallingQueryImsState(context, subId)
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>) =
+            (queryIms.isEnabledByUser && queryIms.isAllowUserControl) as T
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value is Boolean) {
+                try {
+                    ImsMmTelManager.createForSubscriptionId(subId).isVoWiFiSettingEnabled = value
+                } catch (e: Exception) {
+                    Log.w(TAG, "fail to enable wifi calling", e)
+                }
+            }
+        }
+    }
+
+    companion object {
+        // TODO(b/372732219): The key is different from XML to avoid applying metadata to UI.
+        const val KEY = "wifi_calling_switch"
+        const val TAG = KEY
+
+        private fun Context.isCallStateIdle(subId: Int) =
+            getSystemService(TelephonyManager::class.java)?.getCallState(subId) ==
+                TelephonyManager.CALL_STATE_IDLE
+    }
+}
diff --git a/src/com/android/settings/wifi/calling/WifiCallingScreen.kt b/src/com/android/settings/wifi/calling/WifiCallingScreen.kt
new file mode 100644
index 00000000000..6ab5e564f06
--- /dev/null
+++ b/src/com/android/settings/wifi/calling/WifiCallingScreen.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.calling
+
+import android.content.Context
+import android.telephony.SubscriptionManager
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class WifiCallingScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.wifi_calling_settings_title
+
+    override val summary: Int
+        get() = R.string.wifi_calling_summary
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystWifiCalling()
+
+    override fun fragmentClass() = WifiCallingSettingsForSub::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            val subId = SubscriptionManager.getDefaultSubscriptionId()
+            if (SubscriptionManager.isValidSubscriptionId(subId)) {
+                +WifiCallingMainSwitchPreference(subId)
+            }
+        }
+
+    companion object {
+        const val KEY = "wifi_calling"
+    }
+}
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index e5581d34b62..46be70dfddb 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -54,9 +54,9 @@ import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.network.telephony.wificalling.IWifiCallingRepository;
 import com.android.settings.network.telephony.wificalling.WifiCallingRepository;
@@ -70,7 +70,7 @@ import java.util.List;
  * This is the inner class of {@link WifiCallingSettings} fragment.
  * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
  */
-public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
+public class WifiCallingSettingsForSub extends DashboardFragment
         implements OnCheckedChangeListener,
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "WifiCallingForSub";
@@ -266,8 +266,6 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.wifi_calling_settings);
-
         // SubId should always be specified when creating this fragment. Either through
         // fragment.setArguments() or through savedInstanceState.
         if (getArguments() != null && getArguments().containsKey(FRAGMENT_BUNDLE_SUBID)) {
@@ -446,6 +444,11 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
         }
     }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.wifi_calling_settings;
+    }
+
     @Override
     public void onPause() {
         super.onPause();
@@ -483,17 +486,21 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
                 .launch();
     }
 
+    private @Nullable Intent getCarrierActivityIntent() {
+        return getCarrierActivityIntent(getActivity(), mSubId);
+    }
+
     /*
      * Get the Intent to launch carrier emergency address management activity.
      * Return null when no activity found.
      */
-    private Intent getCarrierActivityIntent() {
+    static @Nullable Intent getCarrierActivityIntent(Context context, int subId) {
         // Retrieve component name from carrier config
         final CarrierConfigManager configManager =
-                getActivity().getSystemService(CarrierConfigManager.class);
+                context.getSystemService(CarrierConfigManager.class);
         if (configManager == null) return null;
 
-        final PersistableBundle bundle = configManager.getConfigForSubId(mSubId);
+        final PersistableBundle bundle = configManager.getConfigForSubId(subId);
         if (bundle == null) return null;
 
         final String carrierApp = bundle.getString(
@@ -506,7 +513,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
         // Build and return intent
         final Intent intent = new Intent();
         intent.setComponent(componentName);
-        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mSubId);
+        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
         return intent;
     }
 
@@ -571,6 +578,11 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
         }
     }
 
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
     private void updateButtonWfcMode(boolean wfcEnabled,
             int wfcMode, int wfcRoamingMode) {
         mButtonWfcMode.setSummary(getWfcModeSummary(wfcMode));
@@ -716,4 +728,9 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
 
         return mOverrideWfcRoamingModeWhileUsingNtn;
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return WifiCallingScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
index 8888f0dacf5..94a1168dbb7 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
@@ -25,8 +25,6 @@ import android.os.Looper
 import android.os.Process
 import android.os.SimpleClock
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -34,7 +32,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringArrayResource
@@ -44,14 +41,13 @@ import androidx.navigation.navArgument
 import com.android.settings.R
 import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
-import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.ListPreferenceModel
 import com.android.settingslib.spa.widget.preference.ListPreferenceOption
 import com.android.settingslib.spa.widget.preference.RadioPreferences
 import com.android.settingslib.spa.widget.preference.SwitchPreference
 import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
 import com.android.settingslib.spa.widget.scaffold.RegularScaffold
-import com.android.settingslib.spa.widget.ui.CategoryTitle
+import com.android.settingslib.spa.widget.ui.Category
 import com.android.wifitrackerlib.WifiEntry
 import java.time.Clock
 import java.time.ZoneOffset
@@ -123,34 +119,34 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {
 
 @Composable
 fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
-    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
-    CategoryTitle(title = stringResource(R.string.wifi_privacy_device_name_settings))
-    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
-    var checked by remember {
-        mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
-    }
-    val context = LocalContext.current
-    val wifiManager = context.getSystemService(WifiManager::class.java)!!
-    SwitchPreference(object : SwitchPreferenceModel {
-        override val title =
-            context.resources.getString(
-                R.string.wifi_privacy_send_device_name_toggle_title
-            )
-        override val summary =
-            {
-                context.resources.getString(
-                    R.string.wifi_privacy_send_device_name_toggle_summary
-                )
-            }
-        override val checked = { checked }
-        override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
-            wifiEntry.wifiConfiguration?.let {
-                it.isSendDhcpHostnameEnabled = newChecked
-                wifiManager.save(it, null /* listener */)
-                checked = newChecked
-            }
+    val title = stringResource(id = R.string.wifi_privacy_device_name_settings)
+    Category(title = title) {
+        var checked by remember {
+            mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
         }
-    })
+        val context = LocalContext.current
+        val wifiManager = context.getSystemService(WifiManager::class.java)!!
+        SwitchPreference(object : SwitchPreferenceModel {
+            override val title =
+                context.resources.getString(
+                    R.string.wifi_privacy_send_device_name_toggle_title
+                )
+            override val summary =
+                {
+                    context.resources.getString(
+                        R.string.wifi_privacy_send_device_name_toggle_summary
+                    )
+                }
+            override val checked = { checked }
+            override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
+                wifiEntry.wifiConfiguration?.let {
+                    it.isSendDhcpHostnameEnabled = newChecked
+                    wifiManager.save(it, null /* listener */)
+                    checked = newChecked
+                }
+            }
+        })
+    }
 }
 
 fun onSelectedChange(wifiEntry: WifiEntry, privacy: Int) {
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 34948dc69dc..118ff71a519 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.wifi.dpp;
 
+import static android.content.res.Resources.ID_NULL;
 import static android.net.wifi.WifiInfo.sanitizeSsid;
 
 import android.app.Activity;
@@ -101,6 +102,8 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
     // Interval between initiating WifiPickerTracker scans.
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
+    private static final @StringRes int REACHABLE_WIFI_NETWORK = ID_NULL;
+
     private QrCamera mCamera;
     private TextureView mTextureView;
     private QrDecorateView mDecorateView;
@@ -201,8 +204,9 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
                     wifiManager.enableNetwork(id, /* attemptConnect */ false);
                     // WifiTracker only contains a hidden SSID Wi-Fi network if it's saved.
                     // We can't check if a hidden SSID Wi-Fi network is reachable in advance.
-                    if (qrCodeWifiConfiguration.hiddenSSID
-                            || isReachableWifiNetwork(qrCodeWifiConfiguration)) {
+                    @StringRes int wifiReachabilityStringId =
+                            getWifiReachabilityStringId(qrCodeWifiConfiguration);
+                    if (wifiReachabilityStringId == REACHABLE_WIFI_NETWORK) {
                         hasHiddenOrReachableWifiNetwork = true;
                         mEnrolleeWifiConfiguration = qrCodeWifiConfiguration;
                         wifiManager.connect(id,
@@ -210,8 +214,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
                     }
 
                     if (!hasHiddenOrReachableWifiNetwork) {
-                        showErrorMessageAndRestartCamera(
-                                R.string.wifi_dpp_check_connection_try_again);
+                        showErrorMessageAndRestartCamera(wifiReachabilityStringId);
                         return;
                     }
 
@@ -242,7 +245,10 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
         WifiDppUtils.triggerVibrationForQrCodeRecognition(getContext());
     }
 
-    private boolean isReachableWifiNetwork(WifiConfiguration wifiConfiguration) {
+    private @StringRes int getWifiReachabilityStringId(WifiConfiguration wifiConfiguration) {
+        if (wifiConfiguration.hiddenSSID) {
+            return REACHABLE_WIFI_NETWORK;
+        }
         final List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
         final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
         if (connectedWifiEntry != null) {
@@ -250,24 +256,42 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
             wifiEntries.add(connectedWifiEntry);
         }
 
+        boolean canFindNetwork = false;
         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;
+            canFindNetwork = true;
+            int security = WifiDppUtils.getSecurityTypeFromWifiConfiguration(wifiConfiguration);
+            if (isSecurityMatched(security, wifiEntry.getSecurity())) {
+                Log.d(TAG, "WiFi DPP detects connection security for a matching WiFi network.");
+                return REACHABLE_WIFI_NETWORK;
             }
         }
-        return false;
+        if (canFindNetwork) {
+            Log.e(TAG, "WiFi DPP check connection no matched security");
+            return R.string.wifi_dpp_check_connection_no_matched_security;
+        }
+        Log.e(TAG, "WiFi DPP check connection no matched SSID");
+        return R.string.wifi_dpp_check_connection_no_matched_ssid;
+    }
+
+    @VisibleForTesting
+    boolean isSecurityMatched(int qrSecurity, int entrySecurity) {
+        if (qrSecurity == entrySecurity) {
+            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 (qrSecurity == WifiEntry.SECURITY_SAE && entrySecurity == WifiEntry.SECURITY_PSK) {
+            return true;
+        }
+        // If configured is no password, the Wi-Fi framework will attempt OPEN and OWE security.
+        return isNoPasswordSecurity(qrSecurity) && isNoPasswordSecurity(entrySecurity);
+    }
+
+    private boolean isNoPasswordSecurity(int security) {
+        return security == WifiEntry.SECURITY_NONE || security == WifiEntry.SECURITY_OWE;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/wifi/repository/WifiHotspotRepository.java b/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
index 4dc2e9e52f3..b601eb33238 100644
--- a/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
+++ b/src/com/android/settings/wifi/repository/WifiHotspotRepository.java
@@ -356,10 +356,11 @@ public class WifiHotspotRepository {
                 log("setSpeedType(), setBand(BAND_2GHZ)");
                 configBuilder.setBand(BAND_2GHZ);
             }
-            // Set the security type back to WPA2/WPA3 if we're moving from 6GHz to something else.
-            if ((config.getBand() & BAND_6GHZ) != 0) {
-                configBuilder.setPassphrase(
-                        generatePassword(config), SECURITY_TYPE_WPA3_SAE_TRANSITION);
+            // Set the security type back to WPA2/WPA3 if the password is at least 8 characters and
+            // we're moving from 6GHz to something else.
+            String passphrase = generatePassword(config);
+            if ((passphrase.length() >= 8) && (config.getBand() & BAND_6GHZ) != 0) {
+                configBuilder.setPassphrase(passphrase, SECURITY_TYPE_WPA3_SAE_TRANSITION);
             }
         }
         setSoftApConfiguration(configBuilder.build());
diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt b/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
new file mode 100644
index 00000000000..c185e02c949
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.settings.SettingsEnums
+import android.content.Context
+import android.content.Intent
+import android.net.TetheringManager
+import android.net.TetheringManager.TETHERING_WIFI
+import android.net.wifi.WifiClient
+import android.net.wifi.WifiManager
+import android.os.UserManager
+import android.text.BidiFormatter
+import android.util.Log
+import androidx.preference.Preference
+import com.android.settings.PreferenceRestrictionMixin
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settings.core.SubSettingLauncher
+import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
+import com.android.settings.wifi.WifiUtils.canShowWifiHotspot
+import com.android.settingslib.PrimarySwitchPreference
+import com.android.settingslib.TetherUtil
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
+import com.android.settingslib.preference.PreferenceBinding
+import com.android.settingslib.wifi.WifiUtils.Companion.getWifiTetherSummaryForConnectedDevices
+
+// LINT.IfChange
+@Suppress("MissingPermission", "NewApi", "UNCHECKED_CAST")
+class WifiHotspotSwitchPreference(context: Context, dataSaverStore: KeyValueStore) :
+    SwitchPreference(KEY, R.string.wifi_hotspot_checkbox_text),
+    PreferenceBinding,
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceRestrictionMixin {
+
+    private val wifiHotspotStore = WifiHotspotStore(context, dataSaverStore)
+
+    override fun isAvailable(context: Context) =
+        canShowWifiHotspot(context) &&
+            TetherUtil.isTetherAvailable(context) &&
+            !Utils.isMonkeyRunning()
+
+    override fun getSummary(context: Context): CharSequence? =
+        when (context.wifiManager?.wifiApState) {
+            WifiManager.WIFI_AP_STATE_ENABLING -> context.getString(R.string.wifi_tether_starting)
+            WifiManager.WIFI_AP_STATE_ENABLED -> {
+                val sapClientsSize = wifiHotspotStore.sapClientsSize
+                if (sapClientsSize == null) {
+                    context.getString(
+                        R.string.wifi_tether_enabled_subtext,
+                        BidiFormatter.getInstance().unicodeWrap(context.wifiSsid),
+                    )
+                } else {
+                    getWifiTetherSummaryForConnectedDevices(context, sapClientsSize)
+                }
+            }
+            WifiManager.WIFI_AP_STATE_DISABLING -> context.getString(R.string.wifi_tether_stopping)
+            WifiManager.WIFI_AP_STATE_DISABLED ->
+                context.getString(R.string.wifi_hotspot_off_subtext)
+            else ->
+                when (wifiHotspotStore.sapFailureReason) {
+                    WifiManager.SAP_START_FAILURE_NO_CHANNEL ->
+                        context.getString(R.string.wifi_sap_no_channel_error)
+                    else -> context.getString(R.string.wifi_error)
+                }
+        }
+
+    override fun intent(context: Context): Intent? =
+        SubSettingLauncher(context)
+            .apply {
+                setDestination(WifiTetherSettings::class.java.name)
+                setTitleRes(R.string.wifi_hotspot_checkbox_text)
+                setSourceMetricsCategory(SettingsEnums.WIFI_TETHER_SETTINGS)
+            }
+            .toIntent()
+
+    override fun isEnabled(context: Context) =
+        wifiHotspotStore.dataSaverStore.getBoolean(DATA_SAVER_KEY) == true &&
+            super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKeys
+        get() = arrayOf(UserManager.DISALLOW_WIFI_TETHERING)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.HIGH_SENSITIVITY
+
+    override fun createWidget(context: Context) = PrimarySwitchPreference(context)
+
+    override fun storage(context: Context): KeyValueStore = wifiHotspotStore
+
+    private class WifiHotspotStore(
+        private val context: Context,
+        val dataSaverStore: KeyValueStore,
+    ) :
+        AbstractKeyedDataObservable<String>(),
+        KeyValueStore,
+        WifiTetherSoftApManager.WifiTetherSoftApCallback,
+        TetheringManager.StartTetheringCallback,
+        KeyedObserver<String> {
+
+        private var wifiTetherSoftApManager: WifiTetherSoftApManager? = null
+        var sapFailureReason: Int? = null
+        var sapClientsSize: Int? = null
+
+        override fun contains(key: String) =
+            key == KEY && context.wifiManager != null && context.tetheringManager != null
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
+            val wifiApState = context.wifiManager?.wifiApState
+            val value =
+                wifiApState == WifiManager.WIFI_AP_STATE_ENABLING ||
+                    wifiApState == WifiManager.WIFI_AP_STATE_ENABLED
+            return value as T?
+        }
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            if (value !is Boolean) return
+            val tetheringManager = context.tetheringManager ?: return
+            if (value) {
+                tetheringManager.startTethering(TETHERING_WIFI, HandlerExecutor.main, this)
+            } else {
+                tetheringManager.stopTethering(TETHERING_WIFI)
+            }
+        }
+
+        override fun onFirstObserverAdded() {
+            val apManager = WifiTetherSoftApManager(context.wifiManager, this)
+            wifiTetherSoftApManager = apManager
+            apManager.registerSoftApCallback()
+            dataSaverStore.addObserver(DATA_SAVER_KEY, this, HandlerExecutor.main)
+        }
+
+        override fun onLastObserverRemoved() {
+            dataSaverStore.removeObserver(DATA_SAVER_KEY, this)
+            wifiTetherSoftApManager?.unRegisterSoftApCallback()
+        }
+
+        override fun onStateChanged(state: Int, failureReason: Int) {
+            Log.d(TAG, "onStateChanged(),state=$state,failureReason=$failureReason")
+            sapFailureReason = failureReason
+            if (state == WifiManager.WIFI_AP_STATE_DISABLED) sapClientsSize = null
+            notifyChange(KEY, DataChangeReason.UPDATE)
+        }
+
+        override fun onConnectedClientsChanged(clients: List<WifiClient>?) {
+            sapClientsSize = clients?.size ?: 0
+            Log.d(TAG, "onConnectedClientsChanged(),sapClientsSize=$sapClientsSize")
+            notifyChange(KEY, DataChangeReason.UPDATE)
+        }
+
+        override fun onTetheringStarted() {}
+
+        override fun onTetheringFailed(error: Int) {
+            Log.e(TAG, "onTetheringFailed(),error=$error")
+        }
+
+        override fun onKeyChanged(key: String, reason: Int) =
+            notifyChange(KEY, DataChangeReason.UPDATE)
+    }
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        (preference as PrimarySwitchPreference).apply {
+            isChecked = preferenceDataStore!!.getBoolean(key, false)
+        }
+    }
+
+    companion object {
+        const val TAG = "WifiHotspotSwitchPreference"
+        const val KEY = "wifi_tether"
+
+        private val Context.wifiManager: WifiManager?
+            get() = applicationContext.getSystemService(WifiManager::class.java)
+
+        @Suppress("DEPRECATION")
+        private val Context.wifiSsid
+            get() = wifiManager?.softApConfiguration?.ssid
+
+        private val Context.tetheringManager: TetheringManager?
+            get() = applicationContext.getSystemService(TetheringManager::class.java)
+    }
+}
+// LINT.ThenChange(WifiTetherPreferenceController.java)
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 0baac2c063a..d5d075106c5 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -48,6 +48,7 @@ import com.android.settingslib.wifi.WifiUtils;
 
 import java.util.List;
 
+// LINT.IfChange
 public class WifiTetherPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
         SwitchWidgetController.OnSwitchChangeListener {
@@ -251,3 +252,4 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
         return true;
     }
 }
+// LINT.ThenChange(WifiHotspotSwitchPreference.kt)
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index 9febba3b7d0..5ea9b3c8756 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -57,6 +57,9 @@ public class WifiTetherSwitchBarController implements
     private final ConnectivityManager mConnectivityManager;
     private final WifiManager mWifiManager;
 
+    @VisibleForTesting
+    boolean mIsSwitchBusy;
+
     @VisibleForTesting
     DataSaverBackend mDataSaverBackend;
     @VisibleForTesting
@@ -102,8 +105,8 @@ public class WifiTetherSwitchBarController implements
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        // Filter out unnecessary callbacks when switch is disabled.
-        if (!buttonView.isEnabled()) return;
+        // Filter out inappropriate callbacks when switch is busy.
+        if (mIsSwitchBusy) return;
 
         if (isChecked) {
             startTether();
@@ -115,14 +118,14 @@ public class WifiTetherSwitchBarController implements
     void stopTether() {
         if (!isWifiApActivated()) return;
 
-        mSwitchBar.setEnabled(false);
+        mIsSwitchBusy = true;
         mConnectivityManager.stopTethering(TETHERING_WIFI);
     }
 
     void startTether() {
         if (isWifiApActivated()) return;
 
-        mSwitchBar.setEnabled(false);
+        mIsSwitchBusy = true;
         mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
                 mOnStartTetheringCallback, new Handler(Looper.getMainLooper()));
     }
@@ -159,6 +162,7 @@ public class WifiTetherSwitchBarController implements
 
     private void updateWifiSwitch() {
         mSwitchBar.setEnabled(!mDataSaverBackend.isDataSaverEnabled());
+        mIsSwitchBusy = false;
     }
 
     @Override
diff --git a/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java b/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
index 27e67e586c7..9617cfd1a28 100644
--- a/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
+++ b/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.app.Instrumentation;
 import android.provider.Settings;
-import android.provider.SettingsSlicesContract;
 import android.util.Log;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -64,7 +63,7 @@ public class AirplaneModePreferenceControllerComponentTest {
     public void test_on_off_airplane_mode_multiple_times() {
         AirplaneModePreferenceController controller =
                 new AirplaneModePreferenceController(mInstrumentation.getTargetContext(),
-                        SettingsSlicesContract.KEY_AIRPLANE_MODE);
+                        AirplaneModePreference.KEY);
 
         for (int i = 0; i < 10; ++i) {
             Log.d(TAG, "Test #" + (i + 1));
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 3b70def561f..935c687ade3 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -58,6 +58,7 @@ android_robolectric_test {
         "Settings-robo-testutils",
         "Settings-testutils2",
         "SettingsLib-robo-testutils",
+        "SettingsLibPreference-testutils",
         "Settings_robolectric_meta_service_file",
         "aconfig_settings_flags_lib",
         "android.webkit.flags-aconfig-java",
@@ -107,7 +108,10 @@ android_robolectric_test {
 
 java_library {
     name: "Settings-robo-testutils",
-    srcs: ["testutils/**/*.java"],
+    srcs: [
+        "testutils/**/*.java",
+        "testutils/**/*.kt",
+    ],
     libs: [
         "Robolectric_all-target",
         "Settings-core",
diff --git a/tests/robotests/OWNERS b/tests/robotests/OWNERS
index 8a7a27ee4e2..e15af1c1e96 100644
--- a/tests/robotests/OWNERS
+++ b/tests/robotests/OWNERS
@@ -1,2 +1,3 @@
 # We do not guard tests - everyone is welcomed to contribute to tests.
-per-file *.java=*
\ No newline at end of file
+per-file *.java=*
+per-file *.kt=*
diff --git a/res/drawable/audio_sharing_rounded_bg.xml b/tests/robotests/res/layout/test_udfps_enroll_enrolling.xml
similarity index 65%
rename from res/drawable/audio_sharing_rounded_bg.xml
rename to tests/robotests/res/layout/test_udfps_enroll_enrolling.xml
index 35517ea0ec1..c69d2ba16d9 100644
--- a/res/drawable/audio_sharing_rounded_bg.xml
+++ b/tests/robotests/res/layout/test_udfps_enroll_enrolling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2024 The Android Open 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,10 +15,10 @@
   ~ limitations under the License.
   -->
 
-<shape
+<com.android.settings.biometrics.fingerprint.TestUdfpsEnrollEnrollingView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-    android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorAccentPrimary" />
-    <corners android:radius="12dp" />
-</shape>
\ No newline at end of file
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/test_setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
index 0f823d6ab33..c938e5f17e1 100644
--- a/tests/robotests/src/com/android/settings/MainClearTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -66,7 +66,6 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -149,8 +148,8 @@ public class MainClearTest {
         doReturn(mMockActivity).when(mMainClear).getActivity();
         when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
-                .thenReturn(BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE);
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
+                .thenReturn(BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE);
     }
 
     @After
@@ -263,7 +262,6 @@ public class MainClearTest {
         assertThat(mMainClear.showWipeEuicc()).isTrue();
     }
 
-    @Ignore("b/313566998")
     @Test
     public void testShowWipeEuicc_developerMode_unprovisioned() {
         prepareEuiccState(
@@ -379,7 +377,7 @@ public class MainClearTest {
         when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         when(mResources.getString(anyInt())).thenReturn(TEST_ACCOUNT_NAME);
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
         doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
         doNothing().when(mMainClear).startActivityForResult(any(), anyInt());
@@ -406,7 +404,7 @@ public class MainClearTest {
         when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         when(mResources.getString(anyInt())).thenReturn(TEST_ACCOUNT_NAME);
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
                 .thenReturn(BiometricManager.BIOMETRIC_ERROR_LOCKOUT);
         doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
         doNothing().when(mMainClear).startActivityForResult(any(), anyInt());
diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
index a8f42c2b7c7..467436b2566 100644
--- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
@@ -24,6 +24,7 @@ import android.content.pm.ShortcutInfo;
 
 import android.content.pm.ShortcutManager;
 
+import com.android.settings.core.instrumentation.ElapsedTimeUtils;
 import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
@@ -96,4 +97,12 @@ public class SettingsInitializeTest {
         assertThat(updatedShortcuts).hasSize(1);
         assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
     }
+
+    @Test
+    public void onReceive_suwFinished_shouldHaveElapsedTime() {
+        mSettingsInitialize.onReceive(mContext, new Intent(SetupWizardUtils.ACTION_SETUP_WIZARD_FINISHED));
+
+        final long elapsedTime = ElapsedTimeUtils.getElapsedTime(System.currentTimeMillis());
+        assertThat(elapsedTime).isNotEqualTo(-1L);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 8f4b83e17ba..b91ad6dc82d 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -541,7 +541,7 @@ public class UtilsTest {
     @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
     public void testRequestBiometricAuthentication_biometricManagerReturnsSuccess_shouldReturnOk() {
         when(mBiometricManager.canAuthenticate(USER_ID,
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
         final Utils.BiometricStatus requestBiometricAuthenticationForMandatoryBiometrics =
                 Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
@@ -554,7 +554,7 @@ public class UtilsTest {
     @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
     public void testRequestBiometricAuthentication_biometricManagerReturnsError_shouldReturnError() {
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
                 .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
         assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
                 false /* biometricsAuthenticationRequested */, USER_ID)).isEqualTo(
@@ -567,10 +567,10 @@ public class UtilsTest {
         when(mContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);
         when(mMockUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(USER_ID);
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
                 .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
         when(mBiometricManager.canAuthenticate(0 /* userId */,
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
         assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
                 false /* biometricsAuthenticationRequested */, USER_ID)).isEqualTo(
@@ -594,7 +594,7 @@ public class UtilsTest {
         final Intent intent = intentArgumentCaptor.getValue();
 
         assertThat(intent.getExtra(BIOMETRIC_PROMPT_AUTHENTICATORS)).isEqualTo(
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+                BiometricManager.Authenticators.IDENTITY_CHECK);
         assertThat(intent.getExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT)).isNotNull();
         assertThat(intent.getExtra(KeyguardManager.EXTRA_DESCRIPTION)).isNotNull();
         assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, false))
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragmentTest.java
new file mode 100644
index 00000000000..c704bf6ccf4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityAudioRoutingFragmentTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.util.FeatureFlagUtils;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+/** Tests for {@link AccessibilityAudioRoutingFragment}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
+public class AccessibilityAudioRoutingFragmentTest {
+
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private LocalBluetoothManager mLocalBluetoothManager;
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+    private BluetoothAdapter mBluetoothAdapter;
+
+    @Before
+    public void setUp() {
+        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mShadowBluetoothAdapter = Shadow.extract(mBluetoothAdapter);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void deviceSupportsHearingAidAndPageEnabled_isPageSearchEnabled_returnTrue() {
+        FeatureFlagUtils.setEnabled(mContext,
+                FeatureFlagUtils.SETTINGS_AUDIO_ROUTING, true);
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
+
+        assertThat(AccessibilityAudioRoutingFragment.isPageSearchEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void deviceDoesNotSupportHearingAidAndPageEnabled_isPageSearchEnabled_returnFalse() {
+        FeatureFlagUtils.setEnabled(mContext,
+                FeatureFlagUtils.SETTINGS_AUDIO_ROUTING, true);
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEADSET);
+
+        assertThat(AccessibilityAudioRoutingFragment.isPageSearchEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void deviceSupportsHearingAidAndPageDisabled_isPageSearchEnabled_returnFalse() {
+        FeatureFlagUtils.setEnabled(mContext,
+                FeatureFlagUtils.SETTINGS_AUDIO_ROUTING, false);
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
+
+        assertThat(AccessibilityAudioRoutingFragment.isPageSearchEnabled(mContext)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
index f6954d2790b..fae89b10da9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accessibility;
 
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;
+import static android.provider.Settings.Secure.NAVIGATION_MODE;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
@@ -26,11 +28,17 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.res.Resources;
 import android.icu.text.MessageFormat;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Flags;
+import android.provider.Settings;
 import android.text.Html;
 
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.settings.R;
 
 import org.junit.Before;
@@ -47,6 +55,8 @@ import org.robolectric.RobolectricTestRunner;
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilityButtonFooterPreferenceControllerTest {
 
+    @Rule
+    public final SetFlagsRule mCheckFlagsRule = new SetFlagsRule();
     @Rule
     public final MockitoRule mockito = MockitoJUnit.rule();
     @Spy
@@ -69,9 +79,12 @@ public class AccessibilityButtonFooterPreferenceControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void displayPreference_navigationGestureEnabled_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
+        ShortcutUtils.setButtonMode(
+                mContext, ACCESSIBILITY_BUTTON_MODE_GESTURE, mContext.getUserId());
 
         mController.displayPreference(mScreen);
 
@@ -82,11 +95,26 @@ public class AccessibilityButtonFooterPreferenceControllerTest {
                         Html.FROM_HTML_MODE_COMPACT).toString());
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void displayPreference_navigationGestureEnabled_flag_setCorrectTitle() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
+
+        assertThat(AccessibilityUtil.isGestureNavigateEnabled(mContext)).isTrue();
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getTitle().toString()).isEqualTo(
+                Html.fromHtml(
+                        MessageFormat.format(mContext.getString(
+                                R.string.accessibility_button_description), 1, 2, 3),
+                        Html.FROM_HTML_MODE_COMPACT).toString());
+    }
+
     @Test
     public void displayPreference_navigationGestureDisabled_setCorrectTitle() {
-        when(mResources.getInteger(
-                com.android.internal.R.integer.config_navBarInteractionMode)).thenReturn(
-                NAV_BAR_MODE_2BUTTON);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_2BUTTON, mContext.getUserId());
 
         mController.displayPreference(mScreen);
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
index e40f21c702e..94312a60eee 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
@@ -32,6 +32,7 @@ import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Flags;
+import android.provider.Settings;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.PreferenceManager;
@@ -92,8 +93,9 @@ public class AccessibilityButtonFragmentTest {
     @Test
     @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void onCreate_navigationGestureEnabled_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(
+                mContext.getContentResolver(), Settings.Secure.NAVIGATION_MODE,
+                NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         mFragment.onAttach(mContext);
         mFragment.onCreate(Bundle.EMPTY);
@@ -104,9 +106,10 @@ public class AccessibilityButtonFragmentTest {
 
     @Test
     @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
-    public void onCreate_navigationGestureEnabled_gestureFlag_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+    public void onCreate_navigationGestureEnabled_flag_setCorrectTitle() {
+        Settings.Secure.putIntForUser(
+                mContext.getContentResolver(), Settings.Secure.NAVIGATION_MODE,
+                NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         mFragment.onAttach(mContext);
         mFragment.onCreate(Bundle.EMPTY);
@@ -117,8 +120,9 @@ public class AccessibilityButtonFragmentTest {
 
     @Test
     public void onCreate_navigationBarEnabled_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
+        Settings.Secure.putIntForUser(
+                mContext.getContentResolver(), Settings.Secure.NAVIGATION_MODE,
+                NAV_BAR_MODE_2BUTTON, mContext.getUserId());
 
         mFragment.onAttach(mContext);
         mFragment.onCreate(Bundle.EMPTY);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonGesturePreferenceControllerTest.java
index 83517c302ce..798ff7d570c 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonGesturePreferenceControllerTest.java
@@ -75,26 +75,25 @@ public class AccessibilityButtonGesturePreferenceControllerTest {
     @Test
     @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void getAvailabilityStatus_navigationGestureEnabled_returnAvailable() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
     @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
-    public void
-            getAvailabilityStatus_navigationGestureEnabled_gestureFlag_conditionallyUnavailable() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+    public void getAvailabilityStatus_navigationGestureEnabled_returnConditionallyUnavailable() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_navigationGestureDisabled_returnConditionallyUnavailable() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_2BUTTON, mContext.getUserId());
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java
index 53a33972075..a50e8525558 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java
@@ -69,16 +69,16 @@ public class AccessibilityButtonLocationPreferenceControllerTest {
 
     @Test
     public void getAvailabilityStatus_navigationGestureEnabled_returnConditionallyUnavailable() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_navigationGestureDisabled_returnAvailable() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_2BUTTON, mContext.getUserId());
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
index ded9bcc96e3..85aa77c1ab8 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreferenceControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import static android.provider.Settings.Secure.NAVIGATION_MODE;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
@@ -25,6 +26,11 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Flags;
+import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -50,6 +56,8 @@ import java.util.List;
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilityButtonPreferenceControllerTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Rule
     public final MockitoRule mockito = MockitoJUnit.rule();
     @Spy
@@ -72,9 +80,10 @@ public class AccessibilityButtonPreferenceControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void displayPreference_navigationGestureEnabled_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         mController.displayPreference(mScreen);
 
@@ -83,9 +92,10 @@ public class AccessibilityButtonPreferenceControllerTest {
     }
 
     @Test
-    public void displayPreference_navigationGestureDisabled_setCorrectTitle() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
+    @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void displayPreference_navigationGestureEnabled_flag_setCorrectTitle() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
 
         mController.displayPreference(mScreen);
 
@@ -94,9 +104,21 @@ public class AccessibilityButtonPreferenceControllerTest {
     }
 
     @Test
+    public void displayPreference_navigationGestureDisabled_setCorrectTitle() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_2BUTTON, mContext.getUserId());
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getTitle()).isEqualTo(
+                mContext.getText(R.string.accessibility_button_title));
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void updateDynamicRawDataToIndex_navigationGestureEnabled_setCorrectIndex() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
         List<SearchIndexableRaw> rawDataList = new ArrayList<>();
 
         mController.updateDynamicRawDataToIndex(rawDataList);
@@ -109,10 +131,27 @@ public class AccessibilityButtonPreferenceControllerTest {
                 mResources.getString(R.string.accessibility_shortcuts_settings_title));
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void updateDynamicRawDataToIndex_navigationGestureEnabled_flag_setCorrectIndex() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, mContext.getUserId());
+        List<SearchIndexableRaw> rawDataList = new ArrayList<>();
+
+        mController.updateDynamicRawDataToIndex(rawDataList);
+
+        assertThat(rawDataList).hasSize(1);
+        SearchIndexableRaw raw = rawDataList.get(0);
+        assertThat(raw.title).isEqualTo(
+                mResources.getString(R.string.accessibility_button_title));
+        assertThat(raw.screenTitle).isEqualTo(
+                mResources.getString(R.string.accessibility_shortcuts_settings_title));
+    }
+
     @Test
     public void updateDynamicRawDataToIndex_navigationGestureDisabled_setCorrectIndex() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                NAVIGATION_MODE, NAV_BAR_MODE_2BUTTON, mContext.getUserId());
         List<SearchIndexableRaw> rawDataList = new ArrayList<>();
 
         mController.updateDynamicRawDataToIndex(rawDataList);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
index e5e89501c0e..80cc5719e38 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidsFragmentTest.java
@@ -22,33 +22,53 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.telephony.TelephonyManager;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.List;
+import java.util.Objects;
 
 /** Tests for {@link AccessibilityHearingAidsFragment}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
 public class AccessibilityHearingAidsFragmentTest {
 
     @Rule
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Spy
     private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private LocalBluetoothManager mLocalBluetoothManager;
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+    private BluetoothAdapter mBluetoothAdapter;
     private TelephonyManager mTelephonyManager;
 
     @Before
@@ -56,15 +76,43 @@ public class AccessibilityHearingAidsFragmentTest {
         mTelephonyManager = spy(mContext.getSystemService(TelephonyManager.class));
         when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
         doReturn(true).when(mTelephonyManager).isHearingAidCompatibilitySupported();
+
+        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mShadowBluetoothAdapter = Shadow.extract(mBluetoothAdapter);
     }
 
     @Test
     public void getNonIndexableKeys_existInXmlLayout() {
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
+
         final List<String> niks = AccessibilityHearingAidsFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+                .getNonIndexableKeys(mContext).stream()
+                .filter(Objects::nonNull)
+                .toList();
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_hearing_aids);
 
         assertThat(keys).containsAtLeastElementsIn(niks);
     }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void deviceSupportsHearingAid_isPageSearchEnabled_returnTrue() {
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
+
+        assertThat(AccessibilityHearingAidsFragment.isPageSearchEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void deviceDoesNotSupportHearingAid_isPageSearchEnabled_returnFalse() {
+        mShadowBluetoothAdapter.clearSupportedProfiles();
+        mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEADSET);
+
+        assertThat(AccessibilityHearingAidsFragment.isPageSearchEnabled(mContext)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
deleted file mode 100644
index 08cbaae4efc..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.ToggleFeaturePreferenceFragment.KEY_SAVED_QS_TOOLTIP_RESHOW;
-
-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.ComponentName;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settingslib.PrimarySwitchPreference;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowLooper;
-
-/**
- * Tests for {@link AccessibilityQuickSettingsPrimarySwitchPreferenceController}.
- */
-@RunWith(RobolectricTestRunner.class)
-public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest {
-
-    private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
-    private static final String PLACEHOLDER_TILE_CLASS_NAME =
-            PLACEHOLDER_PACKAGE_NAME + "tile.placeholder";
-    private static final ComponentName PLACEHOLDER_TILE_COMPONENT_NAME = new ComponentName(
-            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME);
-    private static final CharSequence PLACEHOLDER_TILE_CONTENT =
-            PLACEHOLDER_TILE_CLASS_NAME + ".tile.content";
-    private static final String TEST_KEY = "test_pref_key";
-    private static final String TEST_TITLE = "test_title";
-
-    @Rule
-    public final MockitoRule mockito = MockitoJUnit.rule();
-
-    @Spy
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-
-    private TestAccessibilityQuickSettingsPrimarySwitchPreferenceController mController;
-    private PrimarySwitchPreference mPreference;
-    private TestFragment mFragment;
-    private PreferenceScreen mScreen;
-    private PreferenceViewHolder mHolder;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
-
-    private static PopupWindow getLatestPopupWindow() {
-        final ShadowApplication shadowApplication =
-                Shadow.extract(ApplicationProvider.getApplicationContext());
-        return shadowApplication.getLatestPopupWindow();
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
-        mFragment = spy(new TestFragment());
-        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
-        when(mFragment.getContext()).thenReturn(mContext);
-        mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));
-        when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
-        doReturn(mScreen).when(mFragment).getPreferenceScreen();
-
-        mPreference = new PrimarySwitchPreference(mContext);
-        mPreference.setKey(TEST_KEY);
-        mPreference.setTitle(TEST_TITLE);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
-                com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target, null));
-        LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true);
-        mPreference.onBindViewHolder(mHolder);
-
-        mController = new TestAccessibilityQuickSettingsPrimarySwitchPreferenceController(mContext,
-                TEST_KEY);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-    }
-
-    @Test
-    public void setChecked_showTooltipView() {
-        mController.displayPreference(mScreen);
-
-        mController.setChecked(true);
-
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
-    @Test
-    public void setChecked_notCallDisplayPreference_notShowTooltipView() {
-        // Simulates the slice highlight menu that does not call {@link #displayPreference} before
-        // {@link #setChecked} called.
-        mController.setChecked(true);
-
-        assertThat(getLatestPopupWindow()).isNull();
-    }
-
-    @Test
-    public void setChecked_tooltipViewShown_notShowTooltipView() {
-        mController.displayPreference(mScreen);
-        mController.setChecked(true);
-        getLatestPopupWindow().dismiss();
-        mController.setChecked(false);
-
-        mController.setChecked(true);
-
-        assertThat(getLatestPopupWindow().isShowing()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = ShadowFragment.class)
-    public void restoreValueFromSavedInstanceState_showTooltipView() {
-        final Bundle savedInstanceState = new Bundle();
-        savedInstanceState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true);
-        mController.onCreate(savedInstanceState);
-
-        mController.displayPreference(mScreen);
-        ShadowLooper.idleMainLooper();
-
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
-    public static class TestAccessibilityQuickSettingsPrimarySwitchPreferenceController
-            extends AccessibilityQuickSettingsPrimarySwitchPreferenceController {
-
-        public TestAccessibilityQuickSettingsPrimarySwitchPreferenceController(Context context,
-                String preferenceKey) {
-            super(context, preferenceKey);
-        }
-
-        @Override
-        ComponentName getTileComponentName() {
-            return PLACEHOLDER_TILE_COMPONENT_NAME;
-        }
-
-        @Override
-        CharSequence getTileTooltipContent() {
-            return PLACEHOLDER_TILE_CONTENT;
-        }
-    }
-
-    private static class TestFragment extends SettingsPreferenceFragment {
-
-        @Override
-        protected boolean shouldSkipForInitialSUW() {
-            return false;
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
index 2ae598418ce..58578e76f50 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java
@@ -46,8 +46,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.display.BrightnessLevelPreferenceController;
+import com.android.settings.display.BrightnessLevelPreferenceControllerForSetupWizard;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -146,16 +145,15 @@ public class AccessibilitySettingsForSetupWizardTest {
     }
 
     @Test
-    public void createPreferenceControllers_brightnessPreferencesControllersAreCreated() {
+    public void createPreferenceControllers_lifeCycleDependencyControllerIsCreated() {
         mFragment.onAttach(mContext);
 
         List<AbstractPreferenceController> controllers =
                 mFragment.createPreferenceControllers(mContext);
 
         assertTrue(controllers.stream().anyMatch(
-                controller -> controller instanceof BrightnessLevelPreferenceController));
-        assertTrue(controllers.stream().anyMatch(
-                controller -> controller instanceof AutoBrightnessPreferenceController));
+                controller ->
+                        controller instanceof BrightnessLevelPreferenceControllerForSetupWizard));
     }
 
     private void addEnabledServiceInfo(ComponentName componentName, boolean isAccessibilityTool) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 36578a90e25..0c942e317dc 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -376,21 +376,7 @@ public class AccessibilitySettingsTest {
     }
 
     @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onCreate_flagDisabled_haveRegisterToSpecificUrisAndActions() {
-        setupFragment();
-
-        assertUriObserversContainsClazz(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,
-                AccessibilitySettingsContentObserver.class).isTrue();
-        assertUriObserversContainsClazz(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE,
-                AccessibilitySettingsContentObserver.class).isTrue();
-        assertUriObserversContainsClazz(Settings.Secure.ACCESSIBILITY_QS_TARGETS,
-                AccessibilitySettingsContentObserver.class).isFalse();
-    }
-
-    @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onCreate_flagEnabled_haveRegisterToSpecificUrisAndActions() {
+    public void onCreate_haveRegisterToSpecificUrisAndActions() {
         setupFragment();
 
         assertUriObserversContainsClazz(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,
@@ -463,7 +449,6 @@ public class AccessibilitySettingsTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_CHECK_PREBUNDLED_IS_PREINSTALLED)
     public void testNonPreinstalledApp_IncludedInDownloadedCategory() {
         mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
                 List.of(getMockAccessibilityServiceInfo(
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
index 9d18c44e392..5973d265a92 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
-import static com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment.KEY_SAVED_QS_TOOLTIP_RESHOW;
 import static com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -38,14 +37,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.icu.text.CaseMap;
 import android.os.Bundle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.annotation.Nullable;
@@ -156,27 +152,8 @@ public class AccessibilityShortcutPreferenceFragmentTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = ShadowFragment.class)
-    public void restoreValueFromSavedInstanceState_showTooltipView() {
-        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
-        mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT);
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-
-        final Bundle savedInstanceState = new Bundle();
-        savedInstanceState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true);
-        mFragment.onAttach(mContext);
-        mFragment.onCreate(savedInstanceState);
-        mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
-        mFragment.onViewCreated(mFragment.getView(), savedInstanceState);
-
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    @Config(shadows = ShadowFragment.class)
-    public void showQuickSettingsTooltipIfNeeded_qsFlagOn_dontShowTooltipView() {
+    public void showQuickSettingsTooltipIfNeeded_dontShowTooltipView() {
         mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT);
 
         assertThat(getLatestPopupWindow()).isNull();
@@ -219,7 +196,6 @@ public class AccessibilityShortcutPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
         final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
                 PLACEHOLDER_COMPONENT_NAME.flattenToString(),
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
index d5c1fd11c5c..779866229ce 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.GESTURE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
@@ -36,6 +37,7 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.text.SpannableStringBuilder;
@@ -131,7 +133,6 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void createTutorialPages_turnOnQuickSettingShortcut_hasOnePage() {
         mShortcutTypes |= QUICK_SETTINGS;
 
@@ -258,7 +259,6 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void createAccessibilityTutorialDialog_qsShortcut_inSuwTalkbackOn_verifyText() {
         mShortcutTypes |= QUICK_SETTINGS;
         setTouchExplorationEnabled(true);
@@ -290,7 +290,6 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void createAccessibilityTutorialDialog_qsShortcut_notInSuwTalkbackOn_verifyText() {
         mShortcutTypes |= QUICK_SETTINGS;
         setTouchExplorationEnabled(true);
@@ -316,7 +315,6 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void createAccessibilityTutorialDialog_qsShortcut_inSuwTalkbackOff_verifyText() {
         mShortcutTypes |= QUICK_SETTINGS;
         setTouchExplorationEnabled(false);
@@ -347,7 +345,6 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void createAccessibilityTutorialDialog_qsShortcut_notInSuwTalkbackOff_verifyText() {
         mShortcutTypes |= QUICK_SETTINGS;
         setTouchExplorationEnabled(false);
@@ -479,9 +476,37 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
+    @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOn_verifyText() {
         mShortcutTypes |= SOFTWARE;
         setTouchExplorationEnabled(true);
+        AccessibilityTestUtils.setSoftwareShortcutMode(
+                mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
+
+        final String expectedTitle = mContext.getString(
+                R.string.accessibility_tutorial_dialog_title_gesture);
+        final String expectedInstruction = StringUtil.getIcuPluralsString(
+                mContext,
+                /* count= */ 3,
+                R.string.accessibility_tutorial_dialog_gesture_shortcut_instruction);
+
+        final AlertDialog alertDialog =
+                createAccessibilityTutorialDialog(
+                        mContext, mShortcutTypes, FAKE_FEATURE_NAME);
+        alertDialog.show();
+        ShadowLooper.idleMainLooper();
+
+        verifyTutorialTitleAndInstruction(
+                alertDialog,
+                expectedTitle,
+                expectedInstruction);
+    }
+
+    @Test
+    @EnableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOn_flag_verifyText() {
+        mShortcutTypes |= GESTURE;
+        setTouchExplorationEnabled(true);
         AccessibilityTestUtils.setSoftwareShortcutMode(
                 mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
         final String expectedTitle = mContext.getString(
@@ -504,6 +529,7 @@ public final class AccessibilityShortcutsTutorialTest {
     }
 
     @Test
+    @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOff_verifyText() {
         mShortcutTypes |= SOFTWARE;
         setTouchExplorationEnabled(false);
@@ -528,6 +554,32 @@ public final class AccessibilityShortcutsTutorialTest {
                 expectedInstruction);
     }
 
+    @Test
+    @EnableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOff_flag_verifyText() {
+        mShortcutTypes |= GESTURE;
+        setTouchExplorationEnabled(false);
+        AccessibilityTestUtils.setSoftwareShortcutMode(
+                mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
+        final String expectedTitle = mContext.getString(
+                R.string.accessibility_tutorial_dialog_title_gesture);
+        final String expectedInstruction = StringUtil.getIcuPluralsString(
+                mContext,
+                /* count= */ 2,
+                R.string.accessibility_tutorial_dialog_gesture_shortcut_instruction);
+
+        final AlertDialog alertDialog =
+                createAccessibilityTutorialDialog(
+                        mContext, mShortcutTypes, FAKE_FEATURE_NAME);
+        alertDialog.show();
+        ShadowLooper.idleMainLooper();
+
+        verifyTutorialTitleAndInstruction(
+                alertDialog,
+                expectedTitle,
+                expectedInstruction);
+    }
+
     @Test
     public void performClickOnPositiveButton_turnOnSoftwareShortcut_dismiss() {
         mShortcutTypes |= SOFTWARE;
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index c036432935b..bcd7c87fdaa 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -16,6 +16,11 @@
 
 package com.android.settings.accessibility;
 
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
@@ -25,8 +30,6 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh
 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.verifyNoMoreInteractions;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
@@ -35,20 +38,16 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Build;
-import android.os.UserHandle;
 import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.settings.R;
-import com.android.settings.testutils.AccessibilityTestUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -58,7 +57,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
-import java.util.Set;
 import java.util.StringJoiner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -198,7 +196,6 @@ public final class AccessibilityUtilTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getUserShortcutTypeFromSettings_threeShortcutTypesChosen() {
         setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
         setShortcut(HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
@@ -214,157 +211,6 @@ public final class AccessibilityUtilTest {
         );
     }
 
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_optInValue_haveMatchString() {
-        clearShortcuts();
-        int shortcutTypes = SOFTWARE | HARDWARE;
-
-        AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, MOCK_COMPONENT_NAME);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                MOCK_COMPONENT_NAME.flattenToString());
-        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
-                MOCK_COMPONENT_NAME.flattenToString());
-
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_optInValue_callsA11yManager() {
-        AccessibilityManager a11yManager =
-                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
-        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
-        int shortcutTypes = SOFTWARE | HARDWARE
-                | QUICK_SETTINGS;
-
-        AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, MOCK_COMPONENT_NAME);
-
-        verify(a11yManager).enableShortcutsForTargets(
-                /* enable= */ true, shortcutTypes,
-                shortcutTargets, UserHandle.myUserId());
-        verifyNoMoreInteractions(a11yManager);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInValueToSettings_optInValue_haveMatchString() {
-        setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
-
-        AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
-                MOCK_COMPONENT_NAME2);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                MOCK_COMPONENT_NAME.flattenToString() + ":"
-                        + MOCK_COMPONENT_NAME2.flattenToString());
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInValueToSettings_optInValue_callsA11yManager() {
-        AccessibilityManager a11yManager =
-                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
-        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME2.flattenToString());
-
-        AccessibilityUtil.optInValueToSettings(
-                mContext, HARDWARE, MOCK_COMPONENT_NAME2);
-
-        verify(a11yManager).enableShortcutsForTargets(
-                /* enable= */ true, HARDWARE,
-                shortcutTargets, UserHandle.myUserId());
-        verifyNoMoreInteractions(a11yManager);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInValueToSettings_optInTwoValues_haveMatchString() {
-        setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
-
-        AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
-                MOCK_COMPONENT_NAME2);
-        AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
-                MOCK_COMPONENT_NAME2);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                MOCK_COMPONENT_NAME.flattenToString() + ":"
-                        + MOCK_COMPONENT_NAME2.flattenToString());
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutAllValuesToSettings_optOutValue_emptyString() {
-        setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
-        setShortcut(HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
-        int shortcutTypes =
-                SOFTWARE | HARDWARE | TRIPLETAP;
-
-        AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
-                MOCK_COMPONENT_NAME);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
-        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEmpty();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutAllValuesToSettings_optOutValue_callsA1yManager() {
-        AccessibilityManager a11yManager =
-                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
-        int shortcutTypes =
-                SOFTWARE | HARDWARE
-                        | QUICK_SETTINGS;
-        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
-
-        AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
-                MOCK_COMPONENT_NAME);
-
-        verify(a11yManager).enableShortcutsForTargets(
-                /* enable= */ false,
-                shortcutTypes,
-                shortcutTargets, UserHandle.myUserId());
-        verifyNoMoreInteractions(a11yManager);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutValueFromSettings_optOutValue_emptyString() {
-        setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
-
-        AccessibilityUtil.optOutValueFromSettings(mContext, SOFTWARE,
-                MOCK_COMPONENT_NAME);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutValueFromSettings_optOutValue_haveMatchString() {
-        setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString(),
-                MOCK_COMPONENT_NAME2.flattenToString());
-
-        AccessibilityUtil.optOutValueFromSettings(mContext, SOFTWARE,
-                MOCK_COMPONENT_NAME2);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                MOCK_COMPONENT_NAME.flattenToString());
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutValueFromSettings_optOutValue_callsA11yManager() {
-        AccessibilityManager a11yManager =
-                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
-        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
-
-        AccessibilityUtil.optOutValueFromSettings(
-                mContext, QUICK_SETTINGS, MOCK_COMPONENT_NAME);
-
-        verify(a11yManager).enableShortcutsForTargets(
-                /* enable= */ false, QUICK_SETTINGS,
-                shortcutTargets, UserHandle.myUserId());
-        verifyNoMoreInteractions(a11yManager);
-    }
-
     @Test
     public void convertKeyFromSettings_shortcutTypeSoftware() {
         assertThat(AccessibilityUtil.convertKeyFromSettings(SOFTWARE))
@@ -384,7 +230,6 @@ public final class AccessibilityUtilTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void convertKeyFromSettings_shortcutTypeMultiFingersMultiTap() {
         assertThat(AccessibilityUtil.convertKeyFromSettings(TWOFINGER_DOUBLETAP))
                 .isEqualTo(
@@ -392,12 +237,54 @@ public final class AccessibilityUtilTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void convertKeyFromSettings_shortcutTypeQuickSettings() {
         assertThat(AccessibilityUtil.convertKeyFromSettings(QUICK_SETTINGS))
                 .isEqualTo(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
     }
 
+    @Test
+    @EnableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void getSoftwareShortcutSummary_returnsSoftwareSummary() {
+        assertThat(AccessibilityUtil.getSoftwareShortcutSummary(mContext)).isEqualTo(
+                mContext.getText(R.string.accessibility_shortcut_edit_summary_software));
+    }
+
+    @Test
+    @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void getSoftwareShortcutSummary_gestureMode_floatingButton_returnsSoftwareSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+
+        assertThat(AccessibilityUtil.getSoftwareShortcutSummary(mContext)).isEqualTo(
+                mContext.getText(R.string.accessibility_shortcut_edit_summary_software));
+    }
+
+    @Test
+    @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void getSoftwareShortcutSummary_gestureMode_gesture_returnsGestureSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_GESTURE);
+
+        assertThat(AccessibilityUtil.getSoftwareShortcutSummary(mContext)).isEqualTo(
+                mContext.getText(R.string.accessibility_shortcut_edit_summary_software_gesture));
+    }
+
+    @Test
+    @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void getSoftwareShortcutSummary_navBarMode_returnsSoftwareSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, NAV_BAR_MODE_3BUTTON);
+
+        assertThat(AccessibilityUtil.getSoftwareShortcutSummary(mContext)).isEqualTo(
+                mContext.getText(R.string.accessibility_shortcut_edit_summary_software));
+    }
+
     private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
         final ApplicationInfo applicationInfo = new ApplicationInfo();
         final ServiceInfo serviceInfo = new ServiceInfo();
diff --git a/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java
deleted file mode 100644
index c0b9dbd2104..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.settings.SettingsEnums;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-import androidx.fragment.app.FragmentFactory;
-import androidx.fragment.app.testing.FragmentScenario;
-import androidx.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settingslib.widget.FooterPreference;
-
-import com.google.android.setupcompat.template.FooterBarMixin;
-import com.google.android.setupdesign.GlifLayout;
-import com.google.android.setupdesign.GlifPreferenceLayout;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Tests for {@link AutoBrightnessPreferenceFragmentForSetupWizard}. */
-@RunWith(RobolectricTestRunner.class)
-public class AutoBrightnessPreferenceFragmentForSetupWizardTest {
-
-    // Same as AutoBrightnessPreferenceFragmentForSetupWizard#FOOTER_PREFERENCE_KEY
-    private static final String FOOTER_PREFERENCE_KEY = "auto_brightness_footer";
-
-    private FragmentScenario<AutoBrightnessPreferenceFragmentForSetupWizard> mFragmentScenario;
-
-    private AutoBrightnessPreferenceFragmentForSetupWizard mFragment;
-    private GlifLayout mGlifLayout;
-
-    @Before
-    public void setUp() {
-        mFragmentScenario = FragmentScenario
-                .launch(
-                        AutoBrightnessPreferenceFragmentForSetupWizard.class,
-                        /* fragmentArgs= */ (Bundle) null,
-                        R.style.GlifTheme,
-                        /* factory= */ (FragmentFactory) null)
-                .moveToState(Lifecycle.State.RESUMED);
-        mFragmentScenario.onFragment(fragment -> mFragment = fragment);
-
-        View view = mFragment.getView();
-        assertThat(view).isInstanceOf(GlifPreferenceLayout.class);
-        mGlifLayout = (GlifLayout) view;
-    }
-
-    @After
-    public void tearDown() {
-        mFragmentScenario.close();
-    }
-
-    @Test
-    public void onViewCreated_verifyGlifHerderText() {
-        assertThat(mGlifLayout.getHeaderText())
-                .isEqualTo(mFragment.getString(R.string.auto_brightness_title));
-    }
-
-    @Test
-    public void onViewCreated_verifyGlifFooter() {
-        FooterBarMixin footerMixin = mGlifLayout.getMixin(FooterBarMixin.class);
-        assertThat(footerMixin).isNotNull();
-
-        Button footerButton = footerMixin.getPrimaryButtonView();
-        assertThat(footerButton).isNotNull();
-        assertThat(footerButton.getText().toString()).isEqualTo(mFragment.getString(R.string.done));
-
-        footerButton.performClick();
-        assertThat(mFragment.getActivity().isFinishing()).isTrue();
-    }
-
-    @Test
-    public void onViewCreated_verifyFooterPreference() {
-        Preference pref = mFragment.findPreference(FOOTER_PREFERENCE_KEY);
-        assertThat(pref).isInstanceOf(FooterPreference.class);
-
-        FooterPreference footerPref = (FooterPreference) pref;
-        String exactTitle = footerPref.getTitle().toString();
-        assertThat(exactTitle).isEqualTo(mFragment.getString(R.string.auto_brightness_description));
-
-        // Ensure that footer content description has "About XXX" prefix for consistency with other
-        // accessibility suw pages
-        String expectedContentDescription =
-                mFragment.getString(R.string.auto_brightness_content_description_title)
-                        + "\n\n" + exactTitle;
-        assertThat(footerPref.getContentDescription().toString())
-                .isEqualTo(expectedContentDescription);
-    }
-
-    @Test
-    public void getMetricsCategory_returnsCorrectCategory() {
-        assertThat(mFragment.getMetricsCategory()).isEqualTo(
-                SettingsEnums.SUW_ACCESSIBILITY_AUTO_BRIGHTNESS);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java
new file mode 100644
index 00000000000..8989d4acb81
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.when;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.search.SearchIndexableRaw;
+
+import com.google.common.collect.ImmutableList;
+
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Tests for {@link AvailableHearingDevicePreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothUtils.class})
+public class AvailableHearingDevicePreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "preference_key";
+    private static final String DEVICE_NAME = "device";
+
+    private Context mContext;
+    private AvailableHearingDevicePreferenceController mAvailableHearingDevicePreferenceController;
+    @Mock
+    private AvailableHearingDeviceUpdater mAvailableHearingDeviceUpdater;
+    @Mock
+    private CachedBluetoothDeviceManager mCachedDeviceManager;
+    @Mock
+    private LocalBluetoothManager mLocalBluetoothManager;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice;
+    @Mock
+    private BluetoothDevice mDevice;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = ApplicationProvider.getApplicationContext();
+        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+        when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
+        when(mCachedDevice.getDevice()).thenReturn(mDevice);
+        when(mCachedDevice.getName()).thenReturn(DEVICE_NAME);
+        when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
+                ImmutableList.of(mCachedDevice));
+
+        mAvailableHearingDevicePreferenceController =
+                new AvailableHearingDevicePreferenceController(mContext, PREFERENCE_KEY);
+        mAvailableHearingDevicePreferenceController.init(mAvailableHearingDeviceUpdater);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void updateDynamicRawDataToIndex_isNotHearingAidDevice_deviceIsNotSearchable() {
+        when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+        when(mDevice.isConnected()).thenReturn(true);
+        when(mCachedDevice.isHearingAidDevice()).thenReturn(false);
+        List<SearchIndexableRaw> searchData = new ArrayList<>();
+
+        mAvailableHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData);
+
+        assertThat(searchData).isEmpty();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void updateDynamicRawDataToIndex_isHearingAidDevice_deviceIsSearchable() {
+        when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+        when(mDevice.isConnected()).thenReturn(true);
+        when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
+        List<SearchIndexableRaw> searchData = new ArrayList<>();
+
+        mAvailableHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData);
+
+        assertThat(searchData).isNotEmpty();
+        assertThat(searchData.get(0).key).contains(DEVICE_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
index bbe511d1b98..89a90c08f26 100644
--- a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
@@ -28,8 +28,6 @@ import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
 import android.util.AttributeSet;
 import android.widget.SeekBar;
 
@@ -38,7 +36,6 @@ import com.android.settings.Utils;
 import com.android.settings.testutils.shadow.ShadowSystemSettings;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -52,9 +49,6 @@ import java.util.Locale;
         ShadowSystemSettings.class,
 })
 public class BalanceSeekBarTest {
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
     // Fix the maximum process value to 200 for testing the BalanceSeekBar.
     // It affects the SeekBar value of center(100) and snapThreshold(200 * SNAP_TO_PERCENTAGE).
     private static final int MAX_PROGRESS_VALUE = 200;
@@ -154,7 +148,6 @@ public class BalanceSeekBarTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_AUDIO_BALANCE_STATE_DESCRIPTION)
     public void onProgressChanged_getStateDescription_centered_leftFirst() {
         // Seek bar centered
         int progress = (int) (0.50f * MAX_PROGRESS_VALUE);
@@ -168,7 +161,6 @@ public class BalanceSeekBarTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_AUDIO_BALANCE_STATE_DESCRIPTION)
     public void onProgressChanged_getStateDescription_centered_rtl_rightFirst() {
         // RTL layout
         mContext.getResources().getConfiguration().setLayoutDirection(new Locale("iw", "IL"));
@@ -184,7 +176,6 @@ public class BalanceSeekBarTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_AUDIO_BALANCE_STATE_DESCRIPTION)
     public void onProgressChanged_getStateDescription_25percent_leftFirst() {
         // Seek bar 3/4th toward the left
         int progress = (int) (0.25f * MAX_PROGRESS_VALUE);
@@ -197,7 +188,6 @@ public class BalanceSeekBarTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_AUDIO_BALANCE_STATE_DESCRIPTION)
     public void onProgressChanged_getStateDescription_75percent_rightFirst() {
         // Seek bar 3/4th toward the right
         int progress = (int) (0.75f * MAX_PROGRESS_VALUE);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
index c1a1799b6bc..7aaf71b691b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java
@@ -26,6 +26,9 @@ import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.View;
 import android.view.accessibility.CaptioningManager;
@@ -35,6 +38,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.internal.widget.SubtitleView;
 import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -54,6 +58,8 @@ public class CaptionHelperTest {
 
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Mock
     private CaptioningManager mCaptioningManager;
     @Mock
@@ -182,4 +188,40 @@ public class CaptionHelperTest {
                 Settings.Secure.ACCESSIBILITY_CAPTIONING_PRESET, 0);
         assertThat(style).isEqualTo(CaptionStyle.PRESET_CUSTOM);
     }
+
+    @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_flagOff_customCaption_shouldReturnAvailable() {
+        when(mCaptioningManager.getRawUserStyle()).thenReturn(CaptionStyle.PRESET_CUSTOM);
+
+        assertThat(mCaptionHelper.getCustomCaptionAvailability())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_flagOff_notCustom_shouldReturnAvailable() {
+        when(mCaptioningManager.getRawUserStyle()).thenReturn(0);
+
+        assertThat(mCaptionHelper.getCustomCaptionAvailability())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_customCaption_shouldReturnAvailable() {
+        when(mCaptioningManager.getRawUserStyle()).thenReturn(CaptionStyle.PRESET_CUSTOM);
+
+        assertThat(mCaptionHelper.getCustomCaptionAvailability())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() {
+        when(mCaptioningManager.getRawUserStyle()).thenReturn(0);
+
+        assertThat(mCaptionHelper.getCustomCaptionAvailability())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java
index e847f438070..bc7c0334b58 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java
@@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -70,12 +68,6 @@ public class CaptioningBackgroundColorControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnBlack() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java
index 5036ba03706..08a8a86f7a7 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java
@@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -69,12 +67,6 @@ public class CaptioningBackgroundOpacityControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnNonTransparent() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java
index 838d9e04b7b..37ad3f889a2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java
@@ -30,8 +30,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -67,13 +65,6 @@ public class CaptioningCustomControllerTest {
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
-
     @Test
     public void displayPreference_byDefault_shouldIsInvisible() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java
index c55e087df77..21d6daefdaa 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java
@@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -67,12 +65,6 @@ public class CaptioningEdgeColorControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnBlack() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java
index 354115f65ba..0aab4475009 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java
@@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -69,12 +67,6 @@ public class CaptioningEdgeTypeControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnNone() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
index b00d8d899f7..c222d3fd66d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java
@@ -22,7 +22,6 @@ import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.when;
-
 import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java
index 9e9c926defc..59364cdada7 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java
@@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -70,12 +68,6 @@ public class CaptioningForegroundColorControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnWhite() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java
index a88b5f54f77..6aaa4a78611 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java
@@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -69,12 +67,6 @@ public class CaptioningForegroundOpacityControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnNonTransparent() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
index aa7d3eb53a9..b029f3f8702 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java
@@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -70,12 +69,6 @@ public class CaptioningTypefaceControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void updateState_byDefault_shouldReturnDefault() {
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
index 12582145c20..2e276c5b14a 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.accessibility.CaptioningManager;
@@ -33,7 +34,6 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -53,6 +53,8 @@ public class CaptioningWindowColorControllerTest {
 
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Mock
     private PreferenceScreen mScreen;
     private final Context mContext = ApplicationProvider.getApplicationContext();
@@ -62,7 +64,8 @@ public class CaptioningWindowColorControllerTest {
 
     @Before
     public void setUp() {
-        mController = new CaptioningWindowColorController(mContext, "captioning_window_color");
+        mController = new CaptioningWindowColorController(
+                mContext, "captioning_window_color");
         final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
         mPreference = new ColorPreference(mContext, attributeSet);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -70,12 +73,6 @@ public class CaptioningWindowColorControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnNone() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java
index 0e872a09d09..aae53d08b06 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.accessibility.CaptioningManager;
@@ -31,8 +32,6 @@ import android.view.accessibility.CaptioningManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -48,9 +47,11 @@ import org.robolectric.shadows.ShadowCaptioningManager;
 /** Tests for {@link CaptioningWindowOpacityController}. */
 @RunWith(RobolectricTestRunner.class)
 public class CaptioningWindowOpacityControllerTest {
-
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private PreferenceScreen mScreen;
     private final Context mContext = ApplicationProvider.getApplicationContext();
@@ -60,7 +61,8 @@ public class CaptioningWindowOpacityControllerTest {
 
     @Before
     public void setUp() {
-        mController = new CaptioningWindowOpacityController(mContext, "captioning_window_opacity");
+        mController = new CaptioningWindowOpacityController(
+                mContext, "captioning_window_opacity");
         final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
         mPreference = new ColorPreference(mContext, attributeSet);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -68,12 +70,6 @@ public class CaptioningWindowOpacityControllerTest {
         mShadowCaptioningManager = Shadow.extract(captioningManager);
     }
 
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
     @Test
     public void getSummary_defaultValue_shouldReturnNonTransparent() {
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt
new file mode 100644
index 00000000000..67fbc1ae2b6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.android.settingslib.preference.PreferenceScreenCreator
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ColorAndMotionScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator: PreferenceScreenCreator = ColorAndMotionScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_ACCESSIBILITY_COLOR_AND_MOTION
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(ColorAndMotionScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceControllerTest.java
deleted file mode 100644
index bf6efd097d7..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardBounceKeyPreferenceControllerTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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 static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-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 KeyboardBounceKeyPreferenceControllerTest {
-    private static final String KEY_ACCESSIBILITY_BOUNCE_KEYS =
-            Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS;
-    private static final int UNKNOWN = -1;
-
-    @Rule
-    public final SetFlagsRule mSetFlagRule = new SetFlagsRule();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private final SwitchPreference mSwitchPreference = spy(new SwitchPreference(mContext));
-    private final KeyboardBounceKeyPreferenceController mController =
-            new KeyboardBounceKeyPreferenceController(mContext,
-                    KeyboardBounceKeyPreferenceController.PREF_KEY);
-
-    @Before
-    public void setUp() {
-        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
-        mSwitchPreference.setKey(KeyboardBounceKeyPreferenceController.PREF_KEY);
-        screen.addPreference(mSwitchPreference);
-        mController.displayPreference(screen);
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_disableBounceKey_onResumeShouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_enableBounceKey_onResumeShouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_enableBounceKey_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(true);
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_disableBounceKey_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(false);
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableBounceKey() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(
-                mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS, UNKNOWN)).isEqualTo(
-                OFF);
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableBounceKey() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(
-                mContext.getContentResolver(), KEY_ACCESSIBILITY_BOUNCE_KEYS,
-                UNKNOWN)).isNotEqualTo(OFF);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_physicalKeyboardExists_returnEmptyList() {
-        Assume.assumeTrue(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).isEmpty();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_noPhysicalKeyboard_returnPreKey() {
-        Assume.assumeFalse(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).contains(mController.getPreferenceKey());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceControllerTest.java
deleted file mode 100644
index 2721a64874c..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardSlowKeyPreferenceControllerTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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 static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-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 KeyboardSlowKeyPreferenceControllerTest {
-    private static final String KEY_ACCESSIBILITY_SLOW_KEYS =
-            Settings.Secure.ACCESSIBILITY_SLOW_KEYS;
-    private static final int UNKNOWN = -1;
-
-    @Rule
-    public final SetFlagsRule mSetFlagRule = new SetFlagsRule();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private final SwitchPreference mSwitchPreference = spy(new SwitchPreference(mContext));
-    private final KeyboardSlowKeyPreferenceController mController =
-            new KeyboardSlowKeyPreferenceController(mContext,
-                    KeyboardSlowKeyPreferenceController.PREF_KEY);
-
-    @Before
-    public void setUp() {
-        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
-        mSwitchPreference.setKey(KeyboardSlowKeyPreferenceController.PREF_KEY);
-        screen.addPreference(mSwitchPreference);
-        mController.displayPreference(screen);
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_disableSlowKey_onResumeShouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_enableSlowKey_onResumeShouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_enableSlowKey_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(true);
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_disableSlowKey_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(false);
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableSlowKey() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(
-                mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, UNKNOWN)).isEqualTo(
-                OFF);
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableSlowKey() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(
-                mContext.getContentResolver(), KEY_ACCESSIBILITY_SLOW_KEYS, UNKNOWN)).isNotEqualTo(
-                OFF);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_physicalKeyboardExists_returnEmptyList() {
-        Assume.assumeTrue(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).isEmpty();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_noPhysicalKeyboard_returnPreKey() {
-        Assume.assumeFalse(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).contains(mController.getPreferenceKey());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceControllerTest.java
deleted file mode 100644
index 0001e8552d1..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardStickyKeyPreferenceControllerTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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 static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-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 KeyboardStickyKeyPreferenceControllerTest {
-    private static final String KEY_ACCESSIBILITY_STICKY_KEYS =
-            Settings.Secure.ACCESSIBILITY_STICKY_KEYS;
-    private static final int UNKNOWN = -1;
-
-    @Rule
-    public final SetFlagsRule mSetFlagRule = new SetFlagsRule();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private final SwitchPreference mSwitchPreference = spy(new SwitchPreference(mContext));
-    private final KeyboardStickyKeyPreferenceController mController =
-            new KeyboardStickyKeyPreferenceController(mContext,
-                    KeyboardStickyKeyPreferenceController.PREF_KEY);
-
-    @Before
-    public void setUp() {
-        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
-        mSwitchPreference.setKey(KeyboardStickyKeyPreferenceController.PREF_KEY);
-        screen.addPreference(mSwitchPreference);
-        mController.displayPreference(screen);
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_disableStickyKey_onResumeShouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_enableStickyKey_onResumeShouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_enableStickyKey_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, OFF);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(true);
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void performClick_disableStickyKey_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, ON);
-
-        mController.updateState(mSwitchPreference);
-
-        mSwitchPreference.performClick();
-
-        verify(mSwitchPreference).setChecked(false);
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableStickyKey() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(
-            mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, UNKNOWN)).isEqualTo(OFF);
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableStickyKey() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(
-            mContext.getContentResolver(), KEY_ACCESSIBILITY_STICKY_KEYS, UNKNOWN)).isEqualTo(ON);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_physicalKeyboardExists_returnEmptyList() {
-        Assume.assumeTrue(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).isEmpty();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
-    public void updateNonIndexableKeys_noPhysicalKeyboard_returnPreKey() {
-        Assume.assumeFalse(AccessibilitySettings.isAnyHardKeyboardsExist());
-
-        List<String> nonIndexableKeys = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexableKeys);
-
-        assertThat(nonIndexableKeys).contains(mController.getPreferenceKey());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
index 78f49a66906..76b93b03c94 100644
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
@@ -26,8 +26,8 @@ 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.spy;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
 import android.content.ContentResolver;
diff --git a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
index 355e8c32041..da8059c25ec 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
@@ -30,10 +30,10 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.settings.core.BasePreferenceController;
 import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
index 501bbb0e102..348ac45c5dd 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
@@ -31,9 +31,9 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.After;
@@ -42,8 +42,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /** Test for {@link MediaVibrationIntensityPreferenceController}. */
 @RunWith(RobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
index 759b180206f..8ff3a0e6639 100644
--- a/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
@@ -16,17 +16,20 @@
 
 package com.android.settings.accessibility;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.preference.PreferenceViewHolder;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settingslib.Utils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,12 +56,20 @@ public final class PaletteListPreferenceTest {
 
     @Test
     public void initPaletteView_success() {
+        final int expectedCount =
+                mContext.getResources().getStringArray(R.array.setting_palette_data).length;
+        final ColorStateList expectedTextColor =
+                Utils.getColorAttr(mContext, android.R.attr.textColorPrimary);
+
         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());
+        final int childCount = viewGroup.getChildCount();
+        assertThat(childCount).isEqualTo(expectedCount);
+        for (int i = 0; i < childCount; i++) {
+            final TextView textView = (TextView) viewGroup.getChildAt(i);
+            assertThat(textView.getTextColors()).isEqualTo(expectedTextColor);
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/RemoveAnimationsPreferenceTest.kt b/tests/robotests/src/com/android/settings/accessibility/RemoveAnimationsPreferenceTest.kt
new file mode 100644
index 00000000000..294632ff482
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/RemoveAnimationsPreferenceTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.accessibility.RemoveAnimationsPreference.Companion.ANIMATION_ON_VALUE
+import com.android.settingslib.datastore.SettingsGlobalStore
+import com.android.settingslib.preference.PreferenceScreenBindingHelper
+import com.android.settingslib.preference.PreferenceScreenFactory
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class RemoveAnimationsPreferenceTest {
+
+    private val appContext: Context = ApplicationProvider.getApplicationContext()
+
+    private fun getRemoveAnimationsSwitchPreference(): SwitchPreferenceCompat =
+        PreferenceScreenFactory(appContext).let {
+            val preferenceScreen = it.inflate(R.xml.accessibility_color_and_motion)!!
+            it.preferenceManager.setPreferences(preferenceScreen)
+            PreferenceScreenBindingHelper.bind(preferenceScreen)
+            preferenceScreen.findPreference(RemoveAnimationsPreference.KEY)!!
+        }
+
+    @Test
+    fun animationOff_switchPreferenceIsChecked() {
+        RemoveAnimationsPreference.setAnimationEnabled(appContext, false)
+
+        assertThat(getRemoveAnimationsSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun animationOn_switchPreferenceIsNotChecked() {
+        RemoveAnimationsPreference.setAnimationEnabled(appContext, true)
+
+        assertThat(getRemoveAnimationsSwitchPreference().isChecked).isFalse()
+    }
+
+    @Test
+    fun oneAnimationValueOn_switchPreferenceIsNotChecked() {
+        // Animation is disabled, except for one value.
+        RemoveAnimationsPreference.setAnimationEnabled(appContext, false)
+        SettingsGlobalStore.get(appContext)
+            .setFloat(RemoveAnimationsPreference.getAnimationKeys()[0], ANIMATION_ON_VALUE)
+
+        assertThat(getRemoveAnimationsSwitchPreference().isChecked).isFalse()
+    }
+
+    @Test
+    fun toggleOnSwitch_turnsOffAnimation() {
+        RemoveAnimationsPreference.setAnimationEnabled(appContext, true)
+
+        val switchPreference = getRemoveAnimationsSwitchPreference()
+        assertThat(switchPreference.isChecked).isFalse()
+        switchPreference.performClick()
+        assertThat(switchPreference.isChecked).isTrue()
+
+        assertThat(RemoveAnimationsPreference.isAnimationEnabled(appContext)).isFalse()
+    }
+
+    @Test
+    fun toggleOffSwitch_turnsOnAnimation() {
+        RemoveAnimationsPreference.setAnimationEnabled(appContext, false)
+
+        val switchPreference = getRemoveAnimationsSwitchPreference()
+        assertThat(switchPreference.isChecked).isTrue()
+        switchPreference.performClick()
+        assertThat(switchPreference.isChecked).isFalse()
+
+        assertThat(RemoveAnimationsPreference.isAnimationEnabled(appContext)).isTrue()
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java b/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java
index 2a41e62e7ae..4eda58ebaf2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/RestrictedPreferenceHelperTest.java
@@ -31,7 +31,6 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 
@@ -141,27 +140,10 @@ public class RestrictedPreferenceHelperTest {
         assertThat(preference.getKey()).isEqualTo(key);
     }
 
-    @Test
-    @EnableFlags(value = {android.security.Flags.FLAG_EXTEND_ECM_TO_ALL_SETTINGS,
-            android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED})
-    @DisableFlags(Flags.FLAG_NEVER_RESTRICT_ACCESSIBILITY_ACTIVITY)
-    public void createAccessibilityActivityPreference_ecmRestricted_prefIsEcmRestricted() {
-        setMockAccessibilityShortcutInfo(mShortcutInfo);
-        ShadowRestrictedLockUtilsInternal.setEcmRestrictedPkgs(PACKAGE_NAME);
-
-        final List<AccessibilityActivityPreference> preferenceList =
-                mHelper.createAccessibilityActivityPreferenceList(List.of(mShortcutInfo));
-        assertThat(preferenceList).hasSize(1);
-        final RestrictedPreference preference = preferenceList.get(0);
-
-        assertThat(preference.isDisabledByEcm()).isTrue();
-    }
-
     @Test
     @EnableFlags(value = {
             android.security.Flags.FLAG_EXTEND_ECM_TO_ALL_SETTINGS,
             android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED,
-            Flags.FLAG_NEVER_RESTRICT_ACCESSIBILITY_ACTIVITY,
     })
     public void createAccessibilityActivityPreference_ecmRestricted_prefIsNotEcmRestricted() {
         setMockAccessibilityShortcutInfo(mShortcutInfo);
diff --git a/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java
new file mode 100644
index 00000000000..1e548353ab6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.when;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.search.SearchIndexableRaw;
+
+import com.google.common.collect.ImmutableList;
+
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Tests for {@link SavedHearingDevicePreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothUtils.class})
+public class SavedHearingDevicePreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "preference_key";
+    private static final String DEVICE_NAME = "device";
+
+    private Context mContext;
+    private SavedHearingDevicePreferenceController mSavedHearingDevicePreferenceController;
+    @Mock
+    private SavedHearingDeviceUpdater mSavedHearingDeviceUpdater;
+    @Mock
+    private CachedBluetoothDeviceManager mCachedDeviceManager;
+    @Mock
+    private LocalBluetoothManager mLocalBluetoothManager;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice;
+    @Mock
+    private BluetoothDevice mDevice;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = ApplicationProvider.getApplicationContext();
+        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+        when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
+        when(mCachedDevice.getDevice()).thenReturn(mDevice);
+        when(mCachedDevice.getName()).thenReturn(DEVICE_NAME);
+        when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
+                ImmutableList.of(mCachedDevice));
+
+        mSavedHearingDevicePreferenceController =
+                new SavedHearingDevicePreferenceController(mContext, PREFERENCE_KEY);
+        mSavedHearingDevicePreferenceController.init(mSavedHearingDeviceUpdater);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void updateDynamicRawDataToIndex_isNotHearingAidDevice_deviceIsNotSearchable() {
+        when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+        when(mDevice.isConnected()).thenReturn(false);
+        when(mCachedDevice.isHearingAidDevice()).thenReturn(false);
+        List<SearchIndexableRaw> searchData = new ArrayList<>();
+
+        mSavedHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData);
+
+        assertThat(searchData).isEmpty();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void updateDynamicRawDataToIndex_isHearingAidDevice_deviceIsSearchable() {
+        when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+        when(mDevice.isConnected()).thenReturn(false);
+        when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
+        List<SearchIndexableRaw> searchData = new ArrayList<>();
+
+        mSavedHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData);
+
+        assertThat(searchData).isNotEmpty();
+        assertThat(searchData.get(0).key).contains(DEVICE_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt
new file mode 100644
index 00000000000..bdc69c94587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TextReadingScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = TextReadingScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_TEXT_READING_SCREEN
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(TextReadingScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
index 008f542b500..70290af8a61 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
@@ -34,13 +34,8 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.provider.Settings;
 import android.service.quicksettings.TileService;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
@@ -55,7 +50,6 @@ import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragm
 import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -75,8 +69,6 @@ import java.util.Set;
 @RunWith(RobolectricTestRunner.class)
 public class ToggleAccessibilityServicePreferenceFragmentTest {
 
-    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
     private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
     private static final String PLACEHOLDER_PACKAGE_NAME2 = "com.placeholder.example2";
     private static final String PLACEHOLDER_SERVICE_CLASS_NAME = "a11yservice1";
@@ -314,30 +306,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void getDefaultShortcutTypes_noAssociatedTile_softwareTypeIsDefault() throws Throwable {
-        PreferredShortcuts.clearPreferredShortcuts(mContext);
-        setupAccessibilityServiceInfoForFragment(
-                /* isAccessibilityTool= */ true,
-                /* tileService= */ null
-                /* warningRequired= */);
-
-        assertThat(mFragment.getDefaultShortcutTypes())
-                .isEqualTo(ShortcutConstants.UserShortcutType.SOFTWARE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void getDefaultShortcutTypes_hasAssociatedTile_softwareTypeIsDefault() {
-        PreferredShortcuts.clearPreferredShortcuts(mContext);
-        when(mFragment.getTileComponentName()).thenReturn(PLACEHOLDER_TILE_COMPONENT_NAME);
-
-        assertThat(mFragment.getDefaultShortcutTypes())
-                .isEqualTo(ShortcutConstants.UserShortcutType.SOFTWARE);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getDefaultShortcutTypes_isAccessibilityTool_hasAssociatedTile_qsTypeIsDefault()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -351,7 +319,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getDefaultShortcutTypes_isNotAccessibilityTool_hasAssociatedTile_softwareTypeIsDefault()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -365,7 +332,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getDefaultShortcutTypes_isAccessibilityTool_noAssociatedTile_softwareTypeIsDefault()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -379,7 +345,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getDefaultShortcutTypes_isNotAccessibilityTool_noAssociatedTile_softwareTypeIsDefault()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -393,7 +358,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void toggleShortcutPreference_noUserPreferredShortcut_hasQsTile_enableQsShortcut()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -413,7 +377,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void toggleShortcutPreference_noUserPreferredShortcut_noQsTile_enableSoftwareShortcut()
             throws Throwable {
         PreferredShortcuts.clearPreferredShortcuts(mContext);
@@ -433,47 +396,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void toggleShortcutPreference_noUserPreferredShortcut_hasQsTile_flagOff_enableSoftwareShortcut()
-            throws Throwable {
-        PreferredShortcuts.clearPreferredShortcuts(mContext);
-        setupAccessibilityServiceInfoForFragment(
-                /* isAccessibilityTool= */ true,
-                /* tileService= */ PLACEHOLDER_TILE_COMPONENT_NAME
-                /* warningRequired= */);
-        mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
-
-        mFragment.mShortcutPreference.setChecked(true);
-        mFragment.onToggleClicked(mFragment.mShortcutPreference);
-
-        assertThat(
-                Settings.Secure.getString(mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS))
-                .contains(mFragment.mComponentName.flattenToString());
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void toggleShortcutPreference_noUserPreferredShortcut_noQsTile_flagOff_enableSoftwareShortcut()
-            throws Throwable {
-        PreferredShortcuts.clearPreferredShortcuts(mContext);
-        setupAccessibilityServiceInfoForFragment(
-                /* isAccessibilityTool= */ true,
-                /* tileService= */ null
-                /* warningRequired= */);
-        mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
-
-        mFragment.mShortcutPreference.setChecked(true);
-        mFragment.onToggleClicked(mFragment.mShortcutPreference);
-
-        assertThat(
-                Settings.Secure.getString(mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS))
-                .contains(mFragment.mComponentName.flattenToString());
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void toggleShortcutPreference_userPreferVolumeKeysShortcut_noQsTile_enableVolumeKeysShortcut()
             throws Throwable {
         setupAccessibilityServiceInfoForFragment(
@@ -498,7 +420,6 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void toggleShortcutPreference_userPreferVolumeKeysShortcut_hasQsTile_enableVolumeKeysShortcut()
             throws Throwable {
         setupAccessibilityServiceInfoForFragment(
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
index 1a82a25b2f7..cbd449305d4 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
@@ -18,7 +18,8 @@ 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.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_USE_SERVICE_PREFERENCE;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SHORTCUT_PREFERENCE;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SWITCH_PREFERENCE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -32,12 +33,12 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
 import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.fragment.app.FragmentActivity;
@@ -50,6 +51,7 @@ import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltip
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
 import com.android.settings.widget.SettingsMainSwitchPreference;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -63,6 +65,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /** Tests for {@link ToggleColorInversionPreferenceFragment} */
@@ -93,10 +96,10 @@ public class ToggleColorInversionPreferenceFragmentTest {
         when(mActivity.getContentResolver()).thenReturn(mContext.getContentResolver());
 
         mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));
-        when(mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE))
+        when(mScreen.findPreference(mFragment.getUseServicePreferenceKey()))
                 .thenReturn(mFragment.mToggleServiceSwitchPreference);
         doReturn(mScreen).when(mFragment).getPreferenceScreen();
-        mSwitchPreference = mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE);
+        mSwitchPreference = mScreen.findPreference(mFragment.getUseServicePreferenceKey());
     }
 
     @Test
@@ -136,25 +139,6 @@ public class ToggleColorInversionPreferenceFragmentTest {
         assertThat(getLatestPopupWindow()).isNull();
     }
 
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF);
-        mSwitchPreference.setChecked(false);
-        mFragment.onAttach(mContext);
-        mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
-        mFragment.onViewCreated(mFragment.getView(), Bundle.EMPTY);
-
-        mFragment.onPreferenceToggled(mSwitchPreference.getKey(), true);
-
-        final boolean isEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF) == ON;
-        assertThat(isEnabled).isTrue();
-        assertThat(getLatestPopupWindow()).isNotNull();
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
     @Test
     public void onPreferenceToggled_colorCorrectEnabled_shouldReturnFalseAndNotShowTooltipView() {
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -199,6 +183,41 @@ public class ToggleColorInversionPreferenceFragmentTest {
         assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
+    @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagOff_returnShortcutIndexablePreferences() {
+        List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+        assertThat(rawData).hasSize(1);
+        assertThat(rawData.get(0).key).isEqualTo(KEY_SHORTCUT_PREFERENCE);
+        assertThat(rawData.get(0).title).isEqualTo(mContext.getString(
+                R.string.accessibility_display_inversion_shortcut_title));
+
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagOn_returnAllIndexablePreferences() {
+        String[] expectedKeys = {KEY_SHORTCUT_PREFERENCE, KEY_SWITCH_PREFERENCE};
+        String[] expectedTitles = {
+                mContext.getString(R.string.accessibility_display_inversion_shortcut_title),
+                mContext.getString(R.string.accessibility_display_inversion_switch_title)};
+        List<String> keysResultList = new ArrayList<>();
+        List<String> titlesResultList = new ArrayList<>();
+        List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+        for (SearchIndexableRaw rawDataItem : rawData) {
+            keysResultList.add(rawDataItem.key);
+            titlesResultList.add(rawDataItem.title);
+        }
+
+        assertThat(rawData).hasSize(2);
+        assertThat(keysResultList).containsExactly(expectedKeys);
+        assertThat(titlesResultList).containsExactly(expectedTitles);
+    }
+
     private static PopupWindow getLatestPopupWindow() {
         final ShadowApplication shadowApplication =
                 Shadow.extract(ApplicationProvider.getApplicationContext());
@@ -220,7 +239,7 @@ public class ToggleColorInversionPreferenceFragmentTest {
             mComponentName = PLACEHOLDER_COMPONENT_NAME;
             final SettingsMainSwitchPreference switchPreference =
                     new SettingsMainSwitchPreference(context);
-            switchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+            switchPreference.setKey(getUseServicePreferenceKey());
             mToggleServiceSwitchPreference = switchPreference;
             setArguments(new Bundle());
         }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
index a5bfec2f0db..390a8ca6e38 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
@@ -18,7 +18,8 @@ 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.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_USE_SERVICE_PREFERENCE;
+import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_SHORTCUT_PREFERENCE;
+import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_SWITCH_PREFERENCE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -27,9 +28,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
-import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.fragment.app.Fragment;
@@ -39,6 +40,7 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.widget.SettingsMainSwitchPreference;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -49,6 +51,7 @@ import org.robolectric.android.controller.ActivityController;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /** Tests for {@link ToggleDaltonizerPreferenceFragment} */
@@ -103,23 +106,6 @@ public class ToggleDaltonizerPreferenceFragmentTest {
         assertThat(getLatestPopupWindow()).isNull();
     }
 
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
-        ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
-        SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
-
-        fragment.onPreferenceToggled(switchPreference.getKey(), true);
-
-        final boolean isEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF) == ON;
-        assertThat(isEnabled).isTrue();
-        assertThat(getLatestPopupWindow()).isNotNull();
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
     @Test
     public void onPreferenceToggled_colorCorrectEnabled_shouldReturnFalseAndNotShowTooltipView() {
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -169,6 +155,37 @@ public class ToggleDaltonizerPreferenceFragmentTest {
         assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
+    @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagOff_returnEmptyData() {
+        List<SearchIndexableRaw> rawData = ToggleDaltonizerPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+        assertThat(rawData).isEmpty();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagOn_returnAllIndexablePreferences() {
+        String[] expectedKeys = {KEY_SHORTCUT_PREFERENCE, KEY_SWITCH_PREFERENCE};
+        String[] expectedTitles = {
+                mContext.getString(R.string.accessibility_daltonizer_shortcut_title),
+                mContext.getString(R.string.accessibility_daltonizer_primary_switch_title)};
+        List<String> keysResultList = new ArrayList<>();
+        List<String> titlesResultList = new ArrayList<>();
+        List<SearchIndexableRaw> rawData = ToggleDaltonizerPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+        for (SearchIndexableRaw rawDataItem : rawData) {
+            keysResultList.add(rawDataItem.key);
+            titlesResultList.add(rawDataItem.title);
+        }
+
+        assertThat(rawData).hasSize(2);
+        assertThat(keysResultList).containsExactly(expectedKeys);
+        assertThat(titlesResultList).containsExactly(expectedTitles);
+    }
+
     private static PopupWindow getLatestPopupWindow() {
         final ShadowApplication shadowApplication =
                 Shadow.extract(ApplicationProvider.getApplicationContext());
@@ -189,6 +206,6 @@ public class ToggleDaltonizerPreferenceFragmentTest {
 
     private SettingsMainSwitchPreference getMainFeatureToggle(
             ToggleDaltonizerPreferenceFragment fragment) {
-        return fragment.findPreference(KEY_USE_SERVICE_PREFERENCE);
+        return fragment.findPreference(fragment.getUseServicePreferenceKey());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 71855e023d0..86322f916b0 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -26,7 +26,6 @@ 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;
@@ -38,7 +37,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.icu.text.CaseMap;
 import android.os.Bundle;
-import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
@@ -142,7 +140,6 @@ public class ToggleFeaturePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = {ShadowFragment.class})
     public void onResume_flagEnabled_haveRegisterToSpecificUris() {
         mFragment.onAttach(mContext);
@@ -166,31 +163,6 @@ public class ToggleFeaturePreferenceFragmentTest {
                 any(AccessibilitySettingsContentObserver.class));
     }
 
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    @Config(shadows = {ShadowFragment.class})
-    public void onResume_flagDisabled_haveRegisterToSpecificUris() {
-        mFragment.onAttach(mContext);
-        mFragment.onCreate(Bundle.EMPTY);
-
-        mFragment.onResume();
-
-        verify(mContentResolver).registerContentObserver(
-                eq(Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS)),
-                eq(false),
-                any(AccessibilitySettingsContentObserver.class));
-        verify(mContentResolver).registerContentObserver(
-                eq(Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE)),
-                eq(false),
-                any(AccessibilitySettingsContentObserver.class));
-        verify(mContentResolver, never()).registerContentObserver(
-                eq(Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_QS_TARGETS)),
-                eq(false),
-                any(AccessibilitySettingsContentObserver.class));
-    }
-
     @Test
     public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
         mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
@@ -235,22 +207,11 @@ public class ToggleFeaturePreferenceFragmentTest {
     @Test
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnDisabledService_notShowTooltipView() {
-        mFragment.onPreferenceToggled(
-                ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ false);
+        mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ false);
 
         assertThat(getLatestPopupWindow()).isNull();
     }
 
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    @Config(shadows = ShadowFragment.class)
-    public void onPreferenceToggledOnEnabledService_showTooltipView() {
-        mFragment.onPreferenceToggled(
-                ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
-
-        assertThat(getLatestPopupWindow().isShowing()).isTrue();
-    }
-
     @Test
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnEnabledService_inSuw_toolTipViewShouldNotShow() {
@@ -258,26 +219,11 @@ public class ToggleFeaturePreferenceFragmentTest {
         suwIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
         when(mActivity.getIntent()).thenReturn(suwIntent);
 
-        mFragment.onPreferenceToggled(
-                ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
+        mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ true);
 
         assertThat(getLatestPopupWindow()).isNull();
     }
 
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    @Config(shadows = ShadowFragment.class)
-    public void onPreferenceToggledOnEnabledService_tooltipViewShown_notShowTooltipView() {
-        mFragment.onPreferenceToggled(
-                ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
-        getLatestPopupWindow().dismiss();
-
-        mFragment.onPreferenceToggled(
-                ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
-
-        assertThat(getLatestPopupWindow().isShowing()).isFalse();
-    }
-
     @Test
     public void initTopIntroPreference_hasTopIntroTitle_shouldSetAsExpectedValue() {
         mFragment.mTopIntroTitle = DEFAULT_TOP_INTRO;
@@ -370,16 +316,14 @@ public class ToggleFeaturePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = ShadowFragment.class)
-    public void showQuickSettingsTooltipIfNeeded_qsFlagOn_dontShowTooltipView() {
+    public void showQuickSettingsTooltipIfNeeded_dontShowTooltipView() {
         mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT);
 
         assertThat(getLatestPopupWindow()).isNull();
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
         final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
                 PLACEHOLDER_COMPONENT_NAME.flattenToString(),
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragmentTest.java
new file mode 100644
index 00000000000..7450d948438
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragmentTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ToggleReduceBrightColorsPreferenceFragment.KEY_SHORTCUT;
+import static com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment.KEY_SWITCH;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settingslib.search.SearchIndexableRaw;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Tests for {@link ToggleReduceBrightColorsPreferenceFragment} */
+@RunWith(RobolectricTestRunner.class)
+public class ToggleReduceBrightColorsPreferenceFragmentTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagOn_returnPreferencesCreatedInCodes() {
+        String[] expectedKeys = {KEY_SHORTCUT, KEY_SWITCH};
+        String[] expectedTitles = {
+                mContext.getString(R.string.reduce_bright_colors_shortcut_title),
+                mContext.getString(R.string.reduce_bright_colors_switch_title)};
+        List<String> keysResultList = new ArrayList<>();
+        List<String> titlesResultList = new ArrayList<>();
+        List<SearchIndexableRaw> rawData = ToggleReduceBrightColorsPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+        for (SearchIndexableRaw rawDataItem : rawData) {
+            keysResultList.add(rawDataItem.key);
+            titlesResultList.add(rawDataItem.title);
+        }
+
+        // Verify that `getRawDataToIndex` includes the preferences created in codes
+        assertThat(keysResultList).containsAtLeastElementsIn(expectedKeys);
+        assertThat(titlesResultList).containsAtLeastElementsIn(expectedTitles);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 038672fc198..0b385941997 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -24,6 +24,7 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 import static com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode;
+import static com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment.KEY_MAGNIFICATION_SHORTCUT_PREFERENCE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -70,6 +71,7 @@ import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settings.testutils.shadow.ShadowStorageManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import com.google.common.truth.Correspondence;
 
@@ -335,8 +337,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onResume_flagEnabled_haveRegisterToSpecificUris() {
+    public void onResume_haveRegisterToSpecificUris() {
         ShadowContentResolver shadowContentResolver = Shadows.shadowOf(
                 mContext.getContentResolver());
         Uri[] observedUri = new Uri[]{
@@ -365,38 +366,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
         }
     }
 
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void onResume_flagDisabled_haveRegisterToSpecificUris() {
-        ShadowContentResolver shadowContentResolver = Shadows.shadowOf(
-                mContext.getContentResolver());
-        Uri[] observedUri = new Uri[]{
-                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS),
-                Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE),
-                Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED),
-                Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED)
-        };
-        for (Uri uri : observedUri) {
-            // verify no observer registered before launching the fragment
-            assertThat(shadowContentResolver.getContentObservers(uri)).isEmpty();
-        }
-
-        mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
-
-        for (Uri uri : observedUri) {
-            Collection<ContentObserver> observers = shadowContentResolver.getContentObservers(uri);
-            assertThat(observers.size()).isEqualTo(1);
-            assertThat(observers.stream().findFirst().get()).isInstanceOf(
-                    AccessibilitySettingsContentObserver.class);
-        }
-        assertThat(shadowContentResolver.getContentObservers(
-                Settings.Secure.getUriFor(
-                        Settings.Secure.ACCESSIBILITY_QS_TARGETS))).hasSize(0);
-    }
-
     @Test
     @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
     public void onResume_oneFingerPanningFlagOn_registerToSpecificUri() {
@@ -460,20 +429,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
     }
 
     @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_optInValue_haveMatchString() {
-        int shortcutTypes = SOFTWARE | TRIPLETAP;
-
-        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
-                shortcutTypes);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                MAGNIFICATION_CONTROLLER_NAME);
-        assertThat(getMagnificationTripleTapStatus()).isTrue();
-    }
-
-    @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_optInValue_callA11yManager() {
         int shortcutTypes =
                 SOFTWARE | TRIPLETAP | HARDWARE
@@ -498,48 +453,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
         verifyNoMoreInteractions(mAccessibilityManager);
     }
 
-    @Test
-    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_twoFingerTripleTap_haveMatchString() {
-        int shortcutTypes = TWOFINGER_DOUBLETAP;
-
-        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
-                shortcutTypes);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, OFF)).isEqualTo(ON);
-    }
-
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_existOtherValue_optInValue_haveMatchString() {
-        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
-
-        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
-                SOFTWARE);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
-    }
-
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optInAllValuesToSettings_software_sizeValueIsNull_putLargeSizeValue() {
-        ShadowSettings.ShadowSecure.reset();
-
-        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
-                SOFTWARE);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                FloatingMenuSizePreferenceController.Size.UNKNOWN)).isEqualTo(
-                FloatingMenuSizePreferenceController.Size.LARGE);
-    }
-
     @Test
     public void optInAllValuesToSettings_software_sizeValueIsNotNull_sizeValueIsNotChanged() {
-        for (int size : new int[] {FloatingMenuSizePreferenceController.Size.LARGE,
+        for (int size : new int[]{FloatingMenuSizePreferenceController.Size.LARGE,
                 FloatingMenuSizePreferenceController.Size.SMALL}) {
             Settings.Secure.putInt(mContext.getContentResolver(),
                     Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, size);
@@ -557,7 +473,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
 
     @Test
     public void optInAllValuesToSettings_hardware_sizeValueIsNotChanged() {
-        for (int size : new int[] {FloatingMenuSizePreferenceController.Size.UNKNOWN,
+        for (int size : new int[]{FloatingMenuSizePreferenceController.Size.UNKNOWN,
                 FloatingMenuSizePreferenceController.Size.LARGE,
                 FloatingMenuSizePreferenceController.Size.SMALL}) {
             Settings.Secure.putInt(mContext.getContentResolver(),
@@ -575,7 +491,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
 
     @Test
     public void optInAllValuesToSettings_tripletap_sizeValueIsNotChanged() {
-        for (int size : new int[] {FloatingMenuSizePreferenceController.Size.UNKNOWN,
+        for (int size : new int[]{FloatingMenuSizePreferenceController.Size.UNKNOWN,
                 FloatingMenuSizePreferenceController.Size.LARGE,
                 FloatingMenuSizePreferenceController.Size.SMALL}) {
             Settings.Secure.putInt(mContext.getContentResolver(),
@@ -592,24 +508,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
     }
 
     @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutAllValuesToSettings_optOutValue_emptyString() {
-        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
-        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
-        setMagnificationTripleTapEnabled(/* enabled= */ true);
-        int shortcutTypes =
-                SOFTWARE | HARDWARE | TRIPLETAP;
-
-        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
-                mContext, shortcutTypes);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
-        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEmpty();
-        assertThat(getMagnificationTripleTapStatus()).isFalse();
-    }
-
-    @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutAllValuesToSettings_optOutValue_callA11yManager() {
         Set<String> shortcutTargets = Set.of(MAGNIFICATION_CONTROLLER_NAME);
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
@@ -633,38 +531,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
         verifyNoMoreInteractions(mAccessibilityManager);
     }
 
-    @Test
-    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutAllValuesToSettings_twoFingerTripleTap_settingsValueIsOff() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
-
-        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
-                mContext, TWOFINGER_DOUBLETAP);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON)).isEqualTo(OFF);
-    }
-
-    @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void optOutValueFromSettings_existOtherValue_optOutValue_haveMatchString() {
-        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY,
-                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
-        putStringIntoSettings(HARDWARE_SHORTCUT_KEY,
-                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
-        int shortcutTypes = SOFTWARE | HARDWARE;
-
-        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
-                mContext, shortcutTypes);
-
-        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                PLACEHOLDER_COMPONENT_NAME.flattenToString());
-        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
-                PLACEHOLDER_COMPONENT_NAME.flattenToString());
-    }
-
     @Test
     public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
         mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
@@ -977,7 +843,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
         final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
                 MAGNIFICATION_CONTROLLER_NAME,
@@ -1025,6 +890,107 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
                 .isEqualTo(collectionInfo.getImportantForAccessibilityItemCount() + 1);
     }
 
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_returnsAllPreferenceKeys() {
+        List<String> expectedSearchKeys = List.of(
+                KEY_MAGNIFICATION_SHORTCUT_PREFERENCE,
+                MagnificationModePreferenceController.PREF_KEY,
+                MagnificationFollowTypingPreferenceController.PREF_KEY,
+                MagnificationOneFingerPanningPreferenceController.PREF_KEY,
+                MagnificationAlwaysOnPreferenceController.PREF_KEY,
+                MagnificationJoystickPreferenceController.PREF_KEY);
+
+        final List<SearchIndexableRaw> rawData = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+        final List<String> actualSearchKeys = rawData.stream().map(raw -> raw.key).toList();
+
+        assertThat(actualSearchKeys).containsExactlyElementsIn(expectedSearchKeys);
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void
+            getNonIndexableKeys_windowMagnificationNotSupported_onlyShortcutPreferenceSearchable() {
+        setWindowMagnificationSupported(false, false);
+
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        final List<SearchIndexableRaw> rawData = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+        // Expect all search data, except the shortcut preference, to be in NIKs.
+        final List<String> expectedNiks = rawData.stream().map(raw -> raw.key)
+                .filter(key -> !key.equals(KEY_MAGNIFICATION_SHORTCUT_PREFERENCE)).toList();
+
+        // In NonIndexableKeys == not searchable
+        assertThat(niks).containsExactlyElementsIn(expectedNiks);
+    }
+
+    @Test
+    @EnableFlags({
+            com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH,
+            Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE})
+    public void getNonIndexableKeys_hasShortcutAndAllFeaturesEnabled_allItemsSearchable() {
+        setMagnificationTripleTapEnabled(true);
+        setAlwaysOnSupported(true);
+        setJoystickSupported(true);
+
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        // Empty NonIndexableKeys == all indexed items are searchable
+        assertThat(niks).isEmpty();
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getNonIndexableKeys_noShortcut_alwaysOnSupported_notSearchable() {
+        setMagnificationTripleTapEnabled(false);
+        setAlwaysOnSupported(true);
+
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        // In NonIndexableKeys == not searchable
+        assertThat(niks).contains(MagnificationAlwaysOnPreferenceController.PREF_KEY);
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getNonIndexableKeys_hasShortcut_alwaysOnNotSupported_notSearchable() {
+        setMagnificationTripleTapEnabled(true);
+        setAlwaysOnSupported(false);
+
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        // In NonIndexableKeys == not searchable
+        assertThat(niks).contains(MagnificationAlwaysOnPreferenceController.PREF_KEY);
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    @DisableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
+    public void getNonIndexableKeys_oneFingerPanningNotSupported_notSearchable() {
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        // In NonIndexableKeys == not searchable
+        assertThat(niks).contains(MagnificationOneFingerPanningPreferenceController.PREF_KEY);
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getNonIndexableKeys_joystickNotSupported_notSearchable() {
+        setJoystickSupported(false);
+
+        final List<String> niks = ToggleScreenMagnificationPreferenceFragment
+                .SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        // In NonIndexableKeys == not searchable
+        assertThat(niks).contains(MagnificationJoystickPreferenceController.PREF_KEY);
+    }
+
     private void putStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt
new file mode 100644
index 00000000000..40ed9a3dda8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import android.os.Vibrator
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settings.R
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class VibrationIntensityScreenTest : CatalystScreenTestCase() {
+    private lateinit var vibrator: Vibrator
+
+    private val resourcesSpy: Resources =
+        spy((ApplicationProvider.getApplicationContext() as Context).resources)
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when {
+                    name == getSystemServiceName(Vibrator::class.java) -> vibrator
+                    else -> super.getSystemService(name)
+                }
+            override fun getResources(): Resources = resourcesSpy
+        }
+
+    override val preferenceScreenCreator = VibrationIntensityScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_VIBRATION_INTENSITY_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(VibrationIntensityScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_noVibrator_unavailable() {
+        vibrator = mock { on { hasVibrator() } doReturn false }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 3
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasVibratorAndSingleIntensityLevel_unavailable() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasVibratorAndMultipleIntensityLevels_available() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 2
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+}
+// LINT.ThenChange(VibrationPreferenceControllerTest.java)
+
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java
index 6f5700347a7..9caa211ebfa 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceControllerTest.java
@@ -41,6 +41,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link VibrationMainSwitchPreferenceController}. */
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class VibrationMainSwitchPreferenceControllerTest {
 
@@ -104,3 +105,4 @@ public class VibrationMainSwitchPreferenceControllerTest {
         return Settings.System.getInt(mContext.getContentResolver(), settingKey);
     }
 }
+// LINT.ThenChange(VibrationMainSwitchPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceTest.kt b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceTest.kt
new file mode 100644
index 00000000000..17ba358aad9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.System.VIBRATE_ON
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.MainSwitchPreference
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class VibrationMainSwitchPreferenceTest {
+    private val context: Context = ApplicationProvider.getApplicationContext()
+    private val preference = VibrationMainSwitchPreference()
+
+    @Test
+    fun checked_valueUnset_returnDefaultTrue() {
+        setVibrateOn(null)
+
+        assertThat(getMainSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun checked_valueEnabled_returnTrue() {
+        setVibrateOn(true)
+
+        assertThat(getMainSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun checked_valueDisabled_returnFalse() {
+        setVibrateOn(false)
+
+        assertThat(getMainSwitchPreference().isChecked).isFalse()
+    }
+
+    @Test
+    fun click_updatesCorrectly() {
+        setVibrateOn(null)
+        val widget = getMainSwitchPreference()
+
+        assertThat(widget.isChecked).isTrue()
+
+        widget.performClick()
+
+        assertThat(widget.isChecked).isFalse()
+
+        widget.performClick()
+
+        assertThat(widget.isChecked).isTrue()
+    }
+
+    private fun getMainSwitchPreference(): MainSwitchPreference =
+        preference.createAndBindWidget(context)
+
+    private fun setVibrateOn(enabled: Boolean?) =
+        preference.storage(context).setBoolean(VIBRATE_ON, enabled)
+}
+// LINT.ThenChange(VibrationMainSwitchPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
index 59ed48638d0..a0481e5eda5 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
@@ -46,6 +46,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class VibrationPreferenceControllerTest {
     private static final String PREFERENCE_KEY = "preference_key";
@@ -158,3 +159,7 @@ public class VibrationPreferenceControllerTest {
         return controller;
     }
 }
+// LINT.ThenChange(
+//     VibrationIntensityScreenTest.kt,
+//     VibrationScreenTest.kt,
+// )
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/VibrationScreenTest.kt
new file mode 100644
index 00000000000..c6e5265a52c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationScreenTest.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import android.os.Vibrator
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settings.R
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class VibrationScreenTest : CatalystScreenTestCase() {
+    private lateinit var vibrator: Vibrator
+
+    private val resourcesSpy: Resources =
+        spy((ApplicationProvider.getApplicationContext() as Context).resources)
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when {
+                    name == getSystemServiceName(Vibrator::class.java) -> vibrator
+                    else -> super.getSystemService(name)
+                }
+            override fun getResources(): Resources = resourcesSpy
+        }
+
+    override val preferenceScreenCreator = VibrationScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_VIBRATION_INTENSITY_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(VibrationScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_noVibrator_unavailable() {
+        vibrator = mock { on { hasVibrator() } doReturn false }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasVibratorAndMultipleIntensityLevels_unavailable() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 3
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasVibratorAndSingleIntensityLevel_available() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        resourcesSpy.stub {
+            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
+        }
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+}
+// LINT.ThenChange(VibrationPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
index 414fe6333f5..dd898e39175 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.accessibility.shortcuts;
 
+import static android.provider.Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS;
+
+import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
@@ -43,8 +46,8 @@ import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.util.Pair;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.testing.FragmentScenario;
 import androidx.lifecycle.Lifecycle;
@@ -160,7 +163,7 @@ public class EditShortcutsPreferenceFragmentTest {
     public void showEditShortcutScreen_inSuw_launchSubSettingWithSuw() {
         EditShortcutsPreferenceFragment.showEditShortcutScreen(
                 mActivity, METRICS_CATEGORY, SCREEN_TITLE,
-                TARGET_FAKE_COMPONENT, createSuwIntent(new Intent(), /* isInSuw= */ true));
+                TARGET_FAKE_COMPONENT, setIntentInSuw(new Intent(), /* isInSuw= */ true));
 
         assertLaunchSubSettingWithCurrentTargetComponents(
                 TARGET_FAKE_COMPONENT.flattenToString(), /* isInSuw= */ true);
@@ -198,6 +201,53 @@ public class EditShortcutsPreferenceFragmentTest {
         });
     }
 
+    @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_defaultLaunch_notVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false, TARGET);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isFalse();
+        });
+    }
+
+    @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_launchFromAction_singleTarget_notVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false, List.of(TARGET),
+                ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isFalse();
+        });
+    }
+
+    @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_launchFromAction_multipleTargets_isVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false,
+                // Both of these components are system components with known labels, so we don't
+                // need to mock AccessibilityManager with fake labels.
+                List.of(TARGET, DALTONIZER_COMPONENT_NAME.flattenToString()),
+                ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isTrue();
+        });
+    }
+
     @Test
     public void fragmentCreated_settingsObserversAreRegistered() {
         ShadowContentResolver contentResolver = shadowOf(mContext.getContentResolver());
@@ -415,7 +465,6 @@ public class EditShortcutsPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void fragmentResumed_enableTouchExploration_qsShortcutOptionSummaryUpdated() {
         String expectedSummary = StringUtil.getIcuPluralsString(mContext, 2,
                 R.string.accessibility_shortcut_edit_dialog_summary_quick_settings);
@@ -435,7 +484,6 @@ public class EditShortcutsPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void fragmentPaused_enableTouchExploration_qsShortcutOptionSummaryNotUpdated() {
         String expectedSummary = StringUtil.getIcuPluralsString(mContext, 1,
                 R.string.accessibility_shortcut_edit_dialog_summary_quick_settings);
@@ -593,7 +641,6 @@ public class EditShortcutsPreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void onQuickSettingsShortcutSettingChanged_preferredShortcutsUpdated() {
         final String target = TARGET_FAKE_COMPONENT.flattenToString();
         mFragmentScenario = createFragScenario(
@@ -654,9 +701,14 @@ public class EditShortcutsPreferenceFragmentTest {
 
     private FragmentScenario<EditShortcutsPreferenceFragment> createFragScenario(
             boolean isInSuw, String target) {
+        return createFragScenario(isInSuw, List.of(target), null);
+    }
+    private FragmentScenario<EditShortcutsPreferenceFragment> createFragScenario(
+            boolean isInSuw, List<String> targets, @Nullable String intentAction) {
         Bundle args = new Bundle();
         args.putStringArray(
-                EditShortcutsPreferenceFragment.ARG_KEY_SHORTCUT_TARGETS, new String[]{target});
+                EditShortcutsPreferenceFragment.ARG_KEY_SHORTCUT_TARGETS,
+                targets.toArray(new String[0]));
         FragmentScenario<EditShortcutsPreferenceFragment> scenario =
                 FragmentScenario.launch(
                         EditShortcutsPreferenceFragment.class, args,
@@ -664,7 +716,11 @@ public class EditShortcutsPreferenceFragmentTest {
         scenario.onFragment(fragment -> {
             Intent intent = fragment.requireActivity().getIntent();
             intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, SCREEN_TITLE);
-            fragment.requireActivity().setIntent(createSuwIntent(intent, isInSuw));
+            setIntentInSuw(intent, isInSuw);
+            if (intentAction != null) {
+                intent.setAction(intentAction);
+            }
+            fragment.requireActivity().setIntent(intent);
             // Since the fragment is attached before we have a chance
             // to modify the activity's intent; initialize controllers again
             fragment.initializePreferenceControllerArguments();
@@ -672,11 +728,7 @@ public class EditShortcutsPreferenceFragmentTest {
         return scenario;
     }
 
-    private Intent createSuwIntent(Intent intent, boolean isInSuw) {
-
-        if (intent == null) {
-            intent = new Intent();
-        }
+    private Intent setIntentInSuw(Intent intent, boolean isInSuw) {
         intent.putExtra(EXTRA_IS_SETUP_FLOW, isInSuw);
         intent.putExtra(EXTRA_IS_FIRST_RUN, isInSuw);
         intent.putExtra(EXTRA_IS_PRE_DEFERRED_SETUP, isInSuw);
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
index 39535cb139a..a58cf072dc6 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
@@ -92,6 +92,7 @@ public class GestureShortcutOptionControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
     public void getSummary_touchExplorationDisabled_notInSuw_verifySummary() {
         enableTouchExploration(false);
         mController.setInSetupWizard(false);
@@ -106,6 +107,19 @@ public class GestureShortcutOptionControllerTest {
         assertThat(mController.getSummary().toString()).isEqualTo(expected);
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED)
+    public void getSummary_touchExplorationDisabled_notInSuw_gestureFlag_verifySummary() {
+        enableTouchExploration(false);
+        mController.setInSetupWizard(false);
+        String expected = StringUtil.getIcuPluralsString(
+                mContext,
+                /* count= */ 2,
+                R.string.accessibility_shortcut_edit_dialog_summary_gesture);
+
+        assertThat(mController.getSummary().toString()).isEqualTo(expected);
+    }
+
     @Test
     public void getSummary_touchExplorationDisabled_inSuw_verifySummary() {
         enableTouchExploration(false);
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java
index 55fbd8e3249..8f26c99be11 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java
@@ -27,11 +27,7 @@ import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserHandle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -45,7 +41,6 @@ import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.utils.StringUtil;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -67,8 +62,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     private static final String TARGET_FLATTEN = TARGET.flattenToString();
     private static final ComponentName TARGET_TILE =
             new ComponentName("FakePackage", "FakeTileClass");
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private final Context mContext = spy(ApplicationProvider.getApplicationContext());
     private QuickSettingsShortcutOptionController mController;
@@ -149,13 +142,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void isShortcutAvailable_a11yQsShortcutFlagDisabled_returnsFalse() {
-        assertThat(mController.isShortcutAvailable()).isFalse();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void isShortcutAvailable_qsNotSupported_returnsFalse() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_quickSettingsSupported, false);
@@ -164,7 +150,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void isShortcutAvailable_qsTileProvided_returnsTrue() {
         when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
                 .thenReturn(Map.of(TARGET, TARGET_TILE));
@@ -173,7 +158,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void isShortcutAvailable_qsTileNotProvided_returnsFalse() {
         when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
                 .thenReturn(Collections.emptyMap());
@@ -182,7 +166,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void isShortcutAvailable_qsTileProvided_invalidUseCase_returnFalse() {
         AccessibilityServiceInfo mockStandardA11yService =
                 AccessibilityTestUtils.createAccessibilityServiceInfo(
@@ -197,7 +180,6 @@ public class QuickSettingsShortcutOptionControllerTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void isShortcutAvailable_qsTileProvided_validUseCase_returnTrue() {
         AccessibilityServiceInfo mockAlwaysOnA11yService =
                 AccessibilityTestUtils.createAccessibilityServiceInfo(
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
index 1eeb9446c21..74e9870522a 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
@@ -33,14 +33,11 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.os.UserHandle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.fragment.app.FragmentActivity;
 
@@ -50,10 +47,8 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SubSettings;
 import com.android.settings.accessibility.AccessibilityButtonFragment;
-import com.android.settings.accessibility.FloatingMenuSizePreferenceController;
 import com.android.settings.testutils.AccessibilityTestUtils;
 import com.android.settings.utils.AnnotationSpan;
-import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -178,23 +173,6 @@ public class SoftwareShortcutOptionPreferenceControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableShortcut_shortcutTurnedOn() {
-        String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
-        mController.setShortcutTargets(Set.of(target));
-        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
-                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
-        )).isFalse();
-
-        mController.enableShortcutForTargets(true);
-
-        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
-                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
-        )).isTrue();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_callA11yManager() {
         String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
         mController.setShortcutTargets(Set.of(target));
@@ -214,25 +192,6 @@ public class SoftwareShortcutOptionPreferenceControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableShortcut_shortcutTurnedOff() {
-        String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
-        ShortcutUtils.optInValueToSettings(
-                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target);
-        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
-                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
-        )).isTrue();
-        mController.setShortcutTargets(Set.of(target));
-
-        mController.enableShortcutForTargets(false);
-
-        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
-                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
-        )).isFalse();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_callA11yManager() {
         String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
         ShortcutUtils.optInValueToSettings(
@@ -253,89 +212,6 @@ public class SoftwareShortcutOptionPreferenceControllerTest {
         verifyNoMoreInteractions(mAccessibilityManager);
     }
 
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableShortcutWithMagnification_menuSizeIncreased() {
-        mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
-
-        mController.enableShortcutForTargets(true);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                        FloatingMenuSizePreferenceController.Size.UNKNOWN))
-                .isEqualTo(FloatingMenuSizePreferenceController.Size.LARGE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableShortcutWithMagnification_userConfigureSmallMenuSize_menuSizeNotChanged() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                FloatingMenuSizePreferenceController.Size.SMALL);
-        mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
-
-        mController.enableShortcutForTargets(true);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
-                        FloatingMenuSizePreferenceController.Size.UNKNOWN))
-                .isEqualTo(FloatingMenuSizePreferenceController.Size.SMALL);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableAlwaysOnServiceShortcut_turnsOnAlwaysOnService() {
-        mController.setShortcutTargets(
-                Set.of(TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString()));
-
-        mController.enableShortcutForTargets(true);
-
-        assertThat(AccessibilityUtils.getEnabledServicesFromSettings(mContext))
-                .contains(TARGET_ALWAYS_ON_A11Y_SERVICE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableAlwaysOnServiceShortcut_turnsOffAlwaysOnService() {
-        mController.setShortcutTargets(
-                Set.of(TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString()));
-
-        mController.enableShortcutForTargets(false);
-
-        assertThat(AccessibilityUtils.getEnabledServicesFromSettings(mContext))
-                .doesNotContain(TARGET_ALWAYS_ON_A11Y_SERVICE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableStandardServiceShortcut_wontTurnOnService() {
-        mController.setShortcutTargets(
-                Set.of(TARGET_STANDARD_A11Y_SERVICE.flattenToString()));
-
-        mController.enableShortcutForTargets(true);
-
-        assertThat(AccessibilityUtils.getEnabledServicesFromSettings(mContext))
-                .doesNotContain(TARGET_STANDARD_A11Y_SERVICE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableStandardServiceShortcutWithServiceOn_wontTurnOffService() {
-        mController.setShortcutTargets(
-                Set.of(TARGET_STANDARD_A11Y_SERVICE.flattenToString()));
-        AccessibilityUtils.setAccessibilityServiceState(
-                mContext, TARGET_STANDARD_A11Y_SERVICE, /* enabled= */ true);
-
-        mController.enableShortcutForTargets(false);
-
-        assertThat(AccessibilityUtils.getEnabledServicesFromSettings(mContext))
-                .contains(TARGET_STANDARD_A11Y_SERVICE);
-    }
-
     private void assertLaunchSettingsPage(String page) {
         ContextWrapper applicationContext = (Application) mContext.getApplicationContext();
         final Intent intent = Shadows.shadowOf(applicationContext).getNextStartedActivity();
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
index 1ffd042b172..6526862634f 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
@@ -28,12 +28,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserHandle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -182,20 +179,6 @@ public class TripleTapShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableShortcut_settingUpdated() {
-        mController.enableShortcutForTargets(true);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
-                        AccessibilityUtil.State.OFF)
-        ).isEqualTo(AccessibilityUtil.State.ON);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_callA11yManager() {
         mController.enableShortcutForTargets(true);
 
@@ -209,20 +192,6 @@ public class TripleTapShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableShortcut_settingUpdated() {
-        mController.enableShortcutForTargets(false);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
-                        AccessibilityUtil.State.OFF)
-        ).isEqualTo(AccessibilityUtil.State.OFF);
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_callA11yManager() {
         mController.enableShortcutForTargets(false);
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
index dde60e902fa..53048b00775 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
@@ -143,20 +143,6 @@ public class TwoFingerDoubleTapShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableShortcut_settingUpdated() {
-        mController.enableShortcutForTargets(true);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
-                        AccessibilityUtil.State.OFF)
-        ).isEqualTo(AccessibilityUtil.State.ON);
-    }
-
-    @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_callA11yManager() {
         mController.enableShortcutForTargets(true);
 
@@ -170,20 +156,6 @@ public class TwoFingerDoubleTapShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableShortcut_settingUpdated() {
-        mController.enableShortcutForTargets(false);
-
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
-                        AccessibilityUtil.State.OFF)
-        ).isEqualTo(AccessibilityUtil.State.OFF);
-    }
-
-    @Test
-    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_callA11yManager() {
         mController.enableShortcutForTargets(false);
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
index 511503aceba..d9eb995d18e 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
@@ -25,11 +25,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserHandle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.Flags;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -111,17 +108,6 @@ public class VolumeKeysShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_enableVolumeKeysShortcut_shortcutSet() {
-        mController.enableShortcutForTargets(true);
-
-        assertThat(
-                ShortcutUtils.isComponentIdExistingInSettings(
-                        mContext, ShortcutConstants.UserShortcutType.HARDWARE, TARGET)).isTrue();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableVolumeKeysShortcut_callA11yManager() {
         mController.enableShortcutForTargets(true);
 
@@ -135,17 +121,6 @@ public class VolumeKeysShortcutOptionControllerTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void enableShortcutForTargets_disableVolumeKeysShortcut_shortcutNotSet() {
-        mController.enableShortcutForTargets(false);
-
-        assertThat(
-                ShortcutUtils.isComponentIdExistingInSettings(
-                        mContext, ShortcutConstants.UserShortcutType.HARDWARE, TARGET)).isFalse();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableVolumeKeysShortcut_callA11yManager() {
         mController.enableShortcutForTargets(false);
 
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index efa5fea7416..0b9c6c357a4 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -30,8 +30,11 @@ import static org.mockito.Mockito.when;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
+import android.content.ClipData;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.UserHandle;
 
 import androidx.collection.ArraySet;
@@ -250,4 +253,13 @@ public class AccountTypePreferenceLoaderTest {
         mPrefLoader.filterBlockedFragments(parent, Set.of("nomatch", "other"));
         verify(pref).setOnPreferenceClickListener(any());
     }
+
+    @Test
+    public void isSafeIntent_hasContextScheme_returnFalse() {
+        Intent intent = new Intent();
+        intent.setClipData(ClipData.newRawUri(null,
+                Uri.parse("content://com.android.settings.files/my_cache/NOTICE.html")));
+
+        assertThat(mPrefLoader.isSafeIntent(mPackageManager, intent, mAccount.type)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 5fa426d7dfe..2da25f18891 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -57,7 +57,7 @@ import java.util.Collections;
 public final class AppWithAdminGrantedPermissionsCounterTest {
 
     @Rule
-    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     private final String APP_1 = "app1";
     private final String APP_2 = "app2";
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index a23ca692970..3afca4da892 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -38,11 +38,8 @@ import android.os.Build;
 import android.os.SystemConfigManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
 import android.platform.test.flag.junit.CheckFlagsRule;
 import android.platform.test.flag.junit.DeviceFlagsValueProvider;
-import android.webkit.Flags;
 
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.webview.WebViewUpdateServiceWrapper;
@@ -373,7 +370,6 @@ public final class ApplicationFeatureProviderImplTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_UPDATE_SERVICE_V2)
     public void getKeepEnabledPackages_shouldContainWebViewPackage() {
         final String testWebViewPackageName = "com.android.webview";
         when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName())
@@ -382,16 +378,6 @@ public final class ApplicationFeatureProviderImplTest {
         assertThat(allowlist).contains(testWebViewPackageName);
     }
 
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_UPDATE_SERVICE_V2)
-    public void getKeepEnabledPackages_shouldNotContainWebViewPackageIfFlagDisabled() {
-        final String testWebViewPackageName = "com.android.webview";
-        when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName())
-                .thenReturn(testWebViewPackageName);
-        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
-        assertThat(allowlist).doesNotContain(testWebViewPackageName);
-    }
-
     @Test
     @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
     public void getKeepEnabledPackages_shouldContainPackageInstaller() {
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 6fc01fc52ed..6c29036cb7b 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -60,6 +60,7 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -85,6 +86,7 @@ import org.robolectric.util.ReflectionHelpers;
 
 import java.util.Set;
 
+@Config(shadows = {ShadowUtils.class})
 @RunWith(RobolectricTestRunner.class)
 public class AppButtonsPreferenceControllerTest {
 
@@ -168,6 +170,7 @@ public class AppButtonsPreferenceControllerTest {
     @After
     public void tearDown() {
         ShadowAppUtils.reset();
+        ShadowUtils.reset();
     }
 
     @Test
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 10c2675be82..65c9caf4302 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
@@ -16,28 +16,48 @@
 
 package com.android.settings.applications.appinfo;
 
+import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
+import static android.os.UserManager.RESTRICTION_SOURCE_DEVICE_OWNER;
+import static android.os.UserManager.RESTRICTION_SOURCE_PROFILE_OWNER;
+import static android.os.UserManager.RESTRICTION_SOURCE_SYSTEM;
+import static android.security.advancedprotection.AdvancedProtectionManager.ADVANCED_PROTECTION_SYSTEM_ENTITY;
+
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.EnforcingAdmin;
+import android.app.admin.UnknownAuthority;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.RequiresFlagsDisabled;
+import android.platform.test.annotations.RequiresFlagsEnabled;
+import android.platform.test.flag.junit.CheckFlagsRule;
+import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.security.Flags;
 
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.RestrictedPreferenceHelper;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -51,15 +71,27 @@ import org.robolectric.util.ReflectionHelpers;
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class})
 public class ExternalSourcesDetailsTest {
+    @Rule
+    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
 
+    @Mock
+    private Context mContext;
     @Mock
     private UserManager mUserManager;
     @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
     private RestrictedSwitchPreference mSwitchPref;
     @Mock
     private RestrictedPreferenceHelper mHelper;
     @Mock
     private PackageInfo mPackageInfo;
+    @Mock
+    private AppEntry mAppEntry;
+
+    private final int mAppUid = 10123;
+    private final String mPackageName = "test.pkg";
+    private final UserHandle mUserHandle = UserHandle.getUserHandleForUid(mAppUid);
 
     private ExternalSourcesDetails mFragment;
 
@@ -67,9 +99,17 @@ public class ExternalSourcesDetailsTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        doReturn(mDevicePolicyManager).when(mContext).getSystemService(DevicePolicyManager.class);
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+
         mFragment = new ExternalSourcesDetails();
         ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
         ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
+
+        ApplicationInfo applicationInfo = new ApplicationInfo();
+        applicationInfo.uid = mAppUid;
+        applicationInfo.packageName = mPackageName;
+        mAppEntry.info = applicationInfo;
     }
 
     @Test
@@ -226,4 +266,109 @@ public class ExternalSourcesDetailsTest {
                 UserHandle.of(UserHandle.myUserId()))).isTrue();
         assertThat(mSwitchPref.isDisabledByAdmin()).isTrue();
     }
+
+    @RequiresFlagsDisabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedBySystem_adminString() {
+        when(mUserManager.getUserRestrictionSource(DISALLOW_INSTALL_UNKNOWN_SOURCES, mUserHandle))
+                .thenReturn(RESTRICTION_SOURCE_SYSTEM);
+        when(mContext
+                .getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin))
+                .thenReturn("disabled_by_admin");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled_by_admin", summary.toString());
+    }
+
+    @RequiresFlagsDisabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedByProfileOwner_disabledString() {
+        when(mUserManager.getUserRestrictionSource(DISALLOW_INSTALL_UNKNOWN_SOURCES, mUserHandle))
+                .thenReturn(RESTRICTION_SOURCE_PROFILE_OWNER);
+        when(mContext.getString(com.android.settingslib.R.string.disabled)).thenReturn("disabled");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled", summary.toString());
+    }
+
+    @RequiresFlagsDisabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedByDeviceOwner_disabledString() {
+        when(mUserManager.getUserRestrictionSource(DISALLOW_INSTALL_UNKNOWN_SOURCES, mUserHandle))
+                .thenReturn(RESTRICTION_SOURCE_DEVICE_OWNER);
+        when(mContext.getString(com.android.settingslib.R.string.disabled)).thenReturn("disabled");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled", summary.toString());
+    }
+
+    @RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_baseRestricted_disabledString() {
+        when(mUserManager.hasBaseUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES, mUserHandle))
+                .thenReturn(true);
+        when(mContext.getString(com.android.settingslib.R.string.disabled)).thenReturn("disabled");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled", summary.toString());
+    }
+
+    @RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedOnUser_adminString() {
+        when(mUserManager.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES, mUserHandle))
+                .thenReturn(true);
+        when(mContext
+                .getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin))
+                .thenReturn("disabled_by_admin");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled_by_admin", summary.toString());
+    }
+
+    @RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedGlobally_adminString() {
+        final EnforcingAdmin nonAdvancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
+                UnknownAuthority.UNKNOWN_AUTHORITY, mUserHandle, new ComponentName("", ""));
+
+        when(mDevicePolicyManager.getEnforcingAdmin(mUserHandle.getIdentifier(),
+                DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)).thenReturn(
+                        nonAdvancedProtectionEnforcingAdmin);
+        when(mUserManager.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+                mUserHandle)).thenReturn(true);
+        when(mContext
+                .getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin))
+                .thenReturn("disabled_by_admin");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled_by_admin", summary.toString());
+    }
+
+    @RequiresFlagsEnabled(Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
+    @Test
+    public void getPreferenceSummary_restrictedGlobally_advancedProtectionString() {
+        final EnforcingAdmin advancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
+                new UnknownAuthority(ADVANCED_PROTECTION_SYSTEM_ENTITY), mUserHandle,
+                new ComponentName("", ""));
+
+        when(mDevicePolicyManager.getEnforcingAdmin(mUserHandle.getIdentifier(),
+                DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)).thenReturn(
+                        advancedProtectionEnforcingAdmin);
+        when(mUserManager.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+                mUserHandle)).thenReturn(true);
+        when(mContext.getString(
+                com.android.settingslib.widget.restricted.R.string.disabled_by_advanced_protection))
+                .thenReturn("disabled_by_advanced_protection");
+
+        CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
+
+        assertEquals("disabled_by_advanced_protection", summary.toString());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/contacts/ContactsStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStoragePreferenceControllerTest.java
new file mode 100644
index 00000000000..f954b228176
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStoragePreferenceControllerTest.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.contacts;
+
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.KEY_DEFAULT_ACCOUNT_STATE;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD;
+import static android.provider.ContactsContract.Settings;
+
+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.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.annotations.RequiresFlagsDisabled;
+import android.platform.test.flag.junit.CheckFlagsRule;
+import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;
+import android.provider.Flags;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowAuthenticationHelper.class)
+public class ContactsStoragePreferenceControllerTest {
+
+    private static final String CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY =
+            "contacts_default_account";
+
+    @Rule
+    public final MockitoRule mockito = MockitoJUnit.rule();
+
+    @Rule
+    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    @Mock
+    private Context mContext;
+
+    @Mock
+    private ContentResolver mContentResolver;
+
+    @Mock
+    private ContentProviderClient mContentProviderClient;
+
+    @Mock
+    private Resources mResources;
+
+    @Mock
+    private AccountManager mAccountManager;
+
+    private ContactsStoragePreferenceController mPreferenceController;
+
+    @Before
+    public void setUp() throws Exception {
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mContentResolver.acquireContentProviderClient(
+                eq(ContactsContract.AUTHORITY_URI))).thenReturn(mContentProviderClient);
+        when(mContext.getSystemService(eq(Context.ACCOUNT_SERVICE))).thenReturn(mAccountManager);
+        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[]{});
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)
+    public void getAvailabilityStatus_flagIsOn_shouldReturnAvailable() {
+        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    @RequiresFlagsDisabled(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)
+    public void getAvailabilityStatus_flagIsOff_shouldReturnConditionallyUnavailable() {
+        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(
+                CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)
+    public void getAvailabilityStatus_illegalStateExceptionThrown_shouldReturnConditionallyUnavailable()
+            throws Exception {
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenThrow(new IllegalStateException());
+
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(
+                CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)
+    public void getAvailabilityStatus_runtimeExceptionThrown_shouldReturnConditionallyUnavailable()
+            throws Exception {
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenThrow(new RuntimeException());
+
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(
+                CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getSummary_noAccountIsSetAsDefault_shouldReturnNoAccountSetSummary() {
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getString(eq(R.string.contacts_storage_no_account_set_summary))).thenReturn(
+                "No default set");
+
+        // Fetch the default account from CP2.
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getSummary()).isEqualTo("No default set");
+    }
+
+    @Test
+    public void getSummary_localAccountIsSetAsDefault_shouldReturnLocalAccountSetSummary()
+            throws Exception {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getString(eq(R.string.contacts_storage_local_account_summary))).thenReturn(
+                "Device only");
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getSummary()).isEqualTo("Device only");
+    }
+
+    @Test
+    public void getSummary_simAccountIsSetAsDefault_shouldReturnSimAccountSummary()
+            throws Exception {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM);
+        bundle.putString(Settings.ACCOUNT_TYPE, "SIM");
+        bundle.putString(Settings.ACCOUNT_NAME, "SIM");
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getString(eq(R.string.sim_card_label))).thenReturn("SIM");
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getSummary()).isEqualTo("SIM");
+    }
+
+    @Test
+    public void getSummary_googleAccountIsSetAsDefault_shouldReturnGoogleAccountTypeAndAccountName()
+            throws Exception {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        bundle.putString(Settings.ACCOUNT_TYPE, "type1");
+        bundle.putString(Settings.ACCOUNT_NAME, "test@gmail.com");
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL1 | test@gmail.com");
+    }
+
+    @Test
+    public void getSummary_samsungAccountIsSetAsDefault_shouldReturnSamsungAccountTypeAndAccountName()
+            throws Exception {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        bundle.putString(Settings.ACCOUNT_TYPE, "type2");
+        bundle.putString(Settings.ACCOUNT_NAME, "test@samsung.com");
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL2 | test@samsung.com");
+    }
+
+    @Test
+    public void getSummary_accountLabelSameAsAccountName_onlyReturnAccountName() throws Exception {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        bundle.putString(Settings.ACCOUNT_TYPE, "type3");
+        bundle.putString(Settings.ACCOUNT_NAME, "LABEL3");
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(bundle);
+        mPreferenceController = new ContactsStoragePreferenceController(mContext,
+                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);
+
+        // Since package name and account name is the same, we only return account name.
+        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL3");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java
new file mode 100644
index 00000000000..735508ab9f8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java
@@ -0,0 +1,470 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.contacts;
+
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.KEY_DEFAULT_ACCOUNT_STATE;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.KEY_ELIGIBLE_DEFAULT_ACCOUNTS;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD;
+import static android.provider.ContactsContract.RawContacts.DefaultAccount.SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD;
+import static android.provider.Settings.ACTION_ADD_ACCOUNT;
+import static android.provider.Settings.EXTRA_ACCOUNT_TYPES;
+
+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.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.accounts.Account;
+import android.app.settings.SettingsEnums;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.accounts.AddAccountSettings;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+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 = ContactsStorageSettingsTest.ShadowAuthenticatorHelper.class)
+public class ContactsStorageSettingsTest {
+    private static final String PREF_KEY_DEVICE_ONLY = "device_only_account_preference";
+    private static final String PREF_KEY_ACCOUNT_CATEGORY = "account_category";
+    private static final String PREF_KEY_ADD_ACCOUNT = "add_account";
+
+    private static final Account TEST_ACCOUNT1 = new Account("test@gmail.com", "com.google");
+
+    private static final Account TEST_ACCOUNT2 = new Account("test@samsung.com", "com.samsung");
+
+    private static final Account TEST_ACCOUNT3 = new Account("test@outlook.com", "com.outlook");
+
+    private static final Account SIM_ACCOUNT = new Account("SIM", "SIM");
+
+    @Rule
+    public final MockitoRule mockito = MockitoJUnit.rule();
+    @Spy
+    public final Context mContext = spy(ApplicationProvider.getApplicationContext());
+    @Mock
+    private ContentResolver mContentResolver;
+    @Mock
+    private ContentProviderClient mContentProviderClient;
+    private PreferenceManager mPreferenceManager;
+    private TestContactsStorageSettings mContactsStorageSettings;
+    private PreferenceScreen mScreen;
+    private PreferenceGroup accountCategory;
+
+    @Before
+    public void setUp() throws Exception {
+        mContactsStorageSettings = spy(
+                new TestContactsStorageSettings(mContext, mContentResolver));
+        when(mContentResolver.acquireContentProviderClient(
+                eq(ContactsContract.AUTHORITY_URI))).thenReturn(mContentProviderClient);
+        mPreferenceManager = new PreferenceManager(mContext);
+        when(mContactsStorageSettings.getPreferenceManager()).thenReturn(mPreferenceManager);
+        mScreen = spy(mPreferenceManager.inflateFromResource(mContext,
+                R.xml.contacts_storage_settings, mScreen));
+        when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
+        accountCategory = mScreen.findPreference(PREF_KEY_ACCOUNT_CATEGORY);
+        SelectorWithWidgetPreference deviceOnlyPreference = mScreen.findPreference(
+                PREF_KEY_DEVICE_ONLY);
+        when(mContactsStorageSettings.findPreference(eq(PREF_KEY_DEVICE_ONLY))).thenReturn(
+                deviceOnlyPreference);
+        when(mContactsStorageSettings.findPreference(eq(PREF_KEY_ACCOUNT_CATEGORY))).thenReturn(
+                accountCategory);
+        when(mContactsStorageSettings.getPreferenceScreen()).thenReturn(mScreen);
+        mContactsStorageSettings.setEligibleAccountTypes(new String[]{"com.google"});
+        mContactsStorageSettings.onAttach(mContext);
+    }
+
+    @Test
+    public void getMetricsCategory() {
+        assertThat(mContactsStorageSettings.getMetricsCategory()).isEqualTo(
+                SettingsEnums.CONTACTS_STORAGE);
+    }
+
+    @Test
+    public void getPreferenceScreenResId() {
+        assertThat(mContactsStorageSettings.getPreferenceScreenResId()).isEqualTo(
+                R.xml.contacts_storage_settings);
+    }
+
+    @Test
+    public void verifyDeviceOnlyPreference_onClick_setDefaultAccountToNull() throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                new ArrayList<>());
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        SelectorWithWidgetPreference deviceOnlyPreference = mContactsStorageSettings.findPreference(
+                PREF_KEY_DEVICE_ONLY);
+
+        assertThat(deviceOnlyPreference.getTitle()).isEqualTo("Device only");
+        assertThat(deviceOnlyPreference.getSummary()).isEqualTo(
+                "New contacts won't be synced with an account");
+        assertThat(deviceOnlyPreference.getOrder()).isEqualTo(999);
+        assertThat(mContactsStorageSettings.findPreference(
+                PREF_KEY_ACCOUNT_CATEGORY).getTitle()).isEqualTo("Where to save contacts");
+
+        mContactsStorageSettings.refreshUI();
+        mContactsStorageSettings.onRadioButtonClicked(deviceOnlyPreference);
+
+        assertThat(deviceOnlyPreference.isChecked()).isTrue();
+        ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
+        verify(mContentProviderClient).call(eq(SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                captor.capture());
+        Bundle accountBundle = captor.getValue();
+        assertThat(accountBundle.getString(ContactsContract.Settings.ACCOUNT_NAME)).isNull();
+        assertThat(accountBundle.getString(ContactsContract.Settings.ACCOUNT_TYPE)).isNull();
+    }
+
+    @Test
+    public void verifyAddAccountPreference_eligibleAccountsAvailable_startAddAccountActivityOnClick()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                new ArrayList<>());
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        mContactsStorageSettings.refreshUI();
+
+        assertThat(mContactsStorageSettings.findPreference(
+                PREF_KEY_ACCOUNT_CATEGORY).getTitle()).isEqualTo("Where to save contacts");
+        assertThat(mScreen.findPreference(PREF_KEY_ADD_ACCOUNT).getTitle()).isEqualTo(
+                "Add an account to get started");
+        assertThat(mScreen.findPreference(PREF_KEY_ADD_ACCOUNT).getOrder()).isEqualTo(998);
+
+        mScreen.findPreference(PREF_KEY_ADD_ACCOUNT).performClick();
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(captor.capture());
+        Intent addAccountIntent = captor.getValue();
+        assertThat(addAccountIntent.getAction()).isEqualTo(ACTION_ADD_ACCOUNT);
+        assertThat(addAccountIntent.getComponent().getClassName()).isEqualTo(
+                AddAccountSettings.class.getCanonicalName());
+        String[] eligibleAccounts = (String[]) addAccountIntent.getExtra(EXTRA_ACCOUNT_TYPES);
+        assertThat(List.of(eligibleAccounts)).containsExactly("com.google");
+    }
+
+    @Test
+    public void verifyAddAccountPreference_noEligibleAccountsAvailable_dontShowPreference()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                new ArrayList<>());
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+        mContactsStorageSettings.setEligibleAccountTypes(new String[]{});
+
+        mContactsStorageSettings.refreshUI();
+
+        Preference addAccountPreference = mScreen.findPreference(PREF_KEY_ADD_ACCOUNT);
+        assertThat(addAccountPreference).isNull();
+    }
+
+    @Test
+    public void verifyEligibleAccountPreference_onClick_setSelectedDefaultAccount()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_NAME, TEST_ACCOUNT2.name);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_TYPE, TEST_ACCOUNT2.type);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        ArrayList<Account> eligibleAccounts = new ArrayList<>(
+                List.of(TEST_ACCOUNT1, TEST_ACCOUNT2));
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                eligibleAccounts);
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        mContactsStorageSettings.refreshUI();
+
+        SelectorWithWidgetPreference account1Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT1.hashCode()));
+        assertThat(account1Preference.getTitle()).isEqualTo("Device and Google");
+        assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com");
+        assertThat(account1Preference.getIcon()).isNotNull();
+
+        SelectorWithWidgetPreference account2Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT2.hashCode()));
+        assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung");
+        assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com");
+        assertThat(account2Preference.getIcon()).isNotNull();
+
+        mContactsStorageSettings.onRadioButtonClicked(account2Preference);
+        assertThat(account1Preference.isChecked()).isFalse();
+        assertThat(account2Preference.isChecked()).isTrue();
+
+        ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
+        verify(mContentProviderClient).call(eq(SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                captor.capture());
+        Bundle setAccountBundle = captor.getValue();
+        assertThat(setAccountBundle.getString(ContactsContract.Settings.ACCOUNT_NAME)).isEqualTo(
+                "test@samsung.com");
+        assertThat(setAccountBundle.getString(ContactsContract.Settings.ACCOUNT_TYPE)).isEqualTo(
+                "com.samsung");
+
+        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        Intent moveContactsIntent = intentCaptor.getValue();
+        assertThat(moveContactsIntent.getAction()).isEqualTo(
+                ContactsContract.RawContacts.DefaultAccount.ACTION_MOVE_CONTACTS_TO_DEFAULT_ACCOUNT);
+        assertThat(moveContactsIntent.getPackage()).isEqualTo(
+                "com.android.providers.contacts");
+    }
+
+    @Test
+    public void verifyAccountPreference_defaultAccountIsNotEligibleCloudAccount_createNewDefaultAccountPreference()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_NAME, TEST_ACCOUNT3.name);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_TYPE, TEST_ACCOUNT3.type);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        ArrayList<Account> eligibleAccounts = new ArrayList<>(
+                List.of(TEST_ACCOUNT1, TEST_ACCOUNT2));
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                eligibleAccounts);
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        mContactsStorageSettings.refreshUI();
+
+        SelectorWithWidgetPreference account1Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT1.hashCode()));
+        assertThat(account1Preference.getTitle()).isEqualTo("Device and Google");
+        assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com");
+        assertThat(account1Preference.getIcon()).isNotNull();
+
+        SelectorWithWidgetPreference account2Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT2.hashCode()));
+        assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung");
+        assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com");
+        assertThat(account2Preference.getIcon()).isNotNull();
+
+        SelectorWithWidgetPreference account3Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT3.hashCode()));
+        assertThat(account3Preference.getTitle()).isEqualTo("Device and Outlook");
+        assertThat(account3Preference.getSummary()).isEqualTo("test@outlook.com");
+        assertThat(account3Preference.getIcon()).isNotNull();
+
+        assertThat(account1Preference.isChecked()).isFalse();
+        assertThat(account2Preference.isChecked()).isFalse();
+        assertThat(account3Preference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void verifyAccountPreference_defaultAccountIsSimAccount_createSimAccountPreference()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_NAME, SIM_ACCOUNT.name);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_TYPE, SIM_ACCOUNT.type);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                new ArrayList<>());
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        mContactsStorageSettings.refreshUI();
+
+        SelectorWithWidgetPreference simPreference = accountCategory.findPreference(
+                String.valueOf(SIM_ACCOUNT.hashCode()));
+        assertThat(simPreference.getTitle()).isEqualTo("SIM");
+        assertThat(simPreference.getSummary()).isEqualTo("SIM");
+        assertThat(simPreference.getIcon()).isNotNull();
+        assertThat(simPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void verifyAccountPreference_newAccountAdded_accountAddedToAccountPreference()
+            throws Exception {
+        Bundle currentDefaultAccount = new Bundle();
+        currentDefaultAccount.putInt(KEY_DEFAULT_ACCOUNT_STATE,
+                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_NAME, TEST_ACCOUNT1.name);
+        currentDefaultAccount.putString(ContactsContract.Settings.ACCOUNT_TYPE, TEST_ACCOUNT1.type);
+        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),
+                any())).thenReturn(currentDefaultAccount);
+        Bundle eligibleAccountBundle = new Bundle();
+        ArrayList<Account> eligibleAccounts = new ArrayList<>(
+                List.of(TEST_ACCOUNT1, TEST_ACCOUNT2));
+        eligibleAccountBundle.putParcelableArrayList(KEY_ELIGIBLE_DEFAULT_ACCOUNTS,
+                eligibleAccounts);
+        when(mContentProviderClient.call(eq(QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD), any(),
+                any())).thenReturn(eligibleAccountBundle);
+
+        mContactsStorageSettings.onAccountsUpdate(null);
+
+        // onAccountsUpdate should refresh the icon and layouts.
+        SelectorWithWidgetPreference account1Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT1.hashCode()));
+        assertThat(account1Preference.getTitle()).isEqualTo("Device and Google");
+        assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com");
+        assertThat(account1Preference.getIcon()).isNotNull();
+
+        SelectorWithWidgetPreference account2Preference = accountCategory.findPreference(
+                String.valueOf(TEST_ACCOUNT2.hashCode()));
+        assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung");
+        assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com");
+        assertThat(account2Preference.getIcon()).isNotNull();
+    }
+
+    @Test
+    public void searchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                ContactsStorageSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(
+                mContactsStorageSettings.getPreferenceScreenResId());
+    }
+
+    private static class TestContactsStorageSettings extends ContactsStorageSettings {
+        private final Context mContext;
+        private final ContentResolver mContentResolver;
+        private String[] mEligibleAccountTypes;
+
+        TestContactsStorageSettings(Context context, ContentResolver contentResolver) {
+            mContext = context;
+            mContentResolver = contentResolver;
+        }
+
+        @Override
+        public Context getContext() {
+            return mContext;
+        }
+
+        @Override
+        protected ContentResolver getContentResolver() {
+            // Override it so we can access this method in test
+            return mContentResolver;
+        }
+
+        @Override
+        String[] getEligibleAccountTypes() {
+            return mEligibleAccountTypes == null ? Resources.getSystem().getStringArray(
+                    com.android.internal.R.array.config_rawContactsEligibleDefaultAccountTypes)
+                    : mEligibleAccountTypes;
+        }
+
+        public void setEligibleAccountTypes(String[] eligibleAccountTypes) {
+            mEligibleAccountTypes = eligibleAccountTypes;
+        }
+    }
+
+    @Implements(AuthenticatorHelper.class)
+    public static class ShadowAuthenticatorHelper {
+
+        boolean preloadDrawableForType = false;
+
+        @Implementation
+        public void listenToAccountUpdates() {
+        }
+
+        @Implementation
+        public void onAccountsUpdated(Account[] accounts) {
+
+        }
+        @Implementation
+        public void preloadDrawableForType(final Context context, final String accountType) {
+            preloadDrawableForType = true;
+        }
+
+        @Implementation
+        protected Drawable getDrawableForType(Context context, final String accountType) {
+            if (preloadDrawableForType) {
+                return context.getPackageManager().getDefaultActivityIcon();
+            }
+            return null;
+        }
+
+        @Implementation
+        protected CharSequence getLabelForType(Context context, final String accountType) {
+            if (TextUtils.equals(accountType, "com.google")) {
+                return "Google";
+            } else if (TextUtils.equals(accountType, "com.samsung")) {
+                return "Samsung";
+            } else if (TextUtils.equals(accountType, "com.outlook")) {
+                return "Outlook";
+            }
+            return null;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
index b4605c74785..3dc011e7b86 100644
--- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
@@ -128,8 +128,8 @@ public class CombinedBiometricProfileSettingsTest {
         doReturn(mActivity).when(mFragment).getActivity();
         doReturn(mBiometricManager).when(mActivity).getSystemService(BiometricManager.class);
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
-                .thenReturn(BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE);
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
+                .thenReturn(BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE);
 
         ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
                 FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
@@ -182,7 +182,7 @@ public class CombinedBiometricProfileSettingsTest {
         ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
         doNothing().when(mFragment).startActivityForResult(any(), anyInt());
         when(mBiometricManager.canAuthenticate(anyInt(),
-                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
 
         mFragment.onAttach(mContext);
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
index 81a72694592..3bfe8197b1f 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
@@ -64,6 +64,7 @@ import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricUtils;
+import com.android.settings.flags.Flags;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -402,7 +403,9 @@ public class FaceEnrollIntroductionTest {
 
         assertThat(getGlifLayout(mActivity).getDescriptionText().toString()).isEqualTo(
                 mContext.getString(
-                        R.string.security_settings_face_enroll_introduction_message_class3));
+                        Flags.biometricsOnboardingEducation()
+                            ? R.string.security_settings_face_enroll_introduction_message_class3_2
+                            : R.string.security_settings_face_enroll_introduction_message_class3));
         assertThat(mActivity.findViewById(R.id.info_row_less_secure).getVisibility()).isEqualTo(
                 View.GONE);
     }
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 8f983de8068..df2ab455c5b 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -63,12 +63,14 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SystemProperty;
 import com.android.settings.widget.RingProgressBar;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.airbnb.lottie.LottieTask;
 import com.google.android.setupdesign.GlifLayout;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -111,15 +113,23 @@ public class FingerprintEnrollEnrollingTest {
     private final int[] mSfpsStageThresholds = new int[]{0, 9, 13, 19, 25};
     private final int[] mUdfpsStageThresholds = new int[]{0, 13, 17, 22};
 
+    private final SystemProperty mSystemProperty = new SystemProperty();
+
     private FingerprintEnrollEnrolling mActivity;
     private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mSystemProperty.override("robolectric.createActivityContexts", "true");
         FakeFeatureFactory.setupForTest();
     }
 
+    @After
+    public void tearDown() {
+        mSystemProperty.close();
+    }
+
     @Test
     public void fingerprintUdfpsEnrollSuccessProgress_shouldNotVibrate() {
         initializeActivityFor(TYPE_UDFPS_OPTICAL);
@@ -645,7 +655,6 @@ public class FingerprintEnrollEnrollingTest {
     }
 
     private void createActivity() {
-        System.setProperty("robolectric.createActivityContexts", "true");
         final Bundle savedInstanceState = new Bundle();
         savedInstanceState.putInt(KEY_STATE_PREVIOUS_ROTATION, Surface.ROTATION_90);
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollTest.kt b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollTest.kt
index 07cdffb942c..0bfa9f31220 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollTest.kt
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollTest.kt
@@ -24,6 +24,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
+import org.mockito.kotlin.any
 import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows
@@ -46,7 +47,7 @@ class FingerprintEnrollTest {
     @Before
     fun setUp() {
         featureFactory = FakeFeatureFactory.setupForTest()
-        `when`(featureFactory.fingerprintFeatureProvider.enrollActivityClassProvider)
+        `when`(featureFactory.fingerprintFeatureProvider.getEnrollActivityClassProvider(any()))
             .thenReturn(activityProvider)
     }
 
@@ -81,6 +82,15 @@ class FingerprintEnrollTest {
         verifyLaunchNextActivity(activity, activityProvider.internal)
     }
 
+    @Test
+    fun testAndFinishLaunchAddAdditional() {
+        // Run
+        val activity = setupActivity(FingerprintEnroll.AddAdditionalFingerprint::class.java)
+
+        // Verify
+        verifyLaunchNextActivity(activity, activityProvider.addAnother)
+    }
+
     private fun verifyLaunchNextActivity(
         currentActivityInstance : FingerprintEnroll,
         nextActivityClass: Class<out Activity>
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
index 0e1bcf6348c..1086f85d45c 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
@@ -149,7 +149,7 @@ public class FingerprintSettingsFragmentTest {
         doReturn(true).when(mFingerprintManager).isHardwareDetected();
         doReturn(mVibrator).when(mContext).getSystemService(Vibrator.class);
         when(mBiometricManager.canAuthenticate(PRIMARY_USER_ID,
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
     }
 
@@ -176,7 +176,7 @@ public class FingerprintSettingsFragmentTest {
     @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
     public void testLaunchBiometricPromptForFingerprint() {
         when(mBiometricManager.canAuthenticate(PRIMARY_USER_ID,
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
         doNothing().when(mFingerprintManager).generateChallenge(anyInt(), any());
         when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceControllerTest.java
new file mode 100644
index 00000000000..7660e889db3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceControllerTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.After;
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUtils.class})
+public class FingerprintSettingsScreenOffUnlockUdfpsPreferenceControllerTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Mock
+    private FingerprintManager mFingerprintManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+
+    private Context mContext;
+    private FingerprintSettingsScreenOffUnlockUdfpsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(eq(Context.FINGERPRINT_SERVICE))).thenReturn(
+                mFingerprintManager);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mController = spy(new FingerprintSettingsScreenOffUnlockUdfpsPreferenceController(mContext,
+                "test_key"));
+        ReflectionHelpers.setField(mController, "mFingerprintManager", mFingerprintManager);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void onPreferenceChange_settingIsUpdated() {
+        boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED, 1) != 0;
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue();
+        boolean newState = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED, 1) != 0;
+        assertThat(newState).isEqualTo(!state);
+    }
+
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isAvailable_isEnabled_whenUdfpsHardwareDetected_AndHasEnrolledFingerprints() {
+        assertThat(mController.isAvailable()).isEqualTo(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isUdfps_hasEnrolledTemplates(
+                true /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                true /* hasEnrolledTemplates */);
+        assertThat(mController.isAvailable()).isEqualTo(true);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isUnavailable_isDisabled_whenUdfpsHardwareDetected_AndNoEnrolledFingerprints() {
+        assertThat(mController.isAvailable()).isEqualTo(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isUdfps_hasEnrolledTemplates(
+                true /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                false /* hasEnrolledTemplates */);
+        assertThat(mController.isAvailable()).isEqualTo(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isUnavailable_whenHardwareNotDetected() {
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isUdfps_hasEnrolledTemplates(
+                false /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                true /* hasEnrolledTemplates */);
+        assertThat(mController.isAvailable()).isEqualTo(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isUnavailable_onNonUdfpsDevice() {
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isUdfps_hasEnrolledTemplates(
+                true /* isHardwareDetected */,
+                true /* isPowerbuttonFps false implies udfps */,
+                true /* hasEnrolledTemplates */);
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    private void configure_hardwareDetected_isUdfps_hasEnrolledTemplates(
+            boolean isHardwareDetected, boolean isPowerbuttonFps, boolean hasEnrolledTemplates) {
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(isHardwareDetected);
+        when(mFingerprintManager.isPowerbuttonFps()).thenReturn(isPowerbuttonFps);
+        when(mFingerprintManager.hasEnrolledTemplates(anyInt())).thenReturn(hasEnrolledTemplates);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsUnlockCategoryControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsUnlockCategoryControllerTest.java
index 7b6a70ed7ef..59af9346a29 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsUnlockCategoryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsUnlockCategoryControllerTest.java
@@ -30,12 +30,15 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -49,6 +52,8 @@ import org.robolectric.util.ReflectionHelpers;
 @Config(shadows = {ShadowUtils.class})
 public class FingerprintSettingsUnlockCategoryControllerTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Mock
     private FingerprintManager mFingerprintManager;
     @Mock
@@ -59,6 +64,8 @@ public class FingerprintSettingsUnlockCategoryControllerTest {
     private Context mContext;
     private FingerprintSettingsRequireScreenOnToAuthPreferenceController mController;
 
+    private FingerprintSettingsScreenOffUnlockUdfpsPreferenceController mScreenOffUnlockController;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -69,7 +76,12 @@ public class FingerprintSettingsUnlockCategoryControllerTest {
 
         mController = spy(new FingerprintSettingsRequireScreenOnToAuthPreferenceController(mContext,
                 "test_key"));
+        mScreenOffUnlockController = spy(
+            new FingerprintSettingsScreenOffUnlockUdfpsPreferenceController(mContext,
+                "screen_off_unlock_test_key"));
         ReflectionHelpers.setField(mController, "mFingerprintManager", mFingerprintManager);
+        ReflectionHelpers.setField(mScreenOffUnlockController, "mFingerprintManager",
+                mFingerprintManager);
     }
 
     @After
@@ -89,6 +101,20 @@ public class FingerprintSettingsUnlockCategoryControllerTest {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isAvailable_isEnabled_whenUdfpsHardwareDetected_AndHasEnrolledFingerprints() {
+        assertThat(mScreenOffUnlockController.isAvailable()).isEqualTo(false);
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(
+                UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isSfps_hasEnrolledTemplates(
+                true /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                true /* hasEnrolledTemplates */);
+        assertThat(mScreenOffUnlockController.isAvailable()).isEqualTo(true);
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
     @Test
     public void isUnavailable_isDisabled_whenSfpsHardwareDetected_AndNoEnrolledFingerprints() {
         assertThat(mController.isAvailable()).isEqualTo(false);
@@ -102,7 +128,22 @@ public class FingerprintSettingsUnlockCategoryControllerTest {
     }
 
     @Test
-    public void isUnavailable_whenHardwareNotDetected() {
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isUnavailable_isDisabled_whenUdfpsHardwareDetected_AndNoEnrolledFingerprints() {
+        assertThat(mScreenOffUnlockController.isAvailable()).isEqualTo(false);
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(
+                UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isSfps_hasEnrolledTemplates(
+                true /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                false /* hasEnrolledTemplates */);
+        assertThat(mScreenOffUnlockController.isAvailable()).isEqualTo(false);
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(
+                CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void isUnavailable_whenHardwareNotDetected_onSfpsDevice() {
         assertThat(mController.isAvailable()).isFalse();
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
         configure_hardwareDetected_isSfps_hasEnrolledTemplates(
@@ -113,6 +154,21 @@ public class FingerprintSettingsUnlockCategoryControllerTest {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
+    @Test
+    @EnableFlags(android.hardware.biometrics.Flags.FLAG_SCREEN_OFF_UNLOCK_UDFPS)
+    public void isUnavailable_whenHardwareNotDetected_onUdfpsDevice() {
+        assertThat(mScreenOffUnlockController.isAvailable()).isFalse();
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(
+                UNSUPPORTED_ON_DEVICE);
+        configure_hardwareDetected_isSfps_hasEnrolledTemplates(
+                false /* isHardwareDetected */,
+                false /* isPowerbuttonFps false implies udfps */,
+                true /* hasEnrolledTemplates */);
+        assertThat(mScreenOffUnlockController.isAvailable()).isEqualTo(false);
+        assertThat(mScreenOffUnlockController.getAvailabilityStatus()).isEqualTo(
+                UNSUPPORTED_ON_DEVICE);
+    }
+
     @Test
     public void isUnavailable_onNonSfpsDevice() {
         assertThat(mController.isAvailable()).isFalse();
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 fa33f9c90ec..fd6c0822ade 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -35,7 +35,6 @@ import com.google.android.setupcompat.PartnerCustomizationLayout;
 import com.google.android.setupcompat.template.FooterBarMixin;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -116,7 +115,6 @@ public class SetupFingerprintEnrollFinishTest {
     }
 
     @Test
-    @Ignore("b/295325503")
     public void onActivityResult_fingerprintCountIsOne_fingerprintSuggestionActivityEnabled() {
         Shadows.shadowOf((FingerprintManager) mFingerprintManager).setDefaultFingerprints(1);
 
@@ -137,8 +135,7 @@ public class SetupFingerprintEnrollFinishTest {
     }
 
     @Test
-    @Ignore("b/295325503")
-    public void clickNext_fingerprintCountIsOne_fngerprintSuggestionActivityEnabled() {
+    public void clickNext_fingerprintCountIsOne_fingerprintSuggestionActivityEnabled() {
         Shadows.shadowOf((FingerprintManager) mFingerprintManager).setDefaultFingerprints(1);
 
         mLayout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick();
@@ -158,8 +155,7 @@ public class SetupFingerprintEnrollFinishTest {
     }
 
     @Test
-    @Ignore("b/295325503")
-    public void onBackPressed_fingerprintCountIsOne_fngerprintSuggestionActivityEnabled() {
+    public void onBackPressed_fingerprintCountIsOne_fingerprintSuggestionActivityEnabled() {
         Shadows.shadowOf((FingerprintManager) mFingerprintManager).setDefaultFingerprints(1);
 
         mActivity.onBackPressed();
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 6b6773463fb..1760fad1b5b 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -154,7 +154,7 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
+    @Ignore("b/295325503 expected: RESULT_SKIP, but was 2")
     public void testKeyguardNotSecure_shouldFinishWithSetupSkipDialogResultSkip() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
 
@@ -174,7 +174,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {
         getShadowKeyguardManager().setIsKeyguardSecure(true);
 
@@ -194,7 +193,7 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
+    @Ignore("b/295325503 expected not to be: null")
     public void testBackKeyPress_shouldSetIntentDataIfLockScreenAdded() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
 
@@ -208,7 +207,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testBackKeyPress_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
         getShadowKeyguardManager().setIsKeyguardSecure(true);
 
@@ -221,7 +219,7 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
+    @Ignore("b/295325503 expected not to be: null")
     public void testCancelClicked_shouldSetIntentDataIfLockScreenAdded() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
 
@@ -237,7 +235,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testCancelClicked_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
         getShadowKeyguardManager().setIsKeyguardSecure(true);
 
@@ -251,7 +248,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
         getShadowKeyguardManager().setIsKeyguardSecure(true);
         SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
@@ -262,7 +258,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testOnResultFromFindSensor_shouldSetIntentDataIfLockScreenAdded() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
         SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
@@ -273,7 +268,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenNotAdded() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
         SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
@@ -284,7 +278,6 @@ public class SetupFingerprintEnrollIntroductionTest {
     }
 
     @Test
-    @Ignore
     public void testLockPattern() {
         ShadowStorageManager.setIsFileEncrypted(false);
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/TestUdfpsEnrollEnrollingView.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/TestUdfpsEnrollEnrollingView.java
new file mode 100644
index 00000000000..92c8fe58870
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/TestUdfpsEnrollEnrollingView.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.LayoutRes;
+
+import com.android.settings.R;
+
+import com.google.android.setupdesign.GlifLayout;
+
+public class TestUdfpsEnrollEnrollingView extends GlifLayout {
+    public TestUdfpsEnrollEnrollingView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected View onInflateTemplate(LayoutInflater inflater, @LayoutRes int template) {
+        return super.onInflateTemplate(inflater, R.layout.biometrics_glif_compact);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingViewTest.java
new file mode 100644
index 00000000000..dec5208159d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingViewTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.platform.test.annotations.EnableFlags;
+import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.flags.Flags;
+
+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.android.controller.ActivityController;
+import org.robolectric.annotation.LooperMode;
+
+
+@RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
+public class UdfpsEnrollEnrollingViewTest {
+
+    private Context mThemeContext;
+    private TestFingerprintEnrollEnrolling mFingerprintEnrollEnrolling;
+    private ActivityController<UdfpsEnrollEnrollingViewTest.TestFingerprintEnrollEnrolling>
+            mController;
+    private AttributeSet mAttributeSet;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = Robolectric.buildActivity(TestFingerprintEnrollEnrolling.class);
+        mFingerprintEnrollEnrolling = mController.create().get();
+        mThemeContext = new ContextThemeWrapper(mFingerprintEnrollEnrolling,
+                R.style.SudThemeGlif_Light);
+        mAttributeSet = Robolectric.buildAttributeSet().build();
+    }
+
+    private void assertDefaultTemplate(TestUdfpsEnrollEnrollingView layout) {
+        final View title = layout.findViewById(
+                com.google.android.setupdesign.R.id.suc_layout_title);
+        assertThat(title).isNotNull();
+
+        final View subTitle = layout.findViewById(
+                com.google.android.setupdesign.R.id.sud_layout_subtitle);
+        assertThat(subTitle).isNotNull();
+
+        final View icon = layout.findViewById(com.google.android.setupdesign.R.id.sud_layout_icon);
+        assertThat(icon).isNotNull();
+
+        final View scrollView = layout.findViewById(
+                com.google.android.setupdesign.R.id.sud_scroll_view);
+        assertThat(scrollView).isNotNull();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENROLL_LAYOUT_TRUNCATE_IMPROVEMENT)
+    public void testDefaultTemplate() {
+        TestUdfpsEnrollEnrollingView layout = new TestUdfpsEnrollEnrollingView(mThemeContext,
+                mAttributeSet);
+        assertDefaultTemplate(layout);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENROLL_LAYOUT_TRUNCATE_IMPROVEMENT)
+    public void testGlifHeaderScrollView() {
+        TestUdfpsEnrollEnrollingView layout = new TestUdfpsEnrollEnrollingView(mThemeContext,
+                mAttributeSet);
+        final View headerScrollView = layout.findViewById(
+                R.id.sud_header_scroll_view);
+
+        assertThat(headerScrollView).isNotNull();
+    }
+
+    public static class TestFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling {
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            final TestUdfpsEnrollEnrollingView layout =
+                    (TestUdfpsEnrollEnrollingView) getLayoutInflater().inflate(
+                            R.layout.test_udfps_enroll_enrolling, null, false);
+            setContentView(layout);
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index fc197282acc..9609af4a5e3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -40,6 +40,7 @@ import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -84,6 +85,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     @Mock private CachedBluetoothDeviceManager mCachedDeviceManager;
     @Mock private LocalBluetoothProfileManager mProfileManager;
     @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+    @Mock private LocalBluetoothLeBroadcast mBroadcast;
     @Mock private BluetoothLeBroadcastReceiveState mBroadcastReceiveState;
 
     private Context mContext;
@@ -102,6 +104,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
         mLocalBtManager = Utils.getLocalBtManager(mContext);
         when(mProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(mAssistant);
+        when(mProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
         when(mLocalBtManager.getProfileManager()).thenReturn(mProfileManager);
         when(mLocalBtManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
         mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
@@ -267,8 +270,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void
-            onProfileConnectionStateChanged_leaConnected_notInCallSharingFlagOff_addsPreference() {
+    public void onProfileConnectionStateChanged_leaConnected_notInCallSharingFlagOff_addPref() {
         mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
@@ -288,8 +290,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void
-            onProfileConnectionStateChanged_leaConnected_notInCallNotInSharing_addsPreference() {
+    public void onProfileConnectionStateChanged_leaConnected_notInCallNotInSharing_addPref() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
@@ -306,16 +307,13 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaConnected_inCallSharingFlagOff_addsPreference() {
+    public void onProfileConnectionStateChanged_leaConnected_inCallSharingFlagOff_addPref() {
         mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
                 .thenReturn(true);
         when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
-        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mBroadcastReceiveState));
-        List<Long> bisSyncState = new ArrayList<>();
-        bisSyncState.add(1L);
-        when(mBroadcastReceiveState.getBisSyncState()).thenReturn(bisSyncState);
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of());
 
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(
                 mCachedBluetoothDevice,
@@ -326,7 +324,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaConnected_inCallNotInSharing_addsPreference() {
+    public void onProfileConnectionStateChanged_leaConnected_inCallNotInSharing_addPref() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
@@ -343,9 +341,9 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void
-            onProfileConnectionStateChanged_leaDeviceConnected_notInCallInSharing_removesPref() {
+    public void onProfileConnectionStateChanged_leaConnected_notInCallInSharing_removePref() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
                 .thenReturn(true);
@@ -365,8 +363,31 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaDeviceConnected_inCallInSharing_removesPref() {
+    public void
+            onProfileConnectionStateChanged_leaConnected_noInCallInSharing_hysteresis_removePref() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
+                .thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mBroadcastReceiveState));
+        when(mBroadcast.getLatestBroadcastId()).thenReturn(1);
+        when(mBroadcastReceiveState.getBroadcastId()).thenReturn(1);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_inCallSharing_removePref() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
                 .thenReturn(true);
@@ -385,6 +406,27 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
 
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_inCallSharing_hysteresis_removePref() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class)))
+                .thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mBroadcastReceiveState));
+        when(mBroadcast.getLatestBroadcastId()).thenReturn(1);
+        when(mBroadcastReceiveState.getBroadcastId()).thenReturn(1);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
     @Test
     public void
             onProfileConnectionStateChanged_deviceIsNotInList_notInCall_invokesRemovePreference() {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
index faea3d8ecb1..cb891a23092 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
@@ -104,7 +104,6 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
                 associationId,
                 /* userId */ 0,
                 packageName,
-                /* tag */ null,
                 MacAddress.fromString(mCachedDevice.getAddress()),
                 /* displayName */ null,
                 /* deviceProfile */ "",
@@ -115,7 +114,9 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
                 /* pending */ false,
                 /* timeApprovedMs */ System.currentTimeMillis(),
                 /* lastTimeConnected */ Long.MAX_VALUE,
-                /* systemDataSyncFlags */ -1);
+                /* systemDataSyncFlags */ -1,
+                /* deviceIcon */ null,
+                /* deviceId */ null);
 
         mAssociations.add(association);
         showScreen(mController);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index d137d8287e8..2d007e1b134 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -120,7 +120,12 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
                 .thenAnswer(invocation -> ImmutableList.of(mConnectableProfiles));
 
         setupDevice(mDeviceConfig);
-        initController(List.of());
+        mController = new BluetoothDetailsProfilesController(mContext, mFragment, mLocalManager,
+                mCachedDevice, mLifecycle);
+        mProfiles.setKey(mController.getPreferenceKey());
+        mController.mProfilesContainer = mProfiles;
+        mScreen.removeAll();
+        mScreen.addPreference(mProfiles);
         BluetoothProperties.le_audio_allow_list(Lists.newArrayList(LE_DEVICE_MODEL));
     }
 
@@ -550,7 +555,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
 
     @Test
     public void prefKeyInBlockingList_hideToggle() {
-        initController(List.of("A2DP"));
+        mController.setInvisibleProfiles(List.of("A2DP"));
+        mController.setHasExtraSpace(true);
         setupDevice(makeDefaultDeviceConfig());
 
         addA2dpProfileToDevice(true, true, true);
@@ -565,7 +571,6 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
 
     @Test
     public void prefKeyNotInBlockingList_showToggle() {
-        initController(List.of());
         setupDevice(makeDefaultDeviceConfig());
 
         addA2dpProfileToDevice(true, true, true);
@@ -653,13 +658,4 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
         assertThat(switches.getFirst().getTitle()).isEqualTo(
                 mContext.getString(mLeAudioProfile.getNameResource(mDevice)));
     }
-
-    private void initController(List<String> invisibleProfiles) {
-        mController = new BluetoothDetailsProfilesController(mContext, mFragment, mLocalManager,
-                mCachedDevice, mLifecycle, invisibleProfiles);
-        mProfiles.setKey(mController.getPreferenceKey());
-        mController.mProfilesContainer = mProfiles;
-        mScreen.removeAll();
-        mScreen.addPreference(mProfiles);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 7e9017167d9..0e052ab154f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -52,7 +52,6 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.bluetooth.ui.model.FragmentTypeModel;
 import com.android.settings.bluetooth.ui.view.DeviceDetailsFragmentFormatter;
 import com.android.settings.flags.Flags;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -122,10 +121,7 @@ public class BluetoothDeviceDetailsFragmentTest {
         removeInputDeviceWithMatchingBluetoothAddress();
         FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();
         when(fakeFeatureFactory.mBluetoothFeatureProvider.getDeviceDetailsFragmentFormatter(any(),
-                any(), any(), eq(mCachedDevice))).thenReturn(mFormatter);
-        when(mFormatter.getVisiblePreferenceKeys(
-                        FragmentTypeModel.DeviceDetailsMainFragment.INSTANCE))
-                .thenReturn(null);
+                any(), any(), eq(mCachedDevice), any())).thenReturn(mFormatter);
 
         mFragment = setupFragment();
         mFragment.onAttach(mContext);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBaseTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBaseTest.java
index e326c1e2630..949b3d83809 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBaseTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBaseTest.java
@@ -46,17 +46,21 @@ import android.os.Bundle;
 import android.os.Looper;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.util.Pair;
-import android.widget.TextView;
 
-import androidx.appcompat.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.flags.Flags;
@@ -73,8 +77,14 @@ import org.mockito.junit.MockitoRule;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.RealObject;
+import org.robolectric.annotation.Resetter;
 import org.robolectric.shadow.api.Shadow;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executor;
 
 /** Tests for {@link BluetoothDevicePairingDetailBase}. */
@@ -82,7 +92,7 @@ import java.util.concurrent.Executor;
 @Config(shadows = {
         ShadowBluetoothAdapter.class,
         ShadowAlertDialogCompat.class,
-        com.android.settings.testutils.shadow.ShadowFragment.class,
+        ShadowFragment.class,
 })
 public class BluetoothDevicePairingDetailBaseTest {
 
@@ -133,7 +143,6 @@ public class BluetoothDevicePairingDetailBaseTest {
         mFragment.mLocalManager = mLocalManager;
         mFragment.mBluetoothAdapter = mBluetoothAdapter;
         mFragment.initPreferencesFromPreferenceScreen();
-
     }
 
     @Test
@@ -199,22 +208,26 @@ public class BluetoothDevicePairingDetailBaseTest {
     }
 
     @Test
+    @Config(shadows = ShadowDialogFragment.class)
     public void onDeviceBondStateChanged_bonded_pairAndJoinSharingEnabled_handle() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        ShadowDialogFragment.reset();
         when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
         mFragment.mSelectedList.add(mBluetoothDevice);
         setUpFragmentWithPairAndJoinSharingIntent(true);
         mFragment.onDeviceBondStateChanged(mCachedBluetoothDevice, BluetoothDevice.BOND_BONDED);
         shadowOf(Looper.getMainLooper()).idle();
 
-        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
-        assertThat(dialog).isNotNull();
-        TextView message = dialog.findViewById(R.id.message);
-        assertThat(message).isNotNull();
-        // TODO: use stringr res once finalized
-        assertThat(message.getText().toString()).isEqualTo(
-                "Connecting to " + TEST_DEVICE_ADDRESS + "...");
+        ProgressDialogFragment progressDialog = mFragment.mProgressDialog;
+        assertThat(progressDialog).isNotNull();
+        assertThat(progressDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.progress_dialog_connect_device_content,
+                        TEST_DEVICE_ADDRESS));
+        assertThat(
+                ShadowDialogFragment.isIsShowing(ProgressDialogFragment.class.getName())).isTrue();
         verify(mFragment, never()).finish();
+
+        ShadowDialogFragment.reset();
     }
 
     @Test
@@ -283,9 +296,11 @@ public class BluetoothDevicePairingDetailBaseTest {
     }
 
     @Test
+    @Config(shadows = ShadowDialogFragment.class)
     public void
             onProfileConnectionStateChanged_deviceInSelectedListAndConnected_pairAndJoinSharing() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        ShadowDialogFragment.reset();
         when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
         mFragment.mSelectedList.add(mBluetoothDevice);
         setUpFragmentWithPairAndJoinSharingIntent(true);
@@ -309,6 +324,8 @@ public class BluetoothDevicePairingDetailBaseTest {
         assertThat(btDevice).isNotNull();
         assertThat(btDevice).isEqualTo(mBluetoothDevice);
         verify(mFragment).finish();
+
+        ShadowDialogFragment.reset();
     }
 
     @Test
@@ -393,7 +410,13 @@ public class BluetoothDevicePairingDetailBaseTest {
         doReturn(intent).when(activity).getIntent();
         doReturn(activity).when(mFragment).getActivity();
         FragmentManager fragmentManager = mock(FragmentManager.class);
+        FragmentTransaction fragmentTransaction = mock(FragmentTransaction.class);
+        doReturn(fragmentTransaction).when(fragmentManager).beginTransaction();
         doReturn(fragmentManager).when(mFragment).getFragmentManager();
+        doReturn(fragmentManager).when(mFragment).getChildFragmentManager();
+        Lifecycle lifecycle = mock(Lifecycle.class);
+        when(lifecycle.getCurrentState()).thenReturn(Lifecycle.State.RESUMED);
+        doReturn(lifecycle).when(mFragment).getLifecycle();
         mFragment.mShouldTriggerAudioSharingShareThenPairFlow =
                 mFragment.shouldTriggerAudioSharingShareThenPairFlow();
     }
@@ -425,4 +448,41 @@ public class BluetoothDevicePairingDetailBaseTest {
             return "test_tag";
         }
     }
+
+    /** Shadow of DialogFragment. */
+    @Implements(value = DialogFragment.class)
+    public static class ShadowDialogFragment {
+        @RealObject
+        private DialogFragment mDialogFragment;
+        private static Map<String, Boolean> sDialogStatus = new HashMap<>();
+
+        /** Resetter of the shadow. */
+        @Resetter
+        public static void reset() {
+            sDialogStatus.clear();
+        }
+
+        /** Implementation for DialogFragment#show. */
+        @Implementation
+        public void show(@NonNull FragmentManager manager, @Nullable String tag) {
+            sDialogStatus.put(mDialogFragment.getClass().getName(), true);
+        }
+
+        /** Implementation for DialogFragment#dismissAllowingStateLoss. */
+        @Implementation
+        public void dismissAllowingStateLoss() {
+            sDialogStatus.put(mDialogFragment.getClass().getName(), false);
+        }
+
+        /** Implementation for DialogFragment#dismiss. */
+        @Implementation
+        public void dismiss() {
+            sDialogStatus.put(mDialogFragment.getClass().getName(), false);
+        }
+
+        /** Check if DialogFragment is showing. */
+        public static boolean isIsShowing(String clazzName) {
+            return sDialogStatus.getOrDefault(clazzName, false);
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ProgressDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ProgressDialogFragmentTest.java
new file mode 100644
index 00000000000..74687767b47
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/ProgressDialogFragmentTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+
+import android.widget.TextView;
+
+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.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowAlertDialogCompat.class})
+public class ProgressDialogFragmentTest {
+    @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+
+    private static final String TEST_MESSAGE1 = "message1";
+    private static final String TEST_MESSAGE2 = "message2";
+
+    private Fragment mParent;
+
+    @Before
+    public void setUp() {
+        ShadowAlertDialogCompat.reset();
+        mParent = new Fragment();
+        FragmentController.setupFragment(
+                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowAlertDialogCompat.reset();
+    }
+
+    @Test
+    public void getMetricsCategory_correctValue() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(mParent);
+        // TODO: update real metric
+        assertThat(fragment.getMetricsCategory()).isEqualTo(0);
+    }
+
+    @Test
+    public void onCreateDialog_unattachedFragment_nullDialogFragment() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(new Fragment());
+        assertThat(fragment).isNull();
+    }
+
+    @Test
+    public void onCreateDialog_showDialog() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(mParent);
+        fragment.show(TEST_MESSAGE1);
+        shadowMainLooper().idle();
+        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+        assertThat(dialog.isShowing()).isTrue();
+        TextView view = dialog.findViewById(R.id.message);
+        assertThat(view).isNotNull();
+        assertThat(view.getText().toString()).isEqualTo(TEST_MESSAGE1);
+    }
+
+    @Test
+    public void dismissDialog_succeed() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(mParent);
+        fragment.show(TEST_MESSAGE1);
+        shadowMainLooper().idle();
+        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+        assertThat(dialog.isShowing()).isTrue();
+
+        fragment.dismissAllowingStateLoss();
+        shadowMainLooper().idle();
+        assertThat(dialog.isShowing()).isFalse();
+    }
+
+    @Test
+    public void showDialog_sameMessage_keepExistingDialog() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(mParent);
+        fragment.show(TEST_MESSAGE1);
+        shadowMainLooper().idle();
+        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+        assertThat(dialog.isShowing()).isTrue();
+
+        fragment.show(TEST_MESSAGE1);
+        shadowMainLooper().idle();
+        assertThat(dialog.isShowing()).isTrue();
+        TextView view = dialog.findViewById(R.id.message);
+        assertThat(view).isNotNull();
+        assertThat(view.getText().toString()).isEqualTo(TEST_MESSAGE1);
+    }
+
+    @Test
+    public void showDialog_newMessage_keepAndUpdateDialog() {
+        ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(mParent);
+        fragment.show(TEST_MESSAGE1);
+        shadowMainLooper().idle();
+        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+        assertThat(dialog.isShowing()).isTrue();
+        TextView view = dialog.findViewById(R.id.message);
+        assertThat(view).isNotNull();
+        assertThat(view.getText().toString()).isEqualTo(TEST_MESSAGE1);
+
+        fragment.show(TEST_MESSAGE2);
+        shadowMainLooper().idle();
+        assertThat(dialog.isShowing()).isTrue();
+        assertThat(view.getText().toString()).isEqualTo(TEST_MESSAGE2);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractorTest.kt b/tests/robotests/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractorTest.kt
deleted file mode 100644
index a83b7c2780e..00000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/domain/interactor/SpatialAudioInteractorTest.kt
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth.domain.interactor
-
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothProfile
-import android.content.Context
-import android.media.AudioDeviceAttributes
-import android.media.AudioDeviceInfo
-import android.media.AudioManager
-import androidx.test.core.app.ApplicationProvider
-import com.android.settingslib.bluetooth.CachedBluetoothDevice
-import com.android.settingslib.bluetooth.LeAudioProfile
-import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingModel
-import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingStateModel
-import com.android.settingslib.media.data.repository.SpatializerRepository
-import com.android.settingslib.media.domain.interactor.SpatializerInteractor
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runCurrent
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.Mockito.spy
-import org.mockito.Mockito.times
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyNoInteractions
-import org.mockito.Mockito.`when`
-import org.mockito.junit.MockitoJUnit
-import org.mockito.junit.MockitoRule
-import org.robolectric.RobolectricTestRunner
-
-@OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(RobolectricTestRunner::class)
-class SpatialAudioInteractorTest {
-    @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule()
-
-    @Mock private lateinit var audioManager: AudioManager
-    @Mock private lateinit var cachedDevice: CachedBluetoothDevice
-    @Mock private lateinit var bluetoothDevice: BluetoothDevice
-    @Mock private lateinit var spatializerRepository: SpatializerRepository
-    @Mock private lateinit var leAudioProfile: LeAudioProfile
-
-    private lateinit var underTest: SpatialAudioInteractor
-    private val testScope = TestScope()
-
-    @Before
-    fun setUp() {
-        val context = spy(ApplicationProvider.getApplicationContext<Context>())
-        `when`(cachedDevice.device).thenReturn(bluetoothDevice)
-        `when`(cachedDevice.address).thenReturn(BLUETOOTH_ADDRESS)
-        `when`(leAudioProfile.profileId).thenReturn(BluetoothProfile.LE_AUDIO)
-        underTest =
-            SpatialAudioInteractorImpl(
-                context,
-                audioManager,
-                SpatializerInteractor(spatializerRepository),
-                testScope.backgroundScope,
-                testScope.testScheduler)
-    }
-
-    @Test
-    fun getDeviceSetting_noAudioProfile_returnNull() {
-        testScope.runTest {
-            val setting = getLatestValue(underTest.getDeviceSetting(cachedDevice))
-
-            assertThat(setting).isNull()
-            verifyNoInteractions(spatializerRepository)
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_audioProfileNotEnabled_returnNull() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(false)
-
-            val setting = getLatestValue(underTest.getDeviceSetting(cachedDevice))
-
-            assertThat(setting).isNull()
-            verifyNoInteractions(spatializerRepository)
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_spatialAudioNotSupported_returnNull() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(true)
-            `when`(
-                    spatializerRepository.isSpatialAudioAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(false)
-
-            val setting = getLatestValue(underTest.getDeviceSetting(cachedDevice))
-
-            assertThat(setting).isNull()
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_spatialAudioSupported_returnTwoToggles() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(true)
-            `when`(
-                    spatializerRepository.isSpatialAudioAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(
-                    spatializerRepository.isHeadTrackingAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(false)
-            `when`(spatializerRepository.getSpatialAudioCompatibleDevices())
-                .thenReturn(listOf(BLE_AUDIO_DEVICE_ATTRIBUTES))
-            `when`(spatializerRepository.isHeadTrackingEnabled(BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(false)
-
-            val setting =
-                getLatestValue(underTest.getDeviceSetting(cachedDevice))
-                    as DeviceSettingModel.MultiTogglePreference
-
-            assertThat(setting).isNotNull()
-            assertThat(setting.toggles.size).isEqualTo(2)
-            assertThat(setting.state.selectedIndex).isEqualTo(1)
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_headTrackingSupported_returnThreeToggles() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(true)
-            `when`(
-                    spatializerRepository.isSpatialAudioAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(
-                    spatializerRepository.isHeadTrackingAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(spatializerRepository.getSpatialAudioCompatibleDevices())
-                .thenReturn(listOf(BLE_AUDIO_DEVICE_ATTRIBUTES))
-            `when`(spatializerRepository.isHeadTrackingEnabled(BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-
-            val setting =
-                getLatestValue(underTest.getDeviceSetting(cachedDevice))
-                    as DeviceSettingModel.MultiTogglePreference
-
-            assertThat(setting).isNotNull()
-            assertThat(setting.toggles.size).isEqualTo(3)
-            assertThat(setting.state.selectedIndex).isEqualTo(2)
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_updateState_enableSpatialAudio() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(true)
-            `when`(
-                    spatializerRepository.isSpatialAudioAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(
-                    spatializerRepository.isHeadTrackingAvailableForDevice(
-                        BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(spatializerRepository.getSpatialAudioCompatibleDevices()).thenReturn(listOf())
-            `when`(spatializerRepository.isHeadTrackingEnabled(BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(false)
-
-            val setting =
-                getLatestValue(underTest.getDeviceSetting(cachedDevice))
-                    as DeviceSettingModel.MultiTogglePreference
-            setting.updateState(DeviceSettingStateModel.MultiTogglePreferenceState(2))
-            runCurrent()
-
-            assertThat(setting).isNotNull()
-            verify(spatializerRepository, times(1))
-                .addSpatialAudioCompatibleDevice(BLE_AUDIO_DEVICE_ATTRIBUTES)
-        }
-    }
-
-    @Test
-    fun getDeviceSetting_updateState_enableHeadTracking() {
-        testScope.runTest {
-            `when`(cachedDevice.profiles).thenReturn(listOf(leAudioProfile))
-            `when`(leAudioProfile.isEnabled(bluetoothDevice)).thenReturn(true)
-            `when`(
-                spatializerRepository.isSpatialAudioAvailableForDevice(
-                    BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(
-                spatializerRepository.isHeadTrackingAvailableForDevice(
-                    BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(true)
-            `when`(spatializerRepository.getSpatialAudioCompatibleDevices()).thenReturn(listOf())
-            `when`(spatializerRepository.isHeadTrackingEnabled(BLE_AUDIO_DEVICE_ATTRIBUTES))
-                .thenReturn(false)
-
-            val setting =
-                getLatestValue(underTest.getDeviceSetting(cachedDevice))
-                    as DeviceSettingModel.MultiTogglePreference
-            setting.updateState(DeviceSettingStateModel.MultiTogglePreferenceState(2))
-            runCurrent()
-
-            assertThat(setting).isNotNull()
-            verify(spatializerRepository, times(1))
-                .addSpatialAudioCompatibleDevice(BLE_AUDIO_DEVICE_ATTRIBUTES)
-            verify(spatializerRepository, times(1))
-                .setHeadTrackingEnabled(BLE_AUDIO_DEVICE_ATTRIBUTES, true)
-        }
-    }
-
-    private fun getLatestValue(deviceSettingFlow: Flow<DeviceSettingModel?>): DeviceSettingModel? {
-        var latestValue: DeviceSettingModel? = null
-        deviceSettingFlow.onEach { latestValue = it }.launchIn(testScope.backgroundScope)
-        testScope.runCurrent()
-        return latestValue
-    }
-
-    private companion object {
-        const val BLUETOOTH_ADDRESS = "12:34:56:78:12:34"
-        val BLE_AUDIO_DEVICE_ATTRIBUTES =
-            AudioDeviceAttributes(
-                AudioDeviceAttributes.ROLE_OUTPUT,
-                AudioDeviceInfo.TYPE_BLE_HEADSET,
-                BLUETOOTH_ADDRESS,
-            )
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatterTest.kt b/tests/robotests/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatterTest.kt
index 51c0c3076ee..d0bd27d7a6e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatterTest.kt
+++ b/tests/robotests/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatterTest.kt
@@ -16,18 +16,16 @@
 
 package com.android.settings.bluetooth.ui.view
 
+import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.media.AudioManager
-import android.net.Uri
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import androidx.preference.PreferenceScreen
 import androidx.test.core.app.ApplicationProvider
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractor
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
 import com.android.settings.bluetooth.ui.model.FragmentTypeModel
 import com.android.settings.dashboard.DashboardFragment
@@ -41,7 +39,9 @@ import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSetti
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingStateModel
 import com.android.settingslib.bluetooth.devicesettings.shared.model.ToggleModel
+import com.android.settingslib.core.AbstractPreferenceController
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
@@ -62,11 +62,11 @@ import org.mockito.junit.MockitoJUnit
 import org.mockito.junit.MockitoRule
 import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.Shadows
 import org.robolectric.shadows.ShadowLooper
 import org.robolectric.shadows.ShadowLooper.shadowMainLooper
 
 
+@ExperimentalCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 class DeviceDetailsFragmentFormatterTest {
     @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule()
@@ -74,8 +74,11 @@ class DeviceDetailsFragmentFormatterTest {
     @Mock private lateinit var cachedDevice: CachedBluetoothDevice
     @Mock private lateinit var bluetoothAdapter: BluetoothAdapter
     @Mock private lateinit var repository: DeviceSettingRepository
-    @Mock private lateinit var spatialAudioInteractor: SpatialAudioInteractor
+    @Mock private lateinit var profileController: AbstractPreferenceController
+    @Mock private lateinit var headerController: AbstractPreferenceController
+    @Mock private lateinit var buttonController: AbstractPreferenceController
 
+    private lateinit var context: Context
     private lateinit var fragment: TestFragment
     private lateinit var underTest: DeviceDetailsFragmentFormatter
     private lateinit var featureFactory: FakeFeatureFactory
@@ -84,16 +87,12 @@ class DeviceDetailsFragmentFormatterTest {
 
     @Before
     fun setUp() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
+        context = ApplicationProvider.getApplicationContext()
         featureFactory = FakeFeatureFactory.setupForTest()
         `when`(
                 featureFactory.bluetoothFeatureProvider.getDeviceSettingRepository(
                     eq(context), eq(bluetoothAdapter), any()))
             .thenReturn(repository)
-        `when`(
-                featureFactory.bluetoothFeatureProvider.getSpatialAudioInteractor(
-                    eq(context), any(AudioManager::class.java), any()))
-            .thenReturn(spatialAudioInteractor)
         fragmentActivity = Robolectric.setupActivity(FragmentActivity::class.java)
         assertThat(fragmentActivity.applicationContext).isNotNull()
         fragment = TestFragment(context)
@@ -103,55 +102,22 @@ class DeviceDetailsFragmentFormatterTest {
         fragment.preferenceScreen.run {
             addPreference(Preference(context).apply { key = "bluetooth_device_header" })
             addPreference(Preference(context).apply { key = "action_buttons" })
-            addPreference(Preference(context).apply { key = "keyboard_settings" })
+            addPreference(Preference(context).apply { key = "bluetooth_profiles" })
         }
+        `when`(profileController.preferenceKey).thenReturn("bluetooth_profiles")
+        `when`(headerController.preferenceKey).thenReturn("bluetooth_device_header")
+        `when`(buttonController.preferenceKey).thenReturn("action_buttons")
 
         underTest =
             DeviceDetailsFragmentFormatterImpl(
                 context,
                 fragment,
+                listOf(profileController, headerController, buttonController),
                 bluetoothAdapter,
                 cachedDevice,
                 testScope.testScheduler)
     }
 
-    @Test
-    fun getVisiblePreferenceKeysForMainPage_hasConfig_returnList() {
-        testScope.runTest {
-            `when`(repository.getDeviceSettingsConfig(cachedDevice))
-                .thenReturn(
-                    DeviceSettingConfigModel(
-                        listOf(
-                            DeviceSettingConfigItemModel.BuiltinItem.CommonBuiltinItem(
-                                DeviceSettingId.DEVICE_SETTING_ID_HEADER,
-                                highlighted = false,
-                                preferenceKey = "bluetooth_device_header"
-                            ),
-                            DeviceSettingConfigItemModel.BuiltinItem.CommonBuiltinItem(
-                                DeviceSettingId.DEVICE_SETTING_ID_ACTION_BUTTONS, highlighted = false, preferenceKey = "action_buttons"),
-                        ),
-                        listOf(),
-                        null))
-
-            val keys =
-                underTest.getVisiblePreferenceKeys(FragmentTypeModel.DeviceDetailsMainFragment)
-
-            assertThat(keys).containsExactly("bluetooth_device_header", "action_buttons")
-        }
-    }
-
-    @Test
-    fun getVisiblePreferenceKeysForMainPage_noConfig_returnNull() {
-        testScope.runTest {
-            `when`(repository.getDeviceSettingsConfig(cachedDevice)).thenReturn(null)
-
-            val keys =
-                underTest.getVisiblePreferenceKeys(FragmentTypeModel.DeviceDetailsMainFragment)
-
-            assertThat(keys).isNull()
-        }
-    }
-
     @Test
     fun getMenuItem_returnItem() {
         testScope.runTest {
@@ -178,11 +144,9 @@ class DeviceDetailsFragmentFormatterTest {
             }.launchIn(testScope.backgroundScope)
             delay(100)
             runCurrent()
-            helpPreference!!.onClick()
             ShadowLooper.idleMainLooper()
 
-            val shadowActivity = Shadows.shadowOf(fragmentActivity)
-            assertThat(shadowActivity.nextStartedActivity).isSameInstanceAs(intent)
+            assertThat(helpPreference?.intent).isSameInstanceAs(intent)
         }
     }
 
@@ -194,7 +158,7 @@ class DeviceDetailsFragmentFormatterTest {
             underTest.updateLayout(FragmentTypeModel.DeviceDetailsMainFragment)
 
             assertThat(getDisplayedPreferences().mapNotNull { it.key })
-                .containsExactly("bluetooth_device_header", "action_buttons", "keyboard_settings")
+                .containsExactly("bluetooth_device_header", "action_buttons", "bluetooth_profiles")
         }
     }
 
@@ -209,16 +173,29 @@ class DeviceDetailsFragmentFormatterTest {
                                 DeviceSettingId.DEVICE_SETTING_ID_HEADER,
                                 highlighted = false, preferenceKey = "bluetooth_device_header"),
                             DeviceSettingConfigItemModel.BuiltinItem.CommonBuiltinItem(
-                                DeviceSettingId.DEVICE_SETTING_ID_KEYBOARD_SETTINGS,
-                                highlighted = false, preferenceKey = "keyboard_settings"),
+                                DeviceSettingId.DEVICE_SETTING_ID_BLUETOOTH_PROFILES,
+                                highlighted = false, preferenceKey = "bluetooth_profiles"),
                         ),
                         listOf(),
                         null))
 
             underTest.updateLayout(FragmentTypeModel.DeviceDetailsMainFragment)
+            runCurrent()
 
             assertThat(getDisplayedPreferences().mapNotNull { it.key })
-                .containsExactly("bluetooth_device_header", "keyboard_settings")
+                .containsExactly("bluetooth_device_header", "bluetooth_profiles")
+            verify(featureFactory.metricsFeatureProvider)
+                .action(
+                    SettingsEnums.PAGE_UNKNOWN,
+                    SettingsEnums.ACTION_BLUETOOTH_DEVICE_DETAILS_ITEM_SHOWN,
+                    0,
+                    "bluetooth_device_header", 1)
+            verify(featureFactory.metricsFeatureProvider)
+                .action(
+                    SettingsEnums.PAGE_UNKNOWN,
+                    SettingsEnums.ACTION_BLUETOOTH_DEVICE_DETAILS_ITEM_SHOWN,
+                    0,
+                    "bluetooth_profiles", 1)
         }
     }
 
@@ -236,9 +213,9 @@ class DeviceDetailsFragmentFormatterTest {
                             DeviceSettingConfigItemModel.AppProvidedItem(
                                 DeviceSettingId.DEVICE_SETTING_ID_ANC, highlighted = false),
                             DeviceSettingConfigItemModel.BuiltinItem.CommonBuiltinItem(
-                                DeviceSettingId.DEVICE_SETTING_ID_KEYBOARD_SETTINGS,
+                                DeviceSettingId.DEVICE_SETTING_ID_BLUETOOTH_PROFILES,
                                 highlighted = false,
-                                preferenceKey = "keyboard_settings"),
+                                preferenceKey = "bluetooth_profiles"),
                         ),
                         listOf(),
                         null))
@@ -261,12 +238,20 @@ class DeviceDetailsFragmentFormatterTest {
                             updateState = {})))
 
             underTest.updateLayout(FragmentTypeModel.DeviceDetailsMainFragment)
+            runCurrent()
 
             assertThat(getDisplayedPreferences().mapNotNull { it.key })
                 .containsExactly(
                     "bluetooth_device_header",
                     "DEVICE_SETTING_${DeviceSettingId.DEVICE_SETTING_ID_ANC}",
-                    "keyboard_settings")
+                    "bluetooth_profiles")
+            verify(featureFactory.metricsFeatureProvider)
+                .action(
+                    SettingsEnums.PAGE_UNKNOWN,
+                    SettingsEnums.ACTION_BLUETOOTH_DEVICE_DETAILS_ITEM_SHOWN,
+                    0,
+                    "DEVICE_SETTING_${DeviceSettingId.DEVICE_SETTING_ID_ANC}", 1
+                )
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModelTest.kt b/tests/robotests/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModelTest.kt
index c3f938c3c46..caeea942f62 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModelTest.kt
+++ b/tests/robotests/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModelTest.kt
@@ -20,7 +20,6 @@ import android.app.Application
 import android.bluetooth.BluetoothAdapter
 import android.graphics.Bitmap
 import androidx.test.core.app.ApplicationProvider
-import com.android.settings.bluetooth.domain.interactor.SpatialAudioInteractor
 import com.android.settings.bluetooth.ui.layout.DeviceSettingLayout
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
 import com.android.settings.bluetooth.ui.model.FragmentTypeModel
@@ -46,7 +45,9 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mock
+import org.mockito.Mockito.any
 import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
@@ -65,8 +66,6 @@ class BluetoothDeviceDetailsViewModelTest {
 
     @Mock private lateinit var repository: DeviceSettingRepository
 
-    @Mock private lateinit var spatialAudioInteractor: SpatialAudioInteractor
-
     private lateinit var underTest: BluetoothDeviceDetailsViewModel
     private lateinit var featureFactory: FakeFeatureFactory
     private val testScope = TestScope()
@@ -76,11 +75,16 @@ class BluetoothDeviceDetailsViewModelTest {
         val application = ApplicationProvider.getApplicationContext<Application>()
         featureFactory = FakeFeatureFactory.setupForTest()
 
+        `when`(
+            featureFactory.bluetoothFeatureProvider.getDeviceSettingRepository(
+                eq(application), eq(bluetoothAdapter), any()
+            ))
+            .thenReturn(repository)
+
         underTest =
             BluetoothDeviceDetailsViewModel(
                 application,
-                repository,
-                spatialAudioInteractor,
+                bluetoothAdapter,
                 cachedDevice,
                 testScope.testScheduler)
     }
@@ -160,37 +164,6 @@ class BluetoothDeviceDetailsViewModelTest {
         }
     }
 
-    @Test
-    fun getDeviceSetting_spatialAudio_returnSpatialAudioInteractorResponse() {
-        testScope.runTest {
-            val pref =
-                buildMultiTogglePreference(
-                    DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE)
-            `when`(repository.getDeviceSettingsConfig(cachedDevice))
-                .thenReturn(
-                    DeviceSettingConfigModel(
-                        listOf(
-                            BUILTIN_SETTING_ITEM_1,
-                            buildRemoteSettingItem(
-                                DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE),
-                        ),
-                        listOf(),
-                        null))
-            `when`(spatialAudioInteractor.getDeviceSetting(cachedDevice)).thenReturn(flowOf(pref))
-
-            var deviceSettingPreference: DeviceSettingPreferenceModel? = null
-            underTest
-                .getDeviceSetting(
-                    cachedDevice, DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE)
-                .onEach { deviceSettingPreference = it }
-                .launchIn(testScope.backgroundScope)
-            runCurrent()
-
-            assertThat(deviceSettingPreference?.id).isEqualTo(pref.id)
-            verify(spatialAudioInteractor, times(1)).getDeviceSetting(cachedDevice)
-        }
-    }
-
     @Test
     fun getLayout_builtinDeviceSettings() {
         testScope.runTest {
@@ -239,7 +212,8 @@ class BluetoothDeviceDetailsViewModelTest {
                 .isEqualTo(
                     listOf(
                         listOf(DeviceSettingId.DEVICE_SETTING_ID_HEADER),
-                        listOf(remoteSettingId1, remoteSettingId2),
+                        listOf(remoteSettingId1),
+                        listOf(remoteSettingId2),
                         listOf(remoteSettingId3),
                     ))
         }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt
new file mode 100644
index 00000000000..9b6e2296bf4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice
+
+import android.content.Intent
+import android.provider.Settings.Global
+import androidx.preference.PreferenceFragmentCompat
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.Settings.BluetoothDashboardActivity
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BluetoothDashboardScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = BluetoothDashboardScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_BLUETOOTH_SWITCHBAR_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(BluetoothDashboardScreen.KEY)
+    }
+
+    override fun migration() {}
+
+    override fun launchFragment(
+        fragmentClass: Class<PreferenceFragmentCompat>,
+        action: (PreferenceFragmentCompat) -> Unit,
+    ) {
+        Global.putInt(appContext.contentResolver, Global.DEVICE_PROVISIONED, 1)
+        val intent = Intent(appContext, BluetoothDashboardActivity::class.java)
+        ActivityScenario.launch<BluetoothDashboardActivity>(intent).use {
+            it.onActivity { activity ->
+                val fragment = activity.supportFragmentManager.fragments[0]
+                assertThat(fragment.javaClass).isEqualTo(fragmentClass)
+                action(fragment as PreferenceFragmentCompat)
+            }
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreferenceTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreferenceTest.kt
new file mode 100644
index 00000000000..15db130795d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreferenceTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice
+
+import android.bluetooth.BluetoothAdapter
+import android.content.Context
+import android.platform.test.flag.junit.SetFlagsRule
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+
+@RunWith(AndroidJUnit4::class)
+class BluetoothMainSwitchPreferenceTest {
+    @get:Rule val setFlagsRule = SetFlagsRule()
+    private val context: Context = ApplicationProvider.getApplicationContext()
+    private lateinit var bluetoothAdapter: BluetoothAdapter
+    private lateinit var bluetoothMainSwitchPreference: BluetoothMainSwitchPreference
+
+    @Before
+    fun setUp() {
+        bluetoothAdapter = spy(BluetoothAdapter.getDefaultAdapter())
+        whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_ON)
+        bluetoothMainSwitchPreference = BluetoothMainSwitchPreference(bluetoothAdapter)
+    }
+
+    @Test
+    fun isEnabled_bluetoothOn_returnTrue() {
+        assertThat(bluetoothMainSwitchPreference.isEnabled(context)).isTrue()
+    }
+
+    @Test
+    fun isEnabled_bluetoothTurningOn_returnFalse() {
+        whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_TURNING_ON)
+
+        assertThat(bluetoothMainSwitchPreference.isEnabled(context)).isFalse()
+    }
+
+    @Test
+    fun storageSetOff_turnOff() {
+        bluetoothMainSwitchPreference
+            .storage(context)
+            .setBoolean(bluetoothMainSwitchPreference.key, false)
+
+        verify(bluetoothAdapter).disable()
+    }
+
+    @Test
+    fun storageSetOn_turnOn() {
+        bluetoothMainSwitchPreference
+            .storage(context)
+            .setBoolean(bluetoothMainSwitchPreference.key, true)
+
+        verify(bluetoothAdapter).enable()
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 5a9f2bc8692..6fb2d114f46 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -17,6 +17,7 @@ package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
 import static com.android.settings.flags.Flags.FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING;
 import static com.android.settings.flags.Flags.FLAG_ROTATION_CONNECTED_DISPLAY_SETTING;
 
@@ -128,6 +129,7 @@ public class ConnectedDeviceGroupControllerTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mFakeFeatureFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, false);
         mFakeFeatureFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, true);
         mFakeFeatureFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, true);
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index 910e696d374..8b6f460ec3f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -24,6 +24,7 @@ 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 static org.robolectric.Shadows.shadowOf;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -31,6 +32,7 @@ import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
+import android.os.Looper;
 import android.platform.test.flag.junit.CheckFlagsRule;
 import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.util.Pair;
@@ -226,6 +228,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
                 mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
         mPreConnectedDeviceController.onDeviceAdded(preference1);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
     }
@@ -236,6 +239,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
                 mContext, null /* AttributeSet */);
 
         mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
     }
@@ -258,6 +262,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
         mPreConnectedDeviceController.onDeviceAdded(preference3);
         mPreConnectedDeviceController.onDeviceAdded(preference4);
         mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         // 3 BluetoothDevicePreference and 1 see all preference
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(4);
@@ -269,6 +274,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
                 mContext, mCachedDevice5, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
         mPreConnectedDeviceController.onDeviceAdded(preference);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         // 1 see all preference
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
@@ -280,6 +286,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
                 mContext, mCachedDevice5, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
         mPreConnectedDeviceController.onDeviceAdded(preference);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         // 1 see all preference
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
@@ -296,6 +303,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
 
         mPreConnectedDeviceController.onDeviceRemoved(preference1);
         mPreConnectedDeviceController.onDeviceRemoved(dockPreference);
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
     }
@@ -345,6 +353,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
         mPreConnectedDeviceController.onDeviceAdded(preference2);
 
         mPreConnectedDeviceController.updatePreferenceGroup();
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         // Refer to the order of {@link #mMostRecentlyConnectedDevices}, the first one is see all
         // preference
@@ -380,6 +389,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
         mPreConnectedDeviceController.onDeviceAdded(preference2);
 
         mPreConnectedDeviceController.updatePreferenceGroup();
+        shadowOf(Looper.getMainLooper()).runToEndOfTasks();
 
         // 1 see all preference
         assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
index 879c6a4d0ab..12e03d4cd63 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
-import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
@@ -52,6 +51,7 @@ import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -100,6 +100,7 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     @Mock private CachedBluetoothDeviceManager mCachedDeviceManager;
     @Mock private LocalBluetoothProfileManager mLocalBtProfileManager;
     @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+    @Mock private LocalBluetoothLeBroadcast mBroadcast;
     @Mock private BluetoothLeBroadcastReceiveState mState;
 
     private Context mContext;
@@ -123,9 +124,7 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
         when(mLocalBtManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
         when(mLocalBtManager.getProfileManager()).thenReturn(mLocalBtProfileManager);
         when(mLocalBtProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(mAssistant);
-        List<Long> bisSyncState = new ArrayList<>();
-        bisSyncState.add(1L);
-        when(mState.getBisSyncState()).thenReturn(bisSyncState);
+        when(mLocalBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
         Pair<Drawable, String> pairs = new Pair<>(mDrawable, TEST_DEVICE_NAME);
         doReturn(TEST_DEVICE_NAME).when(mCachedBluetoothDevice).getName();
         doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
@@ -153,7 +152,7 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
 
     @Test
     public void onProfileConnectionStateChanged_leaDeviceConnected_flagOff_removesPref() {
-        setupPreferenceMapWithDevice();
+        setupPreferenceMapWithDevice(false);
 
         mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
@@ -171,8 +170,46 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaDeviceConnected_noSource_removesPref() {
-        setupPreferenceMapWithDevice();
+    public void onProfileConnectionStateChanged_leaConnected_flagOff_hysteresisMode_removesPref() {
+        setupPreferenceMapWithDevice(true);
+
+        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+
+        mDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_noSource_removesPref() {
+        setupPreferenceMapWithDevice(false);
+
+        when(mAssistant.getAllSources(mBluetoothDevice)).thenReturn(ImmutableList.of());
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+
+        mDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_noSource_hysteresisMode_removesPref() {
+        setupPreferenceMapWithDevice(true);
 
         when(mAssistant.getAllSources(mBluetoothDevice)).thenReturn(ImmutableList.of());
         ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
@@ -191,7 +228,7 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
 
     @Test
     public void onProfileConnectionStateChanged_deviceIsNotInList_removesPref() {
-        setupPreferenceMapWithDevice();
+        setupPreferenceMapWithDevice(false);
 
         mCachedDevices.clear();
         when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices);
@@ -210,8 +247,28 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaDeviceDisconnected_removesPref() {
-        setupPreferenceMapWithDevice();
+    public void onProfileConnectionStateChanged_deviceIsNotInList_hysteresisMode_removesPref() {
+        setupPreferenceMapWithDevice(true);
+
+        mCachedDevices.clear();
+        when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices);
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+
+        mDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaDisconnected_removesPref() {
+        setupPreferenceMapWithDevice(false);
 
         when(mDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(false);
         ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
@@ -229,8 +286,27 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaDeviceDisconnecting_removesPref() {
-        setupPreferenceMapWithDevice();
+    public void onProfileConnectionStateChanged_leaDisconnected_hysteresisMode_removesPref() {
+        setupPreferenceMapWithDevice(true);
+
+        when(mDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(false);
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+
+        mDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_DISCONNECTED,
+                BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaDisconnecting_removesPref() {
+        setupPreferenceMapWithDevice(false);
         doReturn(false).when(mCachedBluetoothDevice).isConnectedLeAudioDevice();
         ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
 
@@ -247,9 +323,38 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leaDeviceConnected_hasSource_addsPreference() {
+    public void onProfileConnectionStateChanged_leaDisconnecting_hysteresisMode_removesPref() {
+        setupPreferenceMapWithDevice(true);
+        doReturn(false).when(mCachedBluetoothDevice).isConnectedLeAudioDevice();
         ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
-        setupPreferenceMapWithDevice();
+
+        mDeviceUpdater.onProfileConnectionStateChanged(
+                mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED,
+                BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_hasSource_addsPref() {
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+        setupPreferenceMapWithDevice(false);
+
+        verify(mDevicePreferenceCallback).onDeviceAdded(captor.capture());
+        assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
+        assertThat(((BluetoothDevicePreference) captor.getValue()).getBluetoothDevice())
+                .isEqualTo(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leaConnected_hasSource_hysteresisMode_addsPref() {
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+        setupPreferenceMapWithDevice(true);
 
         verify(mDevicePreferenceCallback).onDeviceAdded(captor.capture());
         assertThat(captor.getValue() instanceof BluetoothDevicePreference).isTrue();
@@ -271,13 +376,24 @@ public class AudioSharingBluetoothDeviceUpdaterTest {
     public void onPreferenceClick_logClick() {
         Preference preference = new Preference(mContext);
         mDeviceUpdater.onPreferenceClick(preference);
-        verify(mFeatureFactory.metricsFeatureProvider)
-                .action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mDevicePreferenceCallback).onDeviceClick(preference);
     }
 
-    private void setupPreferenceMapWithDevice() {
+    private void setupPreferenceMapWithDevice(boolean hysteresisModeOn) {
         // Add device to preferenceMap
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        if (hysteresisModeOn) {
+            mSetFlagsRule.enableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+            when(mBroadcast.getLatestBroadcastId()).thenReturn(1);
+            when(mState.getBroadcastId()).thenReturn(1);
+        } else {
+            mSetFlagsRule.disableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+            List<Long> bisSyncState = new ArrayList<>();
+            bisSyncState.add(1L);
+            when(mState.getBisSyncState()).thenReturn(bisSyncState);
+        }
         when(mAssistant.getAllSources(mBluetoothDevice)).thenReturn(ImmutableList.of(mState));
         when(mDeviceUpdater.isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         doReturn(true).when(mCachedBluetoothDevice).isConnectedLeAudioDevice();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceControllerTest.java
index 87ae3d5431f..4dc4dca4ab7 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceControllerTest.java
@@ -176,6 +176,22 @@ public class AudioSharingCallAudioPreferenceControllerTest {
         bisSyncState.add(1L);
         when(mState.getBisSyncState()).thenReturn(bisSyncState);
         when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
+        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
+        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
+        when(mCachedDevice1.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(false);
+        when(mCachedDevice1.getMemberDevice()).thenReturn(ImmutableSet.of(mCachedDevice2));
+        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
+        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
+        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
+        when(mCachedDevice2.getName()).thenReturn(TEST_DEVICE_NAME1);
+        when(mCachedDevice2.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(false);
+        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
+        when(mCachedDevice3.getDevice()).thenReturn(mDevice3);
+        when(mCachedDevice3.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
+        when(mCachedDevice3.getName()).thenReturn(TEST_DEVICE_NAME2);
+        when(mCachedDevice3.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(false);
+        when(mCacheManager.findDevice(mDevice3)).thenReturn(mCachedDevice3);
         mController = new AudioSharingCallAudioPreferenceController(mContext);
         mController.init(null);
         mContentObserver = mController.getSettingsObserver();
@@ -323,7 +339,9 @@ public class AudioSharingCallAudioPreferenceControllerTest {
         when(mBroadcast.isEnabled(any())).thenReturn(true);
         when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of());
         mController.displayPreference(mScreen);
+        shadowOf(Looper.getMainLooper()).idle();
         mPreference.setSummary("test");
+
         mController.onProfileConnectionStateChanged(
                 mCachedDevice1,
                 BluetoothAdapter.STATE_DISCONNECTED,
@@ -335,14 +353,13 @@ public class AudioSharingCallAudioPreferenceControllerTest {
     @Test
     public void onFallbackDeviceChanged_updateSummary() {
         Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
         when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1));
         when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
         mController.displayPreference(mScreen);
+        shadowOf(Looper.getMainLooper()).idle();
+        mPreference.setSummary("test");
+
         mContentObserver.onChange(true);
         shadowOf(Looper.getMainLooper()).idle();
         assertThat(mPreference.getSummary().toString())
@@ -352,20 +369,29 @@ public class AudioSharingCallAudioPreferenceControllerTest {
     }
 
     @Test
-    public void displayPreference_showCorrectSummary() {
+    public void onActiveDeviceChanged_updateSummary() {
+        Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+        when(mCachedDevice1.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(true);
+        when(mBroadcast.isEnabled(any())).thenReturn(true);
+        when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1));
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
+        mController.displayPreference(mScreen);
+        shadowOf(Looper.getMainLooper()).idle();
+        mPreference.setSummary("test");
+
+        mController.onActiveDeviceChanged(mCachedDevice1, BluetoothProfile.LE_AUDIO);
+        shadowOf(Looper.getMainLooper()).idle();
+        assertThat(mPreference.getSummary().toString())
+                .isEqualTo(
+                        mContext.getString(
+                                R.string.audio_sharing_call_audio_description, TEST_DEVICE_NAME1));
+    }
+
+    @Test
+    public void displayPreference_fallbackDeviceInSharing_showCorrectSummary() {
         Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
-        when(mCachedDevice1.getMemberDevice()).thenReturn(ImmutableSet.of(mCachedDevice2));
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCachedDevice3.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice3.getDevice()).thenReturn(mDevice3);
-        when(mCachedDevice3.getName()).thenReturn(TEST_DEVICE_NAME2);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
-        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
-        when(mCacheManager.findDevice(mDevice3)).thenReturn(mCachedDevice3);
+        when(mCachedDevice3.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(true);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
         when(mAssistant.getAllConnectedDevices())
                 .thenReturn(ImmutableList.of(mDevice1, mDevice2, mDevice3));
@@ -379,14 +405,24 @@ public class AudioSharingCallAudioPreferenceControllerTest {
     }
 
     @Test
-    public void displayPreference_noFallbackDeviceInSharing_showEmptySummary() {
+    public void displayPreference_activeDeviceInSharing_showCorrectSummary() {
         Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
+        when(mCachedDevice1.isActiveDevice(BluetoothProfile.LE_AUDIO)).thenReturn(true);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
-        when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1));
+        when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1, mDevice2));
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
+        mController.displayPreference(mScreen);
+        shadowOf(Looper.getMainLooper()).idle();
+        assertThat(mPreference.getSummary().toString())
+                .isEqualTo(mContext.getString(
+                        R.string.audio_sharing_call_audio_description, TEST_DEVICE_NAME1));
+    }
+
+    @Test
+    public void displayPreference_noFallbackDeviceOrActiveInSharing_showEmptySummary() {
+        Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID2);
+        when(mBroadcast.isEnabled(any())).thenReturn(true);
+        when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1, mDevice2));
         when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
         mController.displayPreference(mScreen);
         shadowOf(Looper.getMainLooper()).idle();
@@ -394,7 +430,7 @@ public class AudioSharingCallAudioPreferenceControllerTest {
     }
 
     @Test
-    public void displayPreference_noFallbackDevice_showEmptySummary() {
+    public void displayPreference_noFallbackOrActiveDevice_showEmptySummary() {
         Settings.Secure.putInt(
                 mContentResolver, TEST_SETTINGS_KEY, BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
@@ -412,17 +448,11 @@ public class AudioSharingCallAudioPreferenceControllerTest {
             ShadowAlertDialogCompat.reset();
         }
         Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice2.getName()).thenReturn(TEST_DEVICE_NAME2);
-        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
-        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
-        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(List.of(mDevice1, mDevice2));
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(
+                List.of(mDevice1, mDevice2, mDevice3));
         when(mBroadcast.isEnabled(any())).thenReturn(true);
-        when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1, mDevice2));
+        when(mAssistant.getAllConnectedDevices()).thenReturn(
+                ImmutableList.of(mDevice1, mDevice2, mDevice3));
         when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
         mController.init(mParentFragment);
         mController.displayPreference(mScreen);
@@ -449,14 +479,9 @@ public class AudioSharingCallAudioPreferenceControllerTest {
 
     @Test
     public void logCallAudioDeviceChange_changeCallAudioToEarlierConnectedDevice() {
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
-        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
-        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(List.of(mDevice1, mDevice2));
-        mController.logCallAudioDeviceChange(TEST_DEVICE_GROUP_ID1, mCachedDevice2);
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(
+                List.of(mDevice1, mDevice2, mDevice3));
+        mController.logCallAudioDeviceChange(TEST_DEVICE_GROUP_ID1, mCachedDevice3);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(
                         mContext,
@@ -468,13 +493,8 @@ public class AudioSharingCallAudioPreferenceControllerTest {
 
     @Test
     public void logCallAudioDeviceChange_changeCallAudioToLaterConnectedDevice() {
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
-        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
-        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(List.of(mDevice1, mDevice2));
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(
+                List.of(mDevice1, mDevice2, mDevice3));
         mController.logCallAudioDeviceChange(TEST_DEVICE_GROUP_ID2, mCachedDevice1);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(
@@ -487,14 +507,8 @@ public class AudioSharingCallAudioPreferenceControllerTest {
 
     @Test
     public void logCallAudioDeviceChange_deviceNotFoundInRecentList_unknownChangeType() {
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice2.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID2);
-        when(mCachedDevice2.getDevice()).thenReturn(mDevice2);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
-        when(mCacheManager.findDevice(mDevice2)).thenReturn(mCachedDevice2);
-        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(List.of(mDevice1));
-        mController.logCallAudioDeviceChange(TEST_DEVICE_GROUP_ID1, mCachedDevice2);
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(List.of(mDevice1, mDevice2));
+        mController.logCallAudioDeviceChange(TEST_DEVICE_GROUP_ID1, mCachedDevice3);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(
                         mContext,
@@ -505,10 +519,6 @@ public class AudioSharingCallAudioPreferenceControllerTest {
 
     @Test
     public void testBluetoothLeBroadcastAssistantCallbacks_updateSummary() {
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
         Settings.Secure.putInt(
                 mContentResolver, TEST_SETTINGS_KEY, BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
@@ -517,12 +527,12 @@ public class AudioSharingCallAudioPreferenceControllerTest {
         shadowOf(Looper.getMainLooper()).idle();
         assertThat(mPreference.getSummary().toString()).isEmpty();
 
-        // onReceiveStateChanged will update summary
+        // onSourceAdded will update summary
         Settings.Secure.putInt(mContentResolver, TEST_SETTINGS_KEY, TEST_DEVICE_GROUP_ID1);
         when(mAssistant.getAllConnectedDevices()).thenReturn(ImmutableList.of(mDevice1));
         when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(
-                mDevice1, /* sourceId= */ 1, mState);
+        mController.mBroadcastAssistantCallback.onSourceAdded(mDevice1, /* sourceId= */
+                1, /* reason= */ 1);
         shadowOf(Looper.getMainLooper()).idle();
         assertThat(mPreference.getSummary().toString())
                 .isEqualTo(
@@ -532,10 +542,6 @@ public class AudioSharingCallAudioPreferenceControllerTest {
 
     @Test
     public void testBluetoothLeBroadcastAssistantCallbacks_doNothing() {
-        when(mCachedDevice1.getGroupId()).thenReturn(TEST_DEVICE_GROUP_ID1);
-        when(mCachedDevice1.getDevice()).thenReturn(mDevice1);
-        when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
-        when(mCacheManager.findDevice(mDevice1)).thenReturn(mCachedDevice1);
         Settings.Secure.putInt(
                 mContentResolver, TEST_SETTINGS_KEY, BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
@@ -551,8 +557,6 @@ public class AudioSharingCallAudioPreferenceControllerTest {
         mController.mBroadcastAssistantCallback.onSearchStartFailed(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopped(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopFailed(/* reason= */ 1);
-        mController.mBroadcastAssistantCallback.onSourceAdded(
-                mDevice1, /* sourceId= */ 1, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceAddFailed(
                 mDevice1, mSource, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceRemoved(
@@ -566,6 +570,8 @@ public class AudioSharingCallAudioPreferenceControllerTest {
         mController.mBroadcastAssistantCallback.onSourceFound(mSource);
         mController.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 1);
         shadowOf(Looper.getMainLooper()).idle();
+        mController.mBroadcastAssistantCallback.onReceiveStateChanged(mDevice1, /* sourceId= */ 1,
+                mState);
 
         // Above callbacks won't update summary.
         assertThat(mPreference.getSummary().toString()).isEmpty();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java
index 9aa00fb8e5d..fe459b270ba 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java
@@ -115,7 +115,7 @@ public class AudioSharingConfirmDialogFragmentTest {
     }
 
     @Test
-    public void onCreateDialog_clickOk_dialogDismiss() {
+    public void onCreateDialog_clickClose_dialogDismiss() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         AudioSharingConfirmDialogFragment.show(mParent);
         shadowMainLooper().idle();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItemTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItemTest.java
index b23882d3953..27bff7644b6 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItemTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItemTest.java
@@ -78,4 +78,13 @@ public class AudioSharingDeviceItemTest {
         assertThat(itemFromParcel.getGroupId()).isEqualTo(TEST_GROUP_ID);
         assertThat(itemFromParcel.isActive()).isEqualTo(TEST_IS_ACTIVE);
     }
+
+    @Test
+    public void toString_correctValue() {
+        AudioSharingDeviceItem item =
+                new AudioSharingDeviceItem(TEST_NAME, TEST_GROUP_ID, TEST_IS_ACTIVE);
+        assertThat(item.toString()).isEqualTo(
+                "AudioSharingDeviceItem groupId = " + TEST_GROUP_ID + ", isActive = "
+                        + TEST_IS_ACTIVE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
index 03f13037d62..a49d0c13890 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
@@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.audiosharing;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID;
 import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.EXTRA_BLUETOOTH_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -25,6 +26,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 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;
@@ -36,6 +38,7 @@ import static org.robolectric.Shadows.shadowOf;
 
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastAssistant;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
@@ -44,10 +47,15 @@ import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothStatusCodes;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Looper;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+import android.util.Pair;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.Preference;
@@ -56,10 +64,13 @@ import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowAudioManager;
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
@@ -99,14 +110,16 @@ import java.util.concurrent.Executor;
 @RunWith(RobolectricTestRunner.class)
 @Config(
         shadows = {
-            ShadowBluetoothAdapter.class,
-            ShadowBluetoothUtils.class,
-            ShadowFragment.class,
+                ShadowBluetoothAdapter.class,
+                ShadowBluetoothUtils.class,
+                ShadowFragment.class,
+                ShadowAudioManager.class,
         })
 public class AudioSharingDevicePreferenceControllerTest {
     private static final String KEY = "audio_sharing_device_list";
     private static final String KEY_AUDIO_SHARING_SETTINGS =
             "connected_device_audio_sharing_settings";
+    private static final String TEST_DEVICE_NAME = "test";
 
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -140,6 +153,7 @@ public class AudioSharingDevicePreferenceControllerTest {
     private PreferenceCategory mPreferenceGroup;
     private Preference mAudioSharingPreference;
     private FakeFeatureFactory mFeatureFactory;
+    private AudioManager mAudioManager;
 
     @Before
     public void setUp() {
@@ -153,6 +167,7 @@ public class AudioSharingDevicePreferenceControllerTest {
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mAudioManager = mContext.getSystemService(AudioManager.class);
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
         mLocalBtManager = Utils.getLocalBtManager(mContext);
         when(mLocalBtManager.getEventManager()).thenReturn(mEventManager);
@@ -506,21 +521,9 @@ public class AudioSharingDevicePreferenceControllerTest {
 
     @Test
     public void testBluetoothLeBroadcastAssistantCallbacks_updateGroup() {
-        // onReceiveStateChanged with unconnected state will do nothing
-        when(mState.getBisSyncState()).thenReturn(new ArrayList<>());
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(
-                mDevice, /* sourceId= */ 1, mState);
-        shadowOf(Looper.getMainLooper()).idle();
-        verify(mBluetoothDeviceUpdater, never()).forceUpdate();
-        verify(mDialogHandler, never()).closeOpeningDialogsForLeaDevice(mCachedDevice);
-
-        // onReceiveStateChanged with connected state will update group preference and handle
-        // stale dialogs
-        List<Long> bisSyncState = new ArrayList<>();
-        bisSyncState.add(1L);
-        when(mState.getBisSyncState()).thenReturn(bisSyncState);
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(
-                mDevice, /* sourceId= */ 1, mState);
+        // onSourceAdded will update group preference and handle stale dialogs
+        mController.mBroadcastAssistantCallback.onSourceAdded(mDevice, /* sourceId= */
+                1, /* reason= */ 1);
         shadowOf(Looper.getMainLooper()).idle();
         verify(mBluetoothDeviceUpdater).forceUpdate();
         verify(mDialogHandler).closeOpeningDialogsForLeaDevice(mCachedDevice);
@@ -557,8 +560,13 @@ public class AudioSharingDevicePreferenceControllerTest {
         mController.mBroadcastAssistantCallback.onSearchStartFailed(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopped(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopFailed(/* reason= */ 1);
-        mController.mBroadcastAssistantCallback.onSourceAdded(
-                mDevice, /* sourceId= */ 1, /* reason= */ 1);
+        List<Long> bisSyncState = new ArrayList<>();
+        bisSyncState.add(1L);
+        when(mState.getBisSyncState()).thenReturn(bisSyncState);
+        when(mBroadcast.getLatestBroadcastId()).thenReturn(1);
+        when(mState.getBroadcastId()).thenReturn(1);
+        mController.mBroadcastAssistantCallback.onReceiveStateChanged(mDevice, /* sourceId= */ 1,
+                mState);
         mController.mBroadcastAssistantCallback.onSourceModified(
                 mDevice, /* sourceId= */ 1, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceModifyFailed(
@@ -571,4 +579,81 @@ public class AudioSharingDevicePreferenceControllerTest {
         verify(mBluetoothDeviceUpdater, never()).forceUpdate();
         verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
     }
+
+    @Test
+    public void testInCallState_showCallStateTitleAndSetActiveOnDeviceClick() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+        mController.displayPreference(mScreen);
+
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        mController.onAudioModeChanged();
+        shadowOf(Looper.getMainLooper()).idle();
+
+        assertThat(mPreferenceGroup.getTitle().toString())
+                .isEqualTo(mContext.getString(R.string.connected_device_call_device_title));
+
+        BluetoothDevicePreference preference = createBluetoothDevicePreference();
+        mController.onDeviceClick(preference);
+        verify(mCachedDevice).setActive();
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID)).isEqualTo(
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+    }
+
+    @Test
+    public void testInCallState_enableHysteresisFix_setAndSaveActiveOnDeviceClick() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+        mController.displayPreference(mScreen);
+
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        mController.onAudioModeChanged();
+        shadowOf(Looper.getMainLooper()).idle();
+
+        BluetoothDevicePreference preference = createBluetoothDevicePreference();
+        when(mCachedDevice.getGroupId()).thenReturn(1);
+        mController.onDeviceClick(preference);
+        verify(mCachedDevice).setActive();
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID)).isEqualTo(1);
+    }
+
+    @Test
+    public void testInNormalState_showNormalStateTitleAndDoNothingOnDeviceClick() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mController.displayPreference(mScreen);
+
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mController.onAudioModeChanged();
+        shadowOf(Looper.getMainLooper()).idle();
+
+        assertThat(mPreferenceGroup.getTitle().toString())
+                .isEqualTo(mContext.getString(R.string.audio_sharing_device_group_title));
+
+        BluetoothDevicePreference preference = createBluetoothDevicePreference();
+        mController.onDeviceClick(preference);
+
+        verify(mCachedDevice, never()).setActive();
+    }
+
+    @NonNull
+    private BluetoothDevicePreference createBluetoothDevicePreference() {
+        Drawable drawable = mock(Drawable.class);
+        Pair<Drawable, String> pairs = new Pair<>(drawable, TEST_DEVICE_NAME);
+        when(mCachedDevice.getDrawableWithDescription()).thenReturn(pairs);
+        return new BluetoothDevicePreference(
+                        mContext,
+                        mCachedDevice,
+                        /* showDeviceWithoutNames= */ false,
+                        BluetoothDevicePreference.SortType.TYPE_DEFAULT);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupControllerTest.java
index d8c663f6dc2..bac8b30ff16 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupControllerTest.java
@@ -461,18 +461,9 @@ public class AudioSharingDeviceVolumeGroupControllerTest {
 
     @Test
     public void testBluetoothLeBroadcastAssistantCallbacks_updateGroup() {
-        when(mState.getBisSyncState()).thenReturn(new ArrayList<>());
-        // onReceiveStateChanged with unconnected state will do nothing
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(
-                mDevice1, /* sourceId= */ 1, mState);
-        verify(mDeviceUpdater, never()).forceUpdate();
-
-        // onReceiveStateChanged with connected state will update group preference
-        List<Long> bisSyncState = new ArrayList<>();
-        bisSyncState.add(1L);
-        when(mState.getBisSyncState()).thenReturn(bisSyncState);
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(
-                mDevice1, /* sourceId= */ 1, mState);
+        // onSourceAdded will update group preference
+        mController.mBroadcastAssistantCallback.onSourceAdded(mDevice1, /* sourceId= */
+                1, /* reason= */ 1);
         verify(mDeviceUpdater).forceUpdate();
 
         // onSourceRemoved will update group preference
@@ -487,8 +478,13 @@ public class AudioSharingDeviceVolumeGroupControllerTest {
         mController.mBroadcastAssistantCallback.onSearchStartFailed(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopped(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopFailed(/* reason= */ 1);
-        mController.mBroadcastAssistantCallback.onSourceAdded(
-                mDevice1, /* sourceId= */ 1, /* reason= */ 1);
+        List<Long> bisSyncState = new ArrayList<>();
+        bisSyncState.add(1L);
+        when(mState.getBisSyncState()).thenReturn(bisSyncState);
+        when(mBroadcast.getLatestBroadcastId()).thenReturn(1);
+        when(mState.getBroadcastId()).thenReturn(1);
+        mController.mBroadcastAssistantCallback.onReceiveStateChanged(mDevice1, /* sourceId= */ 1,
+                mState);
         mController.mBroadcastAssistantCallback.onSourceAddFailed(
                 mDevice1, mSource, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceRemoveFailed(
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java
index ad6dd7f0754..c96a08623f8 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.connecteddevice.audiosharing;
 
+import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -32,6 +34,7 @@ import static org.robolectric.Shadows.shadowOf;
 
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcast;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
@@ -43,6 +46,7 @@ import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Looper;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
 import android.util.Pair;
 
 import androidx.fragment.app.DialogFragment;
@@ -193,6 +197,10 @@ public class AudioSharingDialogHandlerTest {
 
     @Test
     public void handleUserTriggeredDeviceConnected_inCall_setActive() {
+        mSetFlagsRule.disableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
         when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_IN_CALL);
         setUpBroadcast(true);
         ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1);
@@ -201,6 +209,29 @@ public class AudioSharingDialogHandlerTest {
         mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ true);
         shadowOf(Looper.getMainLooper()).idle();
         verify(mCachedDevice1).setActive();
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID)).isEqualTo(
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+    }
+
+    @Test
+    public void handleUserTriggeredDeviceConnected_inCall_enableHysteresisFix_setAndSaveActive() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_IN_CALL);
+        setUpBroadcast(true);
+        ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1);
+        when(mAssistant.getAllConnectedDevices()).thenReturn(deviceList);
+        when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of());
+        mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ true);
+        shadowOf(Looper.getMainLooper()).idle();
+        verify(mCachedDevice1).setActive();
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID,
+                BluetoothCsipSetCoordinator.GROUP_ID_INVALID)).isEqualTo(1);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragmentTest.java
index fc38cd2817d..a8451b1e24e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragmentTest.java
@@ -24,11 +24,13 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothStatusCodes;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.view.View;
+import android.widget.TextView;
 
 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 com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settingslib.flags.Flags;
@@ -114,6 +116,10 @@ public class AudioSharingErrorDialogFragmentTest {
         AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
         assertThat(dialog).isNotNull();
         assertThat(dialog.isShowing()).isTrue();
+        TextView title = dialog.findViewById(R.id.title_text);
+        assertThat(title).isNotNull();
+        assertThat(title.getText().toString()).isEqualTo(
+                mParent.getString(R.string.audio_sharing_retry_dialog_title));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragmentTest.java
index 67cb2aa915b..8d89646d3fb 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragmentTest.java
@@ -120,9 +120,9 @@ public class AudioSharingIncompatibleDialogFragmentTest {
         assertThat(dialog.isShowing()).isTrue();
         TextView title = dialog.findViewById(R.id.title_text);
         assertThat(title).isNotNull();
-        // TODO: use string res
         assertThat(title.getText().toString()).isEqualTo(
-                "Can't share audio with " + TEST_DEVICE_NAME);
+                mParent.getString(R.string.audio_sharing_incompatible_dialog_title,
+                        TEST_DEVICE_NAME));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java
index 5bfb9663e11..8885e41b657 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java
@@ -320,16 +320,37 @@ public class AudioSharingPasswordPreferenceControllerTest {
     }
 
     @Test
-    public void idTextValid_emptyString() {
+    public void isTextValid_emptyString() {
         boolean valid = mController.isTextValid("");
 
         assertThat(valid).isFalse();
     }
 
+
     @Test
-    public void idTextValid_validPassword() {
+    public void isTextValid_emptyString_showEditTextFormatAlert() {
+        mController.displayPreference(mScreen);
+        ShadowLooper.idleMainLooper();
+        boolean valid = mController.isTextValid("");
+
+        assertThat(valid).isFalse();
+        verify(mPreference).showEditTextFormatAlert(true);
+    }
+
+    @Test
+    public void isTextValid_validPassword() {
         boolean valid = mController.isTextValid(BROADCAST_PASSWORD);
 
         assertThat(valid).isTrue();
     }
+
+    @Test
+    public void isTextValid_validPassword_hideEditTextFormatAlert() {
+        mController.displayPreference(mScreen);
+        ShadowLooper.idleMainLooper();
+        boolean valid = mController.isTextValid(BROADCAST_PASSWORD);
+
+        assertThat(valid).isTrue();
+        verify(mPreference).showEditTextFormatAlert(false);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java
index 0b87e8ca25d..20b8319a7c0 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java
@@ -71,10 +71,12 @@ public class AudioSharingPasswordPreferenceTest {
         var editText = view.findViewById(android.R.id.edit);
         var checkBox = view.findViewById(R.id.audio_sharing_stream_password_checkbox);
         var dialogMessage = view.findViewById(android.R.id.message);
+        var editTextAlertMessage = view.findViewById(R.id.edit_alert_message);
 
         assertThat(editText).isNotNull();
         assertThat(checkBox).isNotNull();
         assertThat(dialogMessage).isNotNull();
+        assertThat(editTextAlertMessage).isNotNull();
     }
 
     @Test
@@ -147,6 +149,34 @@ public class AudioSharingPasswordPreferenceTest {
         assertThat(checkBox.isChecked()).isFalse();
     }
 
+    @Test
+    public void showEditTextFormatAlert_show() {
+        View view =
+                LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+        mPreference.onBindDialogView(view);
+
+        var editTextAlertMessage = view.findViewById(R.id.edit_alert_message);
+
+        mPreference.showEditTextFormatAlert(true);
+
+        assertThat(editTextAlertMessage).isNotNull();
+        assertThat(editTextAlertMessage.getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void showEditTextFormatAlert_hide() {
+        View view =
+                LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+        mPreference.onBindDialogView(view);
+
+        var editTextAlertMessage = view.findViewById(R.id.edit_alert_message);
+
+        mPreference.showEditTextFormatAlert(false);
+
+        assertThat(editTextAlertMessage).isNotNull();
+        assertThat(editTextAlertMessage.getVisibility()).isEqualTo(GONE);
+    }
+
     @Test
     public void onDialogEventListener_onClick_positiveButton() {
         AudioSharingPasswordPreference.OnDialogEventListener listener =
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
index db6eb8c72de..e72003818bd 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
@@ -130,7 +130,7 @@ public class AudioSharingReceiverTest {
     }
 
     @Test
-    public void broadcastReceiver_receiveAudioSharingStateChangeIntentFlagOff_doNothing() {
+    public void broadcastReceiver_receiveAudioSharingStateOn_flagOff_doNothing() {
         mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
 
         Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
@@ -140,6 +140,23 @@ public class AudioSharingReceiverTest {
         audioSharingReceiver.onReceive(mContext, intent);
 
         verifyNoInteractions(mNm);
+        verifyNoInteractions(mFeatureFactory.metricsFeatureProvider);
+    }
+
+    @Test
+    public void broadcastReceiver_receiveAudioSharingStateOn_broadcastDisabled_doNothing() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED);
+
+        Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
+        intent.setPackage(mContext.getPackageName());
+        intent.putExtra(EXTRA_LE_AUDIO_SHARING_STATE, BROADCAST_STATE_ON);
+        AudioSharingReceiver audioSharingReceiver = getAudioSharingReceiver(intent);
+        audioSharingReceiver.onReceive(mContext, intent);
+
+        verifyNoInteractions(mNm);
+        verifyNoInteractions(mFeatureFactory.metricsFeatureProvider);
     }
 
     @Test
@@ -152,10 +169,11 @@ public class AudioSharingReceiverTest {
         audioSharingReceiver.onReceive(mContext, intent);
 
         verifyNoInteractions(mNm);
+        verifyNoInteractions(mFeatureFactory.metricsFeatureProvider);
     }
 
     @Test
-    public void broadcastReceiver_receiveAudioSharingStateChangeIntentOnState_showNotification() {
+    public void broadcastReceiver_receiveAudioSharingStateOn_broadcastEnabled_showNotification() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
 
         Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
@@ -171,7 +189,26 @@ public class AudioSharingReceiverTest {
 
     @Test
     public void
-            broadcastReceiver_receiveAudioSharingStateChangeIntentOffState_cancelNotification() {
+            broadcastReceiver_receiveAudioSharingStateOff_broadcastDisabled_cancelNotification() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED);
+
+        Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
+        intent.setPackage(mContext.getPackageName());
+        intent.putExtra(EXTRA_LE_AUDIO_SHARING_STATE, BROADCAST_STATE_OFF);
+        AudioSharingReceiver audioSharingReceiver = getAudioSharingReceiver(intent);
+        audioSharingReceiver.onReceive(mContext, intent);
+
+        verify(mNm).cancel(R.drawable.ic_bt_le_audio_sharing);
+        verify(mFeatureFactory.metricsFeatureProvider)
+                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
+    }
+
+    @Test
+    public void
+            broadcastReceiver_receiveAudioSharingStateOff_broadcastEnabled_cancelNotification() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
 
         Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
@@ -182,12 +219,15 @@ public class AudioSharingReceiverTest {
 
         verify(mNm).cancel(R.drawable.ic_bt_le_audio_sharing);
         verify(mFeatureFactory.metricsFeatureProvider)
-                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
+                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STATE_CHANGE);
     }
 
     @Test
-    public void broadcastReceiver_receiveAudioSharingStopIntentFlagOff_doNothing() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+    public void broadcastReceiver_receiveAudioSharingStop_broadcastDisabled_cancelNotification() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED);
 
         Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_STOP);
         intent.setPackage(mContext.getPackageName());
@@ -195,11 +235,14 @@ public class AudioSharingReceiverTest {
         audioSharingReceiver.onReceive(mContext, intent);
 
         verifyNoInteractions(mBroadcast);
+        verify(mNm).cancel(R.drawable.ic_bt_le_audio_sharing);
+        verify(mFeatureFactory.metricsFeatureProvider)
+                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STOP);
     }
 
     @Test
-    public void
-            broadcastReceiver_receiveAudioSharingStopIntent_notInBroadcast_cancelNotification() {
+    public void broadcastReceiver_receiveAudioSharingStop_notInBroadcast_cancelNotification() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         when(mBroadcast.isEnabled(null)).thenReturn(false);
         int broadcastId = 1;
@@ -213,11 +256,12 @@ public class AudioSharingReceiverTest {
         verify(mBroadcast, never()).stopBroadcast(broadcastId);
         verify(mNm).cancel(R.drawable.ic_bt_le_audio_sharing);
         verify(mFeatureFactory.metricsFeatureProvider)
-                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
+                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STOP);
     }
 
     @Test
-    public void broadcastReceiver_receiveAudioSharingStopIntent_inBroadcast_stopBroadcast() {
+    public void broadcastReceiver_receiveAudioSharingStop_inBroadcast_stopBroadcast() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         int broadcastId = 1;
@@ -231,6 +275,10 @@ public class AudioSharingReceiverTest {
         verify(mBroadcast).stopBroadcast(broadcastId);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(mContext, SettingsEnums.ACTION_STOP_AUDIO_SHARING_FROM_NOTIFICATION);
+        verify(mNm, never()).cancel(R.drawable.ic_bt_le_audio_sharing);
+        verify(mFeatureFactory.metricsFeatureProvider, never())
+                .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION,
+                        ACTION_LE_AUDIO_SHARING_STOP);
     }
 
     private AudioSharingReceiver getAudioSharingReceiver(Intent intent) {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java
index 58696dccbea..7851b2b38f8 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java
@@ -476,7 +476,7 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void onPlaybackStarted_notInit_noDialog() {
+    public void onBroadcastMetadataChanged_notInit_noDialog() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -503,7 +503,7 @@ public class AudioSharingSwitchBarControllerTest {
         // No progress dialog.
         assertThat(childFragments).isEmpty();
 
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mFeatureFactory.metricsFeatureProvider)
@@ -515,7 +515,7 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void onPlaybackStarted_hasLocalSource_noDialog() {
+    public void onBroadcastMetadataChanged_hasLocalSource_noDialog() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -533,7 +533,7 @@ public class AudioSharingSwitchBarControllerTest {
         assertThat(childFragments).comparingElementsUsing(CLAZZNAME_EQUALS).containsExactly(
                 AudioSharingProgressDialogFragment.class.getName());
 
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mAssistant, never()).addSource(any(), any(), anyBoolean());
@@ -549,7 +549,7 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void onPlaybackStarted_singleActiveDevice_showJoinAudioSharingDialog() {
+    public void onBroadcastMetadataChanged_singleActiveDevice_showJoinAudioSharingDialog() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -566,15 +566,15 @@ public class AudioSharingSwitchBarControllerTest {
 
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         when(mBroadcast.getLatestBluetoothLeBroadcastMetadata()).thenReturn(mMetadata);
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(any(Context.class), eq(SettingsEnums.ACTION_AUTO_JOIN_AUDIO_SHARING));
 
         when(mState.getBisSyncState()).thenReturn(ImmutableList.of(1L));
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(mDevice2, /* sourceId= */ 1,
-                mState);
+        mController.mBroadcastAssistantCallback.onSourceAdded(mDevice2, /* sourceId= */
+                1, /* reason= */ 1);
         shadowOf(Looper.getMainLooper()).idle();
 
         childFragments = mParentFragment.getChildFragmentManager().getFragments();
@@ -613,7 +613,7 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void onPlaybackStarted_oneActiveOnConnected_showJoinAudioSharingDialog() {
+    public void onBroadcastMetadataChanged_oneActiveOnConnected_showJoinAudioSharingDialog() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -629,19 +629,19 @@ public class AudioSharingSwitchBarControllerTest {
                 AudioSharingProgressDialogFragment.class.getName());
         AudioSharingProgressDialogFragment progressFragment =
                 (AudioSharingProgressDialogFragment) Iterables.getOnlyElement(childFragments);
-        // TODO: use string res once finalized
-        String expectedMessage = "Starting audio stream...";
+        String expectedMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_start_stream_content);
         checkProgressDialogMessage(progressFragment, expectedMessage);
 
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         when(mBroadcast.getLatestBluetoothLeBroadcastMetadata()).thenReturn(mMetadata);
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(any(Context.class), eq(SettingsEnums.ACTION_AUTO_JOIN_AUDIO_SHARING));
-        // TODO: use string res once finalized
-        expectedMessage = "Sharing with " + TEST_DEVICE_NAME2 + "...";
+        expectedMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_add_source_content, TEST_DEVICE_NAME2);
         checkProgressDialogMessage(progressFragment, expectedMessage);
 
         childFragments = mParentFragment.getChildFragmentManager().getFragments();
@@ -681,7 +681,7 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void onPlaybackStarted_oneActiveOnConnected_clickShareBtnOnDialog_addSource() {
+    public void onBroadcastMetadataChanged_oneActiveOnConnected_clickShareBtnOnDialog_addSource() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -694,7 +694,7 @@ public class AudioSharingSwitchBarControllerTest {
         verify(mBroadcast).startPrivateBroadcast();
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         when(mBroadcast.getLatestBluetoothLeBroadcastMetadata()).thenReturn(mMetadata);
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mAssistant).addSource(mDevice2, mMetadata, /* isGroupOp= */ false);
@@ -714,15 +714,15 @@ public class AudioSharingSwitchBarControllerTest {
                 AudioSharingProgressDialogFragment.class.getName());
         AudioSharingProgressDialogFragment progressFragment =
                 (AudioSharingProgressDialogFragment) Iterables.getOnlyElement(childFragments);
-        // TODO: use string res once finalized
-        String expectedMessage = "Sharing with " + TEST_DEVICE_NAME1 + "...";
+        String expectedMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_add_source_content, TEST_DEVICE_NAME1);
         checkProgressDialogMessage(progressFragment, expectedMessage);
 
         childFragments.forEach(fragment -> ((DialogFragment) fragment).dismiss());
     }
 
     @Test
-    public void onPlaybackStarted_oneActiveOnConnected_clickCancelBtnOnDialog_doNothing() {
+    public void onBroadcastMetadataChanged_oneActiveOnConnected_clickCancelBtnOnDialog_doNothing() {
         FeatureFlagUtils.setEnabled(
                 mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
         when(mBtnView.isEnabled()).thenReturn(true);
@@ -735,7 +735,7 @@ public class AudioSharingSwitchBarControllerTest {
         verify(mBroadcast).startPrivateBroadcast();
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         when(mBroadcast.getLatestBluetoothLeBroadcastMetadata()).thenReturn(mMetadata);
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mAssistant).addSource(mDevice2, mMetadata, /* isGroupOp= */ false);
@@ -755,8 +755,8 @@ public class AudioSharingSwitchBarControllerTest {
                 AudioSharingProgressDialogFragment.class.getName());
         AudioSharingProgressDialogFragment progressFragment =
                 (AudioSharingProgressDialogFragment) Iterables.getOnlyElement(childFragments);
-        // TODO: use string res once finalized
-        String expectedMessage = "Sharing with " + TEST_DEVICE_NAME2 + "...";
+        String expectedMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_add_source_content, TEST_DEVICE_NAME2);
         checkProgressDialogMessage(progressFragment, expectedMessage);
 
         childFragments.forEach(fragment -> ((DialogFragment) fragment).dismiss());
@@ -835,7 +835,7 @@ public class AudioSharingSwitchBarControllerTest {
 
         when(mBroadcast.isEnabled(null)).thenReturn(true);
         when(mBroadcast.getLatestBluetoothLeBroadcastMetadata()).thenReturn(mMetadata);
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mAssistant).addSource(mDevice2, mMetadata, /* isGroupOp= */ false);
@@ -868,16 +868,15 @@ public class AudioSharingSwitchBarControllerTest {
     }
 
     @Test
-    public void testAssistantCallbacks_onReceiveStateChanged_dismissProgressDialog() {
+    public void testAssistantCallbacks_onSourceAdded_dismissProgressDialog() {
         AudioSharingProgressDialogFragment.show(mParentFragment, TEST_DEVICE_NAME1);
         shadowOf(Looper.getMainLooper()).idle();
         List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
         assertThat(childFragments).comparingElementsUsing(CLAZZNAME_EQUALS).containsExactly(
                 AudioSharingProgressDialogFragment.class.getName());
 
-        when(mState.getBisSyncState()).thenReturn(ImmutableList.of(1L));
-        mController.mBroadcastAssistantCallback.onReceiveStateChanged(mDevice1, /* sourceId= */ 1,
-                mState);
+        mController.mBroadcastAssistantCallback.onSourceAdded(mDevice1, /* sourceId= */
+                1, /* reason= */ 1);
         shadowOf(Looper.getMainLooper()).idle();
         childFragments = mParentFragment.getChildFragmentManager().getFragments();
         assertThat(childFragments).isEmpty();
@@ -892,8 +891,6 @@ public class AudioSharingSwitchBarControllerTest {
         mController.mBroadcastAssistantCallback.onSearchStartFailed(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopped(/* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSearchStopFailed(/* reason= */ 1);
-        mController.mBroadcastAssistantCallback.onSourceAdded(
-                mDevice1, /* sourceId= */ 1, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceRemoved(
                 mDevice1, /* sourceId= */ 1, /* reason= */ 1);
         mController.mBroadcastAssistantCallback.onSourceRemoveFailed(
@@ -1013,7 +1010,7 @@ public class AudioSharingSwitchBarControllerTest {
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mBroadcast).startPrivateBroadcast();
-        mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+        mController.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
         shadowOf(Looper.getMainLooper()).idle();
 
         verify(mFeatureFactory.metricsFeatureProvider)
@@ -1027,8 +1024,8 @@ public class AudioSharingSwitchBarControllerTest {
         // Progress dialog shows sharing progress for the auto add second sink.
         AudioSharingProgressDialogFragment progressFragment =
                 (AudioSharingProgressDialogFragment) Iterables.getOnlyElement(childFragments);
-        // TODO: use string res once finalized
-        String expectedMessage = "Sharing with " + TEST_DEVICE_NAME1 + "...";
+        String expectedMessage = mContext.getString(
+                R.string.audio_sharing_progress_dialog_add_source_content, TEST_DEVICE_NAME1);
         checkProgressDialogMessage(progressFragment, expectedMessage);
 
         childFragments.forEach(fragment -> ((DialogFragment) fragment).dismiss());
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java
index 1d39bc9f0db..4c25c11db70 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,10 +32,12 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastAssistant;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.bluetooth.BluetoothStatusCodes;
 import android.content.Context;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.view.View;
@@ -46,6 +49,7 @@ import androidx.test.core.app.ApplicationProvider;
 import com.android.settings.R;
 import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowAudioStreamsHelper;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -62,6 +66,7 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -73,6 +78,7 @@ import java.util.concurrent.Executor;
         shadows = {
             ShadowThreadUtils.class,
             ShadowAudioStreamsHelper.class,
+            ShadowBluetoothAdapter.class,
         })
 public class AudioStreamButtonControllerTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -95,6 +101,13 @@ public class AudioStreamButtonControllerTest {
     @Before
     public void setUp() {
         mSetFlagsRule.disableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
         ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
         when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mAssistant);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
@@ -261,6 +274,7 @@ public class AudioStreamButtonControllerTest {
 
     @Test
     public void testCallback_onReceiveStateChangedWithSourcePresent_updateButton() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         String address = "11:22:33:44:55:66";
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderControllerTest.java
index 5cdc7974846..54b26ec228a 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderControllerTest.java
@@ -20,6 +20,7 @@ import static com.android.settings.connecteddevice.audiosharing.audiostreams.Aud
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController.AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY;
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController.AUDIO_STREAM_HEADER_PRESENT_NOW_SUMMARY;
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -28,9 +29,11 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastAssistant;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.bluetooth.BluetoothStatusCodes;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.platform.test.flag.junit.SetFlagsRule;
@@ -41,6 +44,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowAudioStreamsHelper;
 import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
@@ -57,6 +61,7 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -69,6 +74,7 @@ import java.util.concurrent.Executor;
             ShadowEntityHeaderController.class,
             ShadowThreadUtils.class,
             ShadowAudioStreamsHelper.class,
+            ShadowBluetoothAdapter.class,
         })
 public class AudioStreamHeaderControllerTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -93,6 +99,13 @@ public class AudioStreamHeaderControllerTest {
     @Before
     public void setUp() {
         mSetFlagsRule.disableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
 
         ShadowEntityHeaderController.setUseMock(mHeaderController);
         ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
@@ -260,6 +273,7 @@ public class AudioStreamHeaderControllerTest {
 
     @Test
     public void testCallback_onReceiveStateChangedWithSourcePresent_updateButton() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         String address = "11:22:33:44:55:66";
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaServiceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaServiceTest.java
index abdd7438ea2..bfb474b711f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaServiceTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaServiceTest.java
@@ -80,6 +80,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.util.concurrent.InlineExecutorService;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
@@ -143,6 +144,8 @@ public class AudioStreamMediaServiceTest {
 
         mAudioStreamMediaService = spy(new AudioStreamMediaService());
         ReflectionHelpers.setField(mAudioStreamMediaService, "mBase", mContext);
+        ReflectionHelpers.setField(
+                mAudioStreamMediaService, "mExecutor", new InlineExecutorService());
         when(mAudioStreamMediaService.getSystemService(anyString()))
                 .thenReturn(mMediaSessionManager);
         when(mMediaSessionManager.createSession(any(), anyString(), any())).thenReturn(mISession);
@@ -352,18 +355,6 @@ public class AudioStreamMediaServiceTest {
         verify(mAudioStreamMediaService).stopSelf();
     }
 
-    @Test
-    public void mediaSessionCallback_onSeekTo_updateNotification() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
-
-        mAudioStreamMediaService.onCreate();
-        mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
-        assertThat(mAudioStreamMediaService.mMediaSessionCallback).isNotNull();
-        mAudioStreamMediaService.mMediaSessionCallback.onSeekTo(100);
-
-        verify(mNotificationManager).notify(anyInt(), any());
-    }
-
     @Test
     public void mediaSessionCallback_onPause_setVolume() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
@@ -415,19 +406,6 @@ public class AudioStreamMediaServiceTest {
                         eq(SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_LEAVE_BUTTON_CLICK));
     }
 
-    @Test
-    public void volumeControlCallback_onDeviceVolumeChanged_updateNotification() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
-
-        mAudioStreamMediaService.onCreate();
-        assertThat(mAudioStreamMediaService.mVolumeControlCallback).isNotNull();
-        mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
-        mAudioStreamMediaService.mVolumeControlCallback.onDeviceVolumeChanged(
-                mDevice, /* volume= */ 0);
-
-        verify(mNotificationManager).notify(anyInt(), any());
-    }
-
     @Test
     public void onBind_returnNull() {
         IBinder binder = mAudioStreamMediaService.onBind(new Intent());
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandlerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandlerTest.java
index bb873d44575..7b53ca6c74c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandlerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,6 +32,8 @@ 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.BluetoothStatusCodes;
 import android.content.Context;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.text.SpannableString;
@@ -38,6 +41,8 @@ import android.text.SpannableString;
 import androidx.preference.Preference;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -47,8 +52,14 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(
+        shadows = {
+                ShadowBluetoothAdapter.class,
+        })
 public class AudioStreamStateHandlerTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -64,6 +75,13 @@ public class AudioStreamStateHandlerTest {
     @Before
     public void setUp() {
         mSetFlagsRule.disableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
         mHandler = spy(new AudioStreamStateHandler());
     }
 
@@ -109,6 +127,7 @@ public class AudioStreamStateHandlerTest {
 
     @Test
     public void testHandleStateChange_setNewState_sourcePresent() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
 
         when(mHandler.getStateEnum())
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryControllerTest.java
index 0e003097a3f..c83c8a2137c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryControllerTest.java
@@ -135,47 +135,47 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void getAvailabilityStatus_flagOn() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_flagOff() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
     public void onStart_flagOff_doNothing() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.onStart(mLifecycleOwner);
         verify(mBluetoothEventManager, never()).registerCallback(any());
     }
 
     @Test
     public void onStart_flagOn_registerCallback() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.onStart(mLifecycleOwner);
         verify(mBluetoothEventManager).registerCallback(any());
     }
 
     @Test
     public void onStop_flagOff_doNothing() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.onStop(mLifecycleOwner);
         verify(mBluetoothEventManager, never()).unregisterCallback(any());
     }
 
     @Test
     public void onStop_flagOn_unregisterCallback() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.onStop(mLifecycleOwner);
         verify(mBluetoothEventManager).unregisterCallback(any());
     }
 
     @Test
     public void updateVisibility_flagOff_invisible() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.updateVisibility();
         shadowOf(Looper.getMainLooper()).idle();
         assertThat(mPreference.isVisible()).isFalse();
@@ -183,7 +183,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void updateVisibility_noConnectedLe_invisible() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         mController.updateVisibility();
         shadowOf(Looper.getMainLooper()).idle();
         assertThat(mPreference.isVisible()).isFalse();
@@ -191,7 +191,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void updateVisibility_isNotProfileReady_invisible() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(
                 mCachedBluetoothDevice);
         when(mVolumeControl.isProfileReady()).thenReturn(false);
@@ -202,7 +202,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void updateVisibility_isBroadcasting_invisible() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(
                 mCachedBluetoothDevice);
         when(mBroadcast.isEnabled(any())).thenReturn(true);
@@ -213,7 +213,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void updateVisibility_isBluetoothOff_invisible() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(
                 mCachedBluetoothDevice);
         mShadowBluetoothAdapter.setEnabled(false);
@@ -224,7 +224,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void updateVisibility_visible() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(
                 mCachedBluetoothDevice);
         mController.displayPreference(mScreen);
@@ -235,7 +235,7 @@ public class AudioStreamsCategoryControllerTest {
 
     @Test
     public void onProfileConnectionStateChanged_updateVisibility() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
         ArgumentCaptor<BluetoothCallback> argumentCaptor =
                 ArgumentCaptor.forClass(BluetoothCallback.class);
         mController.onStart(mLifecycleOwner);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java
index fca1137e5c7..abfc4b7cc80 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java
@@ -20,6 +20,7 @@ import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
 
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -33,9 +34,11 @@ 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.bluetooth.BluetoothLeBroadcastMetadata;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.bluetooth.BluetoothStatusCodes;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -45,6 +48,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -65,6 +69,7 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -74,6 +79,7 @@ import java.util.List;
 @Config(
         shadows = {
             ShadowThreadUtils.class,
+            ShadowBluetoothAdapter.class,
         })
 public class AudioStreamsHelperTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -97,6 +103,13 @@ public class AudioStreamsHelperTest {
     @Before
     public void setUp() {
         mSetFlagsRule.disableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
         when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
         when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mDeviceManager);
         when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile())
@@ -229,6 +242,7 @@ public class AudioStreamsHelperTest {
 
     @Test
     public void getAllPresentSources_noSource() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
 
         List<BluetoothDevice> devices = new ArrayList<>();
@@ -251,6 +265,7 @@ public class AudioStreamsHelperTest {
 
     @Test
     public void getAllPresentSources_returnSource() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         String address = "11:22:33:44:55:66";
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallbackTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallbackTest.java
index 1e645282227..4e962c7deb3 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallbackTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallbackTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -24,11 +25,18 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.bluetooth.BluetoothStatusCodes;
+import android.content.Context;
 import android.platform.test.flag.junit.SetFlagsRule;
 
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -37,15 +45,21 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+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 AudioStreamsProgressCategoryCallbackTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
+    private final Context mContext = ApplicationProvider.getApplicationContext();
     @Mock private AudioStreamsProgressCategoryController mController;
     @Mock private BluetoothDevice mDevice;
     @Mock private BluetoothLeBroadcastReceiveState mState;
@@ -56,7 +70,14 @@ public class AudioStreamsProgressCategoryCallbackTest {
     @Before
     public void setUp() {
         mSetFlagsRule.disableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
-        mCallback = new AudioStreamsProgressCategoryCallback(mController);
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        mCallback = new AudioStreamsProgressCategoryCallback(mContext, mController);
     }
 
     @Test
@@ -71,6 +92,7 @@ public class AudioStreamsProgressCategoryCallbackTest {
 
     @Test
     public void testOnReceiveStateChanged_sourcePresent() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
         String address = "11:22:33:44:55:66";
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryControllerTest.java
index 227748ae232..78d4d6e1361 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryControllerTest.java
@@ -26,6 +26,7 @@ import static com.android.settings.connecteddevice.audiosharing.audiostreams.Aud
 import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.UNSET_BROADCAST_ID;
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settingslib.flags.Flags.FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX;
+import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -48,6 +49,7 @@ import android.bluetooth.BluetoothLeAudioContentMetadata;
 import android.bluetooth.BluetoothLeBroadcastMetadata;
 import android.bluetooth.BluetoothLeBroadcastReceiveState;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothStatusCodes;
 import android.content.Context;
 import android.os.Looper;
 import android.platform.test.flag.junit.SetFlagsRule;
@@ -62,6 +64,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowAudioStreamsHelper;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.bluetooth.BluetoothEventManager;
@@ -84,6 +87,7 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
@@ -97,6 +101,7 @@ import java.util.List;
             ShadowAudioStreamsHelper.class,
             ShadowThreadUtils.class,
             ShadowAlertDialog.class,
+            ShadowBluetoothAdapter.class,
         })
 public class AudioStreamsProgressCategoryControllerTest {
     @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -129,6 +134,13 @@ public class AudioStreamsProgressCategoryControllerTest {
 
     @Before
     public void setUp() {
+        ShadowBluetoothAdapter shadowBluetoothAdapter = Shadow.extract(
+                BluetoothAdapter.getDefaultAdapter());
+        shadowBluetoothAdapter.setEnabled(true);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
         ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
         when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mLeBroadcastAssistant);
         when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(emptyList());
@@ -292,6 +304,7 @@ public class AudioStreamsProgressCategoryControllerTest {
 
     @Test
     public void testOnStart_initHasDevice_getPresentSources() {
+        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);
         mSetFlagsRule.enableFlags(FLAG_AUDIO_SHARING_HYSTERESIS_MODE_FIX);
 
         // Setup a device
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyClampTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyClampTest.kt
new file mode 100644
index 00000000000..5ab9babda10
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyClampTest.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.display
+
+import android.graphics.PointF
+import android.graphics.RectF
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class TopologyClampTest {
+    @Test
+    fun clampToSides() {
+        val start = RectF(6f, 0f, 16f, 10f)
+        val clamp1 = clampPosition(listOf(RectF(0f, 0f, 10f, 10f)), start)
+        assertEquals(RectF(10f, 0f, 20f, 10f), clamp1)
+
+        val clamp2 = clampPosition(listOf(RectF(18f, 0f, 28f, 10f)), start)
+        assertEquals(RectF(8f, 0f, 18f, 10f), clamp2)
+    }
+
+    @Test
+    fun clampToTopOrBottom() {
+        val start = RectF(0f, 6f, 10f, 16f)
+        val clamp1 = clampPosition(listOf(RectF(0f, 0f, 10f, 10f)), start)
+        assertEquals(RectF(0f, 10f, 10f, 20f), clamp1)
+
+        val clamp2 = clampPosition(listOf(RectF(0f, 18f, 10f, 28f)), start)
+        assertEquals(RectF(0f, 8f, 10f, 18f), clamp2)
+    }
+
+    @Test
+    fun clampToCloserSide() {
+        // Shift one pixel right.
+        val start = RectF(9f, 8f, 19f, 18f)
+        val clamp1 = clampPosition(listOf(RectF(0f, 0f, 10f, 10f)), start)
+        assertEquals(RectF(10f, 8f, 20f, 18f), clamp1)
+
+        // Shift two pixels down.
+        start.set(7f, 8f, 17f, 18f)
+        val clamp2 = clampPosition(listOf(RectF(0f, 0f, 10f, 10f)), start)
+        assertEquals(RectF(7f, 10f, 17f, 20f), clamp2)
+
+        // Shift three pixels left.
+        start.set(-7f, -6f, 3f, 4f);
+        val s3 = clampPosition(listOf(RectF(0f, 0f, 10f, 10f)), start)
+        assertEquals(RectF(-10f, -6f, 0f, 4f), s3)
+    }
+
+    @Test
+    fun clampToCloserDisplayInCorner() {
+        val start = RectF(9f, 6f, 19f, 16f)
+        val clamp1 = clampPosition(listOf(RectF(0f, 0f, 8f, 8f), RectF(8f, 0f, 16f, 4f)), start)
+        assertEquals(RectF(8f, 6f, 18f, 16f), clamp1)
+
+        start.set(10f, 5f, 20f, 15f)
+        val clamp2 = clampPosition(listOf(RectF(0f, 0f, 8f, 8f), RectF(8f, 0f, 16f, 4f)), start)
+        assertEquals(RectF(10f, 4f, 20f, 14f), clamp2)
+    }
+
+    @Test
+    fun clampToSecondDisplayToAvoidOverlap() {
+        val start = RectF(8f, 3f, 18f, 13f)
+        val clamp = clampPosition(listOf(RectF(0f, 0f, 8f, 8f), RectF(8f, 0f, 16f, 4f)), start)
+        assertEquals(RectF(8f, 4f, 18f, 14f), clamp)
+    }
+
+    @Test
+    fun clampToInnerCorner() {
+        val start = RectF(4f, 4f, 14f, 14f)
+        val clamp = clampPosition(listOf(RectF(5f, 0f, 10f, 5f), RectF(0f, 5f, 5f, 10f)), start)
+        assertEquals(RectF(5f, 5f, 15f, 15f), clamp)
+    }
+
+    @Test
+    fun mustBeAdjacent() {
+        val start = RectF(9f, 10f, 14f, 15f)
+
+        // Have candidate X, Y pair that is not adjacent to any display.
+        val clamp = clampPosition(listOf(RectF(5f, 0f, 10f, 5f), RectF(0f, 5f, 5f, 10f)), start)
+        assertEquals(RectF(5f, 10f, 10f, 15f), clamp)
+    }
+
+    @Test
+    fun mustNotIntersect() {
+        // 1 and 2 are attached with 1/3 of their respective sides. Attempt to drag the other
+        // display to 1's lower-right corner. It should be forced to the right side of 2.
+        //111
+        //111
+        //111
+        //  222
+        //  222
+        //  222
+
+        val start = RectF(30f, 30f, 60f, 60f)
+        val clamp = clampPosition(listOf(RectF(0f, 0f, 30f, 30f), RectF(20f, 30f, 50f, 60f)), start)
+        assertEquals(RectF(50f, 30f, 80f, 60f), clamp)
+    }
+
+    @Test
+    fun attachingToTwoRectsAtOnce() {
+        // 2 is being dragged and starts out overlapping 0 and 1, then it is
+        // clamped to the right side of 0 and the bottom of 1 at the same time.
+        //
+        //00
+        //002
+        //  2
+        // 11
+        // 11
+
+        val clamp = clampPosition(
+                listOf(RectF(0f, 0f, 20f, 20f), RectF(10f, 30f, 30f, 50f)),
+                RectF(10f, 11f, 20f, 31f))
+
+        assertEquals(RectF(20f, 10f, 30f, 30f), clamp)
+    }
+
+    @Test
+    fun attachingToTwoRectsAtOnceAxisSwapped() {
+        // Same as previous but with x and y swapped.
+
+        val clamp = clampPosition(
+                listOf(RectF(0f, 0f, 20f, 20f), RectF(30f, 10f, 50f, 30f)),
+                RectF(11f, 10f, 31f, 20f))
+
+        assertEquals(RectF(10f, 20f, 30f, 30f), clamp)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt
new file mode 100644
index 00000000000..078436264e7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.display
+
+import android.graphics.Point
+import android.graphics.PointF
+import android.graphics.RectF
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+fun assertPointF(x: Float, y: Float, delta: Float, actual: PointF) {
+    assertEquals(x, actual.x, delta)
+    assertEquals(y, actual.y, delta)
+}
+
+@RunWith(RobolectricTestRunner::class)
+class TopologyScaleTest {
+    @Test
+    fun oneDisplay4to3Aspect() {
+        val scale = TopologyScale(
+                /* paneWidth= */ 640,
+                listOf(RectF(0f, 0f, 640f, 480f)))
+
+        // blockRatio is higher than 0.05 in order to make the smallest display edge (480 dp) 48dp
+        // in the pane.
+        assertEquals(
+                "{TopoScale blockRatio=0.100000 originPaneXY=288,48 paneHeight=144}", "" + scale)
+
+        assertEquals(Point(352, 96), scale.displayToPaneCoor(PointF(640f, 480f)))
+        assertEquals(Point(320, 72), scale.displayToPaneCoor(PointF(320f, 240f)))
+        assertEquals(PointF(640f, 480f), scale.paneToDisplayCoor(Point(352, 96)))
+    }
+
+    @Test
+    fun twoUnalignedDisplays() {
+        val scale = TopologyScale(
+                /* paneWidth= */ 300,
+                listOf(RectF(0f, 0f, 1920f, 1200f), RectF(1920f, -300f, 3840f, 900f)))
+
+        assertEquals(
+                "{TopoScale blockRatio=0.046875 originPaneXY=60,37 paneHeight=117}", "" + scale)
+
+        assertEquals(Point(78, 55), scale.displayToPaneCoor(PointF(400f, 400f)))
+        assertEquals(Point(42, 37), scale.displayToPaneCoor(PointF(-400f, 0f)))
+        assertPointF(-384f, 106.6666f, 0.001f, scale.paneToDisplayCoor(Point(42, 42)))
+    }
+
+    @Test
+    fun twoDisplaysBlockRatioBumpedForGarSizeMinimumHorizontal() {
+        val scale = TopologyScale(
+                /* paneWidth= */ 192,
+                listOf(RectF(0f, 0f, 240f, 320f), RectF(-240f, -320f, 0f, 0f)))
+
+        // blockRatio is higher than 0.05 in order to make the smallest display edge (240 dp) 48dp
+        // in the pane.
+        assertEquals(
+                "{TopoScale blockRatio=0.200000 originPaneXY=96,128 paneHeight=256}", "" + scale)
+
+        assertEquals(Point(192, 256), scale.displayToPaneCoor(PointF(480f, 640f)))
+        assertEquals(Point(96, 64), scale.displayToPaneCoor(PointF(0f, -320f)))
+        assertPointF(220f, -430f, 0.001f, scale.paneToDisplayCoor(Point(140, 42)))
+    }
+
+    @Test
+    fun paneVerticalPaddingLimitedByTallestDisplay() {
+        val scale = TopologyScale(
+                /* paneWidth= */ 300,
+                listOf(
+                        RectF(0f, 0f, 640f, 480f),
+                        RectF(0f, 480f, 640f, 960f),
+                        RectF(0f, 960f, 640f, 1440f),
+                        RectF(0f, 1440f, 640f, 1920f),
+                        RectF(0f, 1920f, 640f, 2400f),
+                        RectF(0f, 2400f, 640f, 2880f)))
+
+        assertEquals(
+                "{TopoScale blockRatio=0.100000 originPaneXY=118,48 paneHeight=384}", "" + scale)
+        assertEquals(Point(150, 48), scale.displayToPaneCoor(PointF(320f, 0f)))
+        assertPointF(-180f, 2880f, 0.001f, scale.paneToDisplayCoor(Point(100, 336)))
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
index 7e6d31438f8..f621cbfdce4 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
@@ -91,7 +91,7 @@ public class AppDataUsagePreferenceTest {
         mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
                 50 /* percent */, mUidDetailProvider);
         final View view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
-                com.android.settingslib.widget.preference.app.R.layout.preference_app, null);
+                com.android.settings.R.layout.preference_process_stats, null);
         final PreferenceViewHolder preferenceViewHolder =
                 PreferenceViewHolder.createInstanceForTests(view);
         final ProgressBar progressBar = (ProgressBar) preferenceViewHolder.findViewById(
diff --git a/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt b/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt
new file mode 100644
index 00000000000..24e8213e566
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataSaverScreenTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.core.app.ApplicationProvider
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class DataSaverScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator =
+        DataSaverScreen(ApplicationProvider.getApplicationContext())
+
+    override val flagName
+        get() = Flags.FLAG_CATALYST_RESTRICT_BACKGROUND_PARENT_ENTRY
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(DataSaverScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index 9ac318a542a..ffb5141171c 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -34,6 +34,8 @@ import android.os.UserHandle;
 
 import androidx.preference.Preference;
 
+import com.android.settings.R;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -153,6 +155,12 @@ public class AutoTimePreferenceControllerTest {
         assertThat(mController.isEnabled()).isFalse();
     }
 
+    @Test
+    public void getSummary() {
+        assertThat(mController.getSummary().toString()).isEqualTo(
+                mContext.getString(R.string.date_time_auto_summary));
+    }
+
     private static TimeCapabilitiesAndConfig createCapabilitiesAndConfig(boolean autoSupported,
             boolean autoEnabled) {
         int configureAutoDetectionEnabledCapability =
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index c2d0445e023..7bf8d52543e 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -40,12 +40,17 @@ import android.app.time.TimeZoneConfiguration;
 import android.app.time.TimeZoneDetectorStatus;
 import android.content.Context;
 import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.flags.Flags;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -57,6 +62,9 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class AutoTimeZonePreferenceControllerTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private UpdateTimeAndDateCallback mCallback;
     private Context mContext;
@@ -225,7 +233,8 @@ public class AutoTimeZonePreferenceControllerTest {
         when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
         when(mTimeManager.updateTimeZoneConfiguration(Mockito.any())).thenReturn(true);
 
-        assertThat(mController.getSummary()).isEqualTo("");
+        assertThat(mController.getSummary().toString()).isEqualTo(
+                mContext.getString(R.string.zone_auto_title_summary));
 
         capabilitiesAndConfig = createCapabilitiesAndConfig(
                 /* autoSupported= */true, /* autoEnabled= */true, /* telephonySupported= */
@@ -233,12 +242,57 @@ public class AutoTimeZonePreferenceControllerTest {
         when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
         when(mTimeManager.updateTimeZoneConfiguration(Mockito.any())).thenReturn(true);
 
-        assertThat(mController.getSummary()).isEqualTo(
+        assertThat(mController.getSummary().toString()).isEqualTo(
                 mContext.getString(R.string.auto_zone_requires_location_summary));
     }
 
+    @Test
+    @EnableFlags({Flags.FLAG_REVAMP_TOGGLES})
+    public void toggleOff_revampFlagOn_shouldToggleOffUseLocation() {
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig = createCapabilitiesAndConfig(
+                /* autoSupported= */ true,
+                /* autoEnabled= */ true,
+                /* telephonySupported= */ true,
+                /* locationSupported= */ true);
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+
+        mController.setChecked(false);
+
+        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
+                .setAutoDetectionEnabled(false)
+                .setGeoDetectionEnabled(false)
+                .build();
+
+        verify(mTimeManager).updateTimeZoneConfiguration(configuration);
+    }
+
+    @Test
+    @DisableFlags({Flags.FLAG_REVAMP_TOGGLES})
+    public void toggleOff_revampFlagOff_shouldToggleOffUseLocation() {
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig = createCapabilitiesAndConfig(
+                /* autoSupported= */ true,
+                /* autoEnabled= */ true,
+                /* telephonySupported= */ true,
+                /* locationSupported= */ true);
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+
+        mController.setChecked(false);
+
+        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
+                .setAutoDetectionEnabled(false)
+                .build();
+
+        verify(mTimeManager).updateTimeZoneConfiguration(configuration);
+    }
+
     private static TimeZoneCapabilitiesAndConfig createCapabilitiesAndConfig(
             boolean autoSupported, boolean autoEnabled, boolean telephonySupported) {
+        return createCapabilitiesAndConfig(autoSupported, autoEnabled, telephonySupported, false);
+    }
+
+    private static TimeZoneCapabilitiesAndConfig createCapabilitiesAndConfig(
+            boolean autoSupported, boolean autoEnabled, boolean telephonySupported,
+            boolean locationSupported) {
         TimeZoneDetectorStatus status = new TimeZoneDetectorStatus(DETECTOR_STATUS_RUNNING,
                 new TelephonyTimeZoneAlgorithmStatus(
                         telephonySupported ? DETECTION_ALGORITHM_STATUS_RUNNING
@@ -252,12 +306,14 @@ public class AutoTimeZonePreferenceControllerTest {
         TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM)
                 .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability)
                 .setUseLocationEnabled(true)
-                .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED)
+                .setConfigureGeoDetectionEnabledCapability(
+                        locationSupported ? Capabilities.CAPABILITY_POSSESSED
+                                : Capabilities.CAPABILITY_NOT_SUPPORTED)
                 .setSetManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED)
                 .build();
         TimeZoneConfiguration config = new TimeZoneConfiguration.Builder()
                 .setAutoDetectionEnabled(autoEnabled)
-                .setGeoDetectionEnabled(false)
+                .setGeoDetectionEnabled(locationSupported)
                 .build();
         return new TimeZoneCapabilitiesAndConfig(status, capabilities, config);
     }
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index cd89c0c2d22..40794d217ee 100644
--- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -25,6 +25,8 @@ import static android.app.time.DetectorStatusTypes.DETECTOR_STATUS_RUNNING;
 import static android.app.time.LocationTimeZoneAlgorithmStatus.PROVIDER_STATUS_NOT_PRESENT;
 import static android.app.time.LocationTimeZoneAlgorithmStatus.PROVIDER_STATUS_NOT_READY;
 
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -43,11 +45,17 @@ import android.app.time.TimeZoneConfiguration;
 import android.app.time.TimeZoneDetectorStatus;
 import android.content.Context;
 import android.os.UserHandle;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.flags.Flags;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -62,9 +70,14 @@ import org.robolectric.annotation.Config;
         com.android.settings.testutils.shadow.ShadowFragment.class,
 })
 public class LocationTimeZoneDetectionPreferenceControllerTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private TimeManager mTimeManager;
     private Context mContext;
+    private SwitchPreference mPreference;
     private LocationTimeZoneDetectionPreferenceController mController;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private InstrumentedPreferenceFragment mFragment;
@@ -76,6 +89,9 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
         when(mContext.getSystemService(TimeManager.class)).thenReturn(mTimeManager);
         mController = new LocationTimeZoneDetectionPreferenceController(mContext);
         mController.setFragment(mFragment);
+
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey("location_time_zone_detection");
     }
 
     @Test
@@ -114,6 +130,17 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
         verify(mTimeManager, never()).updateTimeZoneConfiguration(any());
     }
 
+    @Test
+    @EnableFlags({Flags.FLAG_REVAMP_TOGGLES})
+    public void flagRevampTogglesOn_toggleOff_automaticTimeZone_disablesLocationToggle() {
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                createTimeZoneCapabilitiesAndConfig(/* useLocationEnabled= */ true,
+                        CAPABILITY_POSSESSED, /* setAutoDetectionEnabled= */ false);
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
     @Test
     public void setChecked_withFalse_shouldUpdateSetting() {
         boolean useLocationEnabled = false;
@@ -181,7 +208,14 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
     private static TimeZoneCapabilitiesAndConfig createTimeZoneCapabilitiesAndConfig(
             boolean useLocationEnabled,
             @CapabilityState int configureGeoDetectionEnabledCapability) {
+        return createTimeZoneCapabilitiesAndConfig(useLocationEnabled,
+                configureGeoDetectionEnabledCapability, /* setAutoDetectionEnabled= */ true);
+    }
 
+    private static TimeZoneCapabilitiesAndConfig createTimeZoneCapabilitiesAndConfig(
+            boolean useLocationEnabled,
+            @CapabilityState int configureGeoDetectionEnabledCapability,
+            boolean setAutoDetectionEnabled) {
         // Create a status that matches the user's capability state.
         LocationTimeZoneAlgorithmStatus locationAlgorithmStatus;
         switch (configureGeoDetectionEnabledCapability) {
@@ -213,7 +247,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
                 .build();
 
         TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
-                .setAutoDetectionEnabled(true)
+                .setAutoDetectionEnabled(setAutoDetectionEnabled)
                 .setGeoDetectionEnabled(true)
                 .build();
 
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index e1ea8f9e0fa..c5aac843018 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -23,11 +23,16 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.content.Intent;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.flags.Flags;
+
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -41,6 +46,9 @@ import java.util.List;
 @RunWith(RobolectricTestRunner.class)
 public class TimeFormatPreferenceControllerTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private UpdateTimeAndDateCallback mCallback;
 
@@ -97,6 +105,7 @@ public class TimeFormatPreferenceControllerTest {
     }
 
     @Test
+    @DisableFlags({Flags.FLAG_REVAMP_TOGGLES})
     public void updateState_autoSet_shouldNotEnablePreference() {
         Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, null);
 
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioUiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioUiPreferenceControllerTest.java
new file mode 100644
index 00000000000..a4462e460fd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioUiPreferenceControllerTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.BluetoothLeAudioUiPreferenceController.VALUE_KEY;
+import static com.android.settings.development.BluetoothLeAudioUiPreferenceController.VALUE_OFF;
+import static com.android.settings.development.BluetoothLeAudioUiPreferenceController.VALUE_ON;
+import static com.android.settings.development.BluetoothLeAudioUiPreferenceController.VALUE_UNSET;
+
+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 static org.robolectric.Shadows.shadowOf;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothStatusCodes;
+import android.content.Context;
+import android.os.Looper;
+import android.os.SystemProperties;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settingslib.flags.Flags;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import 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.shadow.api.Shadow;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+        shadows = {
+            ShadowBluetoothAdapter.class,
+            BluetoothLeAudioUiPreferenceControllerTest.ShadowBluetoothRebootDialogFragment.class
+        })
+public class BluetoothLeAudioUiPreferenceControllerTest {
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private static final String SOURCE_SYSTEM_PROP_KEY =
+            "bluetooth.profile.bap.broadcast.source.enabled";
+    private static final String ASSIST_SYSTEM_PROP_KEY =
+            "bluetooth.profile.bap.broadcast.assist.enabled";
+    @Mock private PreferenceScreen mPreferenceScreen;
+    @Mock private DevelopmentSettingsDashboardFragment mFragment;
+    @Mock private SwitchPreferenceCompat mPreference;
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+    private Context mContext;
+    private BluetoothLeAudioUiPreferenceController mController;
+
+    @Before
+    public void setup() {
+        mContext = RuntimeEnvironment.getApplication();
+        SystemProperties.set(SOURCE_SYSTEM_PROP_KEY, "true");
+        SystemProperties.set(ASSIST_SYSTEM_PROP_KEY, "true");
+        // Reset value
+        Settings.Global.putInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+        mShadowBluetoothAdapter.setEnabled(true);
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+                BluetoothStatusCodes.FEATURE_SUPPORTED);
+        mController = spy(new BluetoothLeAudioUiPreferenceController(mContext, mFragment));
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void isAvailable_flagOff_returnFalse() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void isAvailable_flagOn_returnFalse() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void isAvailable_flagOn_propertyOff_returnFalse() {
+        SystemProperties.set(SOURCE_SYSTEM_PROP_KEY, "false");
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void updateState_settingEnabled_checked() {
+        Settings.Global.putInt(mContext.getContentResolver(), VALUE_KEY, VALUE_ON);
+        mController.updateState(mPreference);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void updateState_settingDisabled_notChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(), VALUE_KEY, VALUE_OFF);
+        mController.updateState(mPreference);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void updateState_featureSupported_enabled() {
+        mController.updateState(mPreference);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void updateState_featureUnsupported_disabled() {
+        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+                BluetoothStatusCodes.FEATURE_NOT_SUPPORTED);
+        mController.updateState(mPreference);
+        shadowOf(Looper.getMainLooper()).idle();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void onRebootDialogConfirmed_noChange_doNothing() {
+        mController.onRebootDialogConfirmed();
+
+        int result = Settings.Global.getInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        assertThat(result).isEqualTo(VALUE_UNSET);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void onRebootDialogConfirmed_hasChange_turnOn() {
+        mController.onPreferenceChange(mPreference, true);
+        mController.onRebootDialogConfirmed();
+
+        int result = Settings.Global.getInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        assertThat(result).isEqualTo(VALUE_ON);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void onRebootDialogCanceled_hasChange_doNothing() {
+        mController.onPreferenceChange(mPreference, true);
+        mController.onRebootDialogCanceled();
+
+        int result = Settings.Global.getInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        assertThat(result).isEqualTo(VALUE_UNSET);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void onBroadcastDisabled_currentValueOn_turnOff() {
+        Settings.Global.putInt(mContext.getContentResolver(), VALUE_KEY, VALUE_ON);
+        mController.updateState(mPreference);
+        shadowOf(Looper.getMainLooper()).idle();
+        mController.onBroadcastDisabled();
+
+        int result = Settings.Global.getInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        assertThat(result).isEqualTo(VALUE_OFF);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_AUDIO_SHARING_DEVELOPER_OPTION)
+    public void onBroadcastDisabled_currentValueUnset_doNothing() {
+        mController.updateState(mPreference);
+        mController.onBroadcastDisabled();
+        shadowOf(Looper.getMainLooper()).idle();
+
+        int result = Settings.Global.getInt(mContext.getContentResolver(), VALUE_KEY, VALUE_UNSET);
+        assertThat(result).isEqualTo(VALUE_UNSET);
+    }
+
+    @Implements(BluetoothRebootDialog.class)
+    public static class ShadowBluetoothRebootDialogFragment {
+
+        /** Shadow implementation of BluetoothRebootDialog#show */
+        @Implementation
+        public static void show(DevelopmentSettingsDashboardFragment host) {
+            // Do nothing.
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
index 7fe937729b6..b9f56215de1 100644
--- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
@@ -17,9 +17,9 @@
 package com.android.settings.development;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
-import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
+import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreenTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreenTest.kt
new file mode 100644
index 00000000000..14479d7c2f0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreenTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.aboutphone
+
+import android.content.Context
+import android.os.Build
+import android.provider.Settings.Global
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.robolectric.RuntimeEnvironment
+
+class MyDeviceInfoScreenTest : CatalystScreenTestCase() {
+    private lateinit var context: Context
+
+    override val preferenceScreenCreator = MyDeviceInfoScreen()
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_MY_DEVICE_INFO_PREF_SCREEN
+
+    override fun migration() {}
+
+    @Before
+    fun setup() {
+        context = RuntimeEnvironment.getApplication()
+    }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(MyDeviceInfoScreen.KEY)
+    }
+
+    @Test
+    fun getSummary_deviceNameNotSet_shouldReturnDeviceModel() {
+        assertThat(preferenceScreenCreator.getSummary(context)?.toString()).isEqualTo(Build.MODEL)
+    }
+
+    @Test
+    fun getSummary_deviceNameSet_shouldReturnDeviceName() {
+        Global.putString(context.contentResolver, Global.DEVICE_NAME, "Test")
+        assertThat(preferenceScreenCreator.getSummary(context)?.toString()).isEqualTo("Test")
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
index 420b9a337b4..51763bc2a71 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
@@ -41,6 +41,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class FirmwareVersionDetailPreferenceControllerTest {
 
@@ -112,3 +113,4 @@ public class FirmwareVersionDetailPreferenceControllerTest {
         }
     }
 }
+// LINT.ThenChange(FirmwareVersionDetailPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceTest.kt
new file mode 100644
index 00000000000..69ea549bc43
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.os.Build
+import android.os.SystemClock
+import android.os.UserManager
+import androidx.preference.Preference
+import androidx.test.core.app.ApplicationProvider
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDetailPreference.Companion.DELAY_TIMER_MILLIS
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+
+// LINT.IfChange
+@RunWith(RobolectricTestRunner::class)
+class FirmwareVersionDetailPreferenceTest {
+    private var userManager: UserManager? = null
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                if (name == Context.USER_SERVICE) userManager else super.getSystemService(name)
+        }
+
+    private val preference = Preference(context)
+
+    private val firmwareVersionDetailPreference = FirmwareVersionDetailPreference()
+
+    @Test
+    fun getSummary() {
+        assertThat(firmwareVersionDetailPreference.getSummary(context))
+            .isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY)
+    }
+
+    @Test
+    fun onPreferenceClick_hits() {
+        prepareClick()
+        assertThat(firmwareVersionDetailPreference.onPreferenceClick(preference)).isFalse()
+    }
+
+    @Test
+    fun onPreferenceClick_restricted() {
+        prepareClick()
+        userManager = mock { on { hasUserRestriction(UserManager.DISALLOW_FUN) } doReturn true }
+        assertThat(firmwareVersionDetailPreference.onPreferenceClick(preference)).isTrue()
+    }
+
+    private fun prepareClick() {
+        SystemClock.sleep(DELAY_TIMER_MILLIS + 1)
+        assertThat(SystemClock.uptimeMillis()).isGreaterThan(DELAY_TIMER_MILLIS)
+        for (i in 1..<FirmwareVersionDetailPreference.ACTIVITY_TRIGGER_COUNT) {
+            assertThat(firmwareVersionDetailPreference.onPreferenceClick(preference)).isTrue()
+        }
+    }
+}
+// LINT.ThenChange(FirmwareVersionDetailPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreenTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreenTest.kt
new file mode 100644
index 00000000000..e0adc595820
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreenTest.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+
+class FirmwareVersionScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = FirmwareVersionScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_FIRMWARE_VERSION
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
index 7cd6734477a..f6e4d2a0573 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
@@ -47,6 +47,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class MainlineModuleVersionPreferenceControllerTest {
 
@@ -222,3 +223,4 @@ public class MainlineModuleVersionPreferenceControllerTest {
         when(mPackageManager.getPackageInfo(eq(provider), anyInt())).thenReturn(info);
     }
 }
+// LINT.ThenChange(MainlineModuleVersionPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceTest.kt
new file mode 100644
index 00000000000..d1e8a8e32bf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceTest.kt
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.content.res.Resources
+import android.platform.test.annotations.DisableFlags
+import android.platform.test.annotations.EnableFlags
+import android.platform.test.flag.junit.SetFlagsRule
+import androidx.preference.Preference
+import androidx.test.core.app.ApplicationProvider
+import com.android.settings.R
+import com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreference.Companion.MODULE_UPDATE_ACTION
+import com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreference.Companion.MODULE_UPDATE_ACTION_V2
+import com.android.settings.flags.Flags
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.any
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.kotlin.KStubbing
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+
+// LINT.IfChange
+@RunWith(RobolectricTestRunner::class)
+class MainlineModuleVersionPreferenceTest {
+    @get:Rule val setFlagsRule = SetFlagsRule()
+
+    private lateinit var mockPackageManager: PackageManager
+    private lateinit var mockResources: Resources
+
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getPackageManager(): PackageManager = mockPackageManager
+
+            override fun getResources(): Resources = mockResources
+        }
+
+    private val mainlineModuleVersionPreference = MainlineModuleVersionPreference()
+
+    @Test
+    fun isAvailable_noMainlineModuleProvider_unavailable() {
+        createMocks("", null)
+        assertThat(mainlineModuleVersionPreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_noMainlineModulePackageInfo_unavailable() {
+        createMocks("test.provider", PackageManager.NameNotFoundException())
+        assertThat(mainlineModuleVersionPreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasMainlineModulePackageInfo_available() {
+        createMocks("test.provider", "test version 123")
+        assertThat(mainlineModuleVersionPreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun getSummary_versionIsNull() {
+        createMocks("test.provider", PackageInfo())
+        assertThat(mainlineModuleVersionPreference.getSummary(context)).isNull()
+    }
+
+    @Test
+    fun getSummary_versionIsEmpty() {
+        createMocks("test.provider", "")
+        assertThat(mainlineModuleVersionPreference.getSummary(context)).isNull()
+    }
+
+    @Test
+    fun getSummary_versionIsNotDate() {
+        createMocks("test.provider", "a")
+        assertThat(mainlineModuleVersionPreference.getSummary(context)).isEqualTo("a")
+    }
+
+    @Test
+    fun getSummary_versionIsMonth() {
+        createMocks("test.provider", "2019-05")
+        assertThat(mainlineModuleVersionPreference.getSummary(context)).isEqualTo("May 1, 2019")
+    }
+
+    @Test
+    fun getSummary_versionIsDate() {
+        createMocks("test.provider", "2019-05-13")
+        assertThat(mainlineModuleVersionPreference.getSummary(context)).isEqualTo("May 13, 2019")
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
+    fun intentV2_preferenceShouldBeSelectable() {
+        intent_preferenceShouldBeSelectable(MODULE_UPDATE_ACTION_V2, MODULE_PACKAGE)
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_MAINLINE_MODULE_EXPLICIT_INTENT)
+    fun intent_preferenceShouldBeSelectable() {
+        intent_preferenceShouldBeSelectable(MODULE_UPDATE_ACTION, null)
+    }
+
+    private fun intent_preferenceShouldBeSelectable(action: String, intentPackage: String?) {
+        createMocks("test.provider", "test version 123") {
+            on { resolveActivity(any(), anyInt()) } doAnswer
+                {
+                    when {
+                        (it.arguments[0] as Intent).action == action -> ResolveInfo()
+                        else -> null
+                    }
+                }
+        }
+
+        val preference = Preference(context)
+        mainlineModuleVersionPreference.bind(preference, mainlineModuleVersionPreference)
+
+        val intent = preference.intent!!
+        assertThat(intent.action).isEqualTo(action)
+        assertThat(preference.isSelectable).isTrue()
+        assertThat(intent.`package`).isEqualTo(intentPackage)
+    }
+
+    @Test
+    fun intent_null() {
+        createMocks("test.provider", "test version 123")
+
+        val preference = Preference(context)
+        mainlineModuleVersionPreference.bind(preference, mainlineModuleVersionPreference)
+
+        assertThat(preference.intent).isNull()
+        assertThat(preference.isSelectable).isTrue()
+    }
+
+    private fun createMocks(
+        pkg: String,
+        pkgInfo: Any?,
+        stubbing: KStubbing<PackageManager>.() -> Unit = {},
+    ) {
+        mockResources = mock {
+            on { getString(R.string.config_mainline_module_update_package) } doReturn MODULE_PACKAGE
+            on {
+                getString(com.android.internal.R.string.config_defaultModuleMetadataProvider)
+            } doReturn pkg
+        }
+
+        mockPackageManager = mock {
+            when (pkgInfo) {
+                is PackageInfo -> on { getPackageInfo(eq(pkg), anyInt()) } doReturn pkgInfo
+                is String ->
+                    on { getPackageInfo(eq(pkg), anyInt()) } doReturn
+                        PackageInfo().apply { versionName = pkgInfo }
+                is Exception -> on { getPackageInfo(eq(pkg), anyInt()) } doThrow pkgInfo
+                else -> {}
+            }
+            stubbing.invoke(this)
+        }
+    }
+
+    companion object {
+        const val MODULE_PACKAGE = "com.android.vending"
+    }
+}
+// LINT.ThenChange(MainlineModuleVersionPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java
index ccc91e60c8a..8bafc237c58 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java
@@ -46,6 +46,7 @@ import org.robolectric.util.ReflectionHelpers;
 
 import java.util.Collections;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class SecurityPatchLevelPreferenceControllerTest {
 
@@ -108,3 +109,4 @@ public class SecurityPatchLevelPreferenceControllerTest {
         verify(mContext).startActivity(any());
     }
 }
+// LINT.ThenChange(SecurityPatchLevelPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceTest.kt
new file mode 100644
index 00000000000..695c0b6f490
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceTest.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.firmwareversion
+
+import android.content.Context
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.util.ReflectionHelpers
+
+// LINT.IfChange
+@RunWith(RobolectricTestRunner::class)
+class SecurityPatchLevelPreferenceTest {
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    private val securityPatchLevelPreference = SecurityPatchLevelPreference()
+
+    @Test
+    fun isAvailable_noPatch_unavailable() {
+        setSecurityPatch("")
+        assertThat(securityPatchLevelPreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasPatch_available() {
+        setSecurityPatch("foobar")
+        assertThat(securityPatchLevelPreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun getSummary_patchIsDate() {
+        setSecurityPatch("2024-09-24")
+        assertThat(securityPatchLevelPreference.getSummary(context)).isEqualTo("September 24, 2024")
+    }
+
+    @Test
+    fun getSummary_patchIsNotDate() {
+        setSecurityPatch("foobar")
+        assertThat(securityPatchLevelPreference.getSummary(context)).isEqualTo("foobar")
+    }
+
+    private fun setSecurityPatch(patch: String) {
+        ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SECURITY_PATCH", patch)
+    }
+}
+// LINT.ThenChange(SecurityPatchLevelPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
index 3a6e494ff04..28772984fd0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
@@ -45,6 +45,7 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.ArrayList;
 import java.util.List;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class CopyrightPreferenceControllerTest {
 
@@ -119,3 +120,4 @@ public class CopyrightPreferenceControllerTest {
         return testResolveInfo;
     }
 }
+// LINT.ThenChange(LegalPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalPreferenceTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalPreferenceTest.kt
new file mode 100644
index 00000000000..5b65b164f82
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalPreferenceTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import android.content.ContextWrapper
+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 androidx.test.core.app.ApplicationProvider
+import com.android.settings.R
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.any
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.robolectric.RobolectricTestRunner
+
+// LINT.IfChange
+@RunWith(RobolectricTestRunner::class)
+class LegalPreferenceTest {
+    private val pkgManager = mock<PackageManager>()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getPackageManager(): PackageManager = pkgManager
+        }
+
+    private val copyrightPreference =
+        LegalPreference("copyright", R.string.copyright_title, "android.settings.COPYRIGHT")
+
+    @Test
+    fun isAvailable_systemApp_shouldReturnTrue() {
+        val testResolveInfos: MutableList<ResolveInfo> = ArrayList()
+        testResolveInfos.add(getTestResolveInfo(/* isSystemApp= */ true))
+
+        pkgManager.stub {
+            on { queryIntentActivities(any(Intent::class.java), anyInt()) } doReturn
+                testResolveInfos
+        }
+
+        assertThat(copyrightPreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_nonSystemApp_shouldReturnFalse() {
+        val testResolveInfos: MutableList<ResolveInfo> = ArrayList()
+        testResolveInfos.add(getTestResolveInfo(/* isSystemApp= */ false))
+
+        pkgManager.stub {
+            on { queryIntentActivities(any(Intent::class.java), anyInt()) } doReturn
+                testResolveInfos
+        }
+
+        assertThat(copyrightPreference.isAvailable(context)).isFalse()
+    }
+
+    private fun getTestResolveInfo(isSystemApp: Boolean): ResolveInfo {
+        val testResolveInfo = ResolveInfo()
+        val testAppInfo = ApplicationInfo()
+        if (isSystemApp) {
+            testAppInfo.flags = testAppInfo.flags or ApplicationInfo.FLAG_SYSTEM
+        }
+
+        testResolveInfo.activityInfo =
+            ActivityInfo().apply {
+                name = "TestActivityName"
+                packageName = "TestPackageName"
+                applicationInfo = testAppInfo
+            }
+        return testResolveInfo
+    }
+}
+// LINT.ThenChange(CopyrightPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalSettingsScreenTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalSettingsScreenTest.kt
new file mode 100644
index 00000000000..ce6284480fa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LegalSettingsScreenTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class LegalSettingsScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = LegalSettingsScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_LEGAL_INFORMATION
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(LegalSettingsScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
index f51c7ad0e43..d6fdf73b3a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
@@ -45,6 +45,7 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.ArrayList;
 import java.util.List;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class LicensePreferenceControllerTest {
 
@@ -119,3 +120,4 @@ public class LicensePreferenceControllerTest {
         return testResolveInfo;
     }
 }
+// LINT.ThenChange(LegalPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
index 2a91fe1ee65..f8ccd0e432c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
@@ -45,6 +45,7 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.ArrayList;
 import java.util.List;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class TermsPreferenceControllerTest {
 
@@ -119,3 +120,4 @@ public class TermsPreferenceControllerTest {
         return testResolveInfo;
     }
 }
+// LINT.ThenChange(LegalPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java
index c06f069e2d5..2f8a8d44c2f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java
@@ -29,6 +29,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class WallpaperAttributionsPreferenceControllerTest {
 
@@ -54,4 +55,5 @@ public class WallpaperAttributionsPreferenceControllerTest {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
-}
\ No newline at end of file
+}
+// LINT.ThenChange(WallpaperAttributionsPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceTest.kt b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceTest.kt
new file mode 100644
index 00000000000..00e0b0150f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context
+import android.content.ContextWrapper
+import android.content.res.Resources
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.robolectric.RobolectricTestRunner
+
+// LINT.IfChange
+@RunWith(RobolectricTestRunner::class)
+class WallpaperAttributionsPreferenceTest {
+    private val mockResources = mock<Resources>()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    private val wallpaperAttributionsPreference = WallpaperAttributionsPreference()
+
+    @Test
+    fun isAvailable_configTrue_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(wallpaperAttributionsPreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(wallpaperAttributionsPreference.isAvailable(context)).isFalse()
+    }
+}
+// LINT.ThenChange(WallpaperAttributionsPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
index 55604c33373..0836839516c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
@@ -45,6 +45,7 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.ArrayList;
 import java.util.List;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class WebViewLicensePreferenceControllerTest {
 
@@ -119,3 +120,4 @@ public class WebViewLicensePreferenceControllerTest {
         return testResolveInfo;
     }
 }
+// LINT.ThenChange(LegalPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizardTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizardTest.java
new file mode 100644
index 00000000000..1113d688f2b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizardTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.accessibility.Flags;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Before;
+import org.junit.Rule;
+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;
+
+/**
+ * Tests for {@link AutoBrightnessPreferenceControllerForSetupWizard}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
+public class AutoBrightnessPreferenceControllerForSetupWizardTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "auto_brightness";
+
+    private Context mContext;
+    private AutoBrightnessPreferenceControllerForSetupWizard mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController =
+                new AutoBrightnessPreferenceControllerForSetupWizard(mContext, PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
+    public void getAvailabilityStatus_configTrueAndFlagOn_shouldReturnAvailableUnsearchable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_automatic_brightness_available, true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
+    public void getAvailabilityStatus_configFalseSetAndFlagOn_shouldReturnUnsupportedOnDevice() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_automatic_brightness_available, false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
+    public void getAvailabilityStatus_flagOff_shouldReturnConditionallyUnavailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_automatic_brightness_available, true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 13cd86d5a2a..902de787334 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -21,24 +21,18 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.ContentResolver;
 import android.content.Context;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.Flags;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -46,13 +40,14 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+/**
+ * Tests for {@link AutoBrightnessPreferenceController}.
+ */
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {SettingsShadowResources.class})
 public class AutoBrightnessPreferenceControllerTest {
 
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
     private static final String PREFERENCE_KEY = "auto_brightness";
 
     private Context mContext;
@@ -130,34 +125,13 @@ public class AutoBrightnessPreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatusNotInSUW_configTrueSet_shouldReturnAvailableUnsearchable() {
+    public void getAvailabilityStatus_configTrueSet_shouldReturnAvailableUnsearchable() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_automatic_brightness_available, true);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
     }
 
-    @Test
-    @EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
-    public void getAvailabilityStatusInSUW_configTrueAndFlagOn_shouldReturnAvailableUnsearchable() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_automatic_brightness_available, true);
-        mController.setInSetupWizard(true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
-    public void
-            getAvailabilityStatusInSUW_configTrueAndFlagOff_shouldReturnConditionallyUnavailable() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_automatic_brightness_available, true);
-        mController.setInSetupWizard(true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
     @Test
     public void getAvailabilityStatus_configFalseSet_shouldReturnUnsupportedOnDevice() {
         SettingsShadowResources.overrideResource(
@@ -166,3 +140,4 @@ public class AutoBrightnessPreferenceControllerTest {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 }
+// LINT.ThenChange(AutoBrightnessScreenTest.kt)
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessScreenTest.kt b/tests/robotests/src/com/android/settings/display/AutoBrightnessScreenTest.kt
new file mode 100644
index 00000000000..ab2d9bd29d9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessScreenTest.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import android.provider.Settings
+import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
+import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
+import android.view.LayoutInflater
+import androidx.preference.PreferenceViewHolder
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.PrimarySwitchPreference
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme
+import com.android.settingslib.widget.theme.R
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class AutoBrightnessScreenTest {
+
+    private val preferenceScreenCreator = AutoBrightnessScreen()
+
+    private var mockResources: Resources? = null
+
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getResources(): Resources = mockResources ?: super.getResources()
+        }
+
+    @Test
+    fun switchClick_defaultScreenBrightnessModeTurnOffAuto_returnTrue() {
+        setScreenBrightnessMode(SCREEN_BRIGHTNESS_MODE_MANUAL)
+        val preference = getPrimarySwitchPreference()
+
+        assertThat(preference.switch.isChecked).isFalse()
+
+        preference.switch.performClick()
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    @Test
+    fun switchClick_defaultScreenBrightnessModeTurnOnAuto_returnFalse() {
+        setScreenBrightnessMode(SCREEN_BRIGHTNESS_MODE_AUTOMATIC)
+        val preference = getPrimarySwitchPreference()
+
+        assertThat(preference.switch.isChecked).isTrue()
+
+        preference.switch.performClick()
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun setChecked_updatesCorrectly() {
+        val preference = getPrimarySwitchPreference()
+
+        preference.isChecked = true
+
+        assertThat(preference.switch.isChecked).isTrue()
+
+        preference.isChecked = false
+
+        assertThat(preference.switch.isChecked).isFalse()
+    }
+
+    @Test
+    fun isChecked_defaultScreenBrightnessModeTurnOffAuto_returnFalse() {
+        setScreenBrightnessMode(SCREEN_BRIGHTNESS_MODE_MANUAL)
+
+        val preference = getPrimarySwitchPreference()
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun isChecked_defaultScreenBrightnessModeTurnOffAuto_returnTrue() {
+        setScreenBrightnessMode(SCREEN_BRIGHTNESS_MODE_AUTOMATIC)
+
+        val preference = getPrimarySwitchPreference()
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configTrueSet_shouldReturnTrue() {
+        mockResources = mock { on { getBoolean(any()) } doReturn true }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalseSet_shouldReturnFalse() {
+        mockResources = mock { on { getBoolean(any()) } doReturn false }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    private fun getPrimarySwitchPreference() =
+        preferenceScreenCreator.createAndBindWidget<PrimarySwitchPreference>(context).also {
+            val holder =
+                PreferenceViewHolder.createInstanceForTests(
+                        LayoutInflater.from(context).inflate(getResId(), /* root= */ null)
+                    )
+                    .apply { findViewById(androidx.preference.R.id.switchWidget) }
+            it.onBindViewHolder(holder)
+        }
+
+    private fun setScreenBrightnessMode(value: Int) =
+        Settings.System.putInt(context.contentResolver, AutoBrightnessScreen.KEY, value)
+
+    private fun getResId() =
+        when {
+            isExpressiveTheme(context) -> R.layout.settingslib_expressive_preference_switch
+            else -> androidx.preference.R.layout.preference_widget_switch_compat
+        }
+}
+// LINT.ThenChange(AutoBrightnessPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index c84127b04a1..676ae2bfd90 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -37,9 +37,10 @@ import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowUtils.class)
+// LINT.IfChange
 public class BatteryPercentagePreferenceControllerTest {
 
-    private static final String PREF_KEY = "battery_percentage";
+    private static final String PREF_KEY = "status_bar_show_battery_percent";
 
     private Context mContext;
     private BatteryPercentagePreferenceController mController;
@@ -80,3 +81,4 @@ public class BatteryPercentagePreferenceControllerTest {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 }
+// LINT.ThenChange(BatteryPercentageSwitchPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt b/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
new file mode 100644
index 00000000000..2a9a129f44b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.ContextWrapper
+import android.content.res.Resources
+import android.provider.Settings
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.testutils.shadow.ShadowUtils
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowUtils::class])
+// LINT.IfChange
+class BatteryPercentageSwitchPreferenceTest {
+    private val mockResources = mock<Resources>()
+
+    private val appContext: Context = ApplicationProvider.getApplicationContext()
+
+    private val context =
+        object : ContextWrapper(appContext) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    private val batteryPercentageSwitchPreference = BatteryPercentageSwitchPreference()
+
+    @After
+    fun tearDown() {
+        ShadowUtils.reset()
+    }
+
+    @Test
+    fun isAvailable_noBatteryPresent_shouldReturnFalse() {
+        ShadowUtils.setIsBatteryPresent(false)
+
+        assertThat(batteryPercentageSwitchPreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_batterySettingsAvailable_shouldReturnTrue() {
+        ShadowUtils.setIsBatteryPresent(true)
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(batteryPercentageSwitchPreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_batterySettingsUnavailable_shouldReturnFalse() {
+        ShadowUtils.setIsBatteryPresent(true)
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(batteryPercentageSwitchPreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun batteryPercentageEnabled_shouldSwitchPreferenceChecked() {
+        showBatteryPercentage(true)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun batteryPercentageDisabled_shouldSwitchPreferenceUnChecked() {
+        showBatteryPercentage(false)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    @Test
+    fun click_defaultBatteryPercentageDisabled_shouldChangeToEnabled() {
+        showBatteryPercentage(false)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun click_defaultBatteryPercentageEnabled_shouldChangeToDisabled() {
+        showBatteryPercentage(true)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    private fun getSwitchPreferenceCompat(): SwitchPreferenceCompat =
+        batteryPercentageSwitchPreference.createAndBindWidget(context)
+
+    private fun showBatteryPercentage(on: Boolean) =
+        batteryPercentageSwitchPreference.storage(context).setBoolean(
+                Settings.System.SHOW_BATTERY_PERCENT,
+                on,
+            )
+}
+// LINT.ThenChange(BatteryPercentagePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizardTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizardTest.java
new file mode 100644
index 00000000000..25ddd1e6003
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizardTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.accessibility.Flags;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/**
+ * Tests for {@link BrightnessLevelPreferenceControllerForSetupWizard}.
+ */
+@RunWith(RobolectricTestRunner.class)
+public class BrightnessLevelPreferenceControllerForSetupWizardTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private Context mContext;
+    private BrightnessLevelPreferenceControllerForSetupWizard mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new BrightnessLevelPreferenceControllerForSetupWizard(mContext,
+                /* lifecycle= */ null);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
+    public void getAvailabilityStatus_flagOn_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
+    public void getAvailabilityStatus_flagOff_shouldReturnConditionallyUnavailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index 009ca95e4d3..eb830404307 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -33,9 +33,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.hardware.display.BrightnessInfo;
 import android.os.PowerManager;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings.System;
 import android.view.Display;
 
@@ -43,12 +40,10 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.Flags;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settingslib.transition.SettingsTransitionHelper;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -61,12 +56,11 @@ import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowContentResolver;
 
+/**
+ * Tests for {@link BrightnessLevelPreferenceController}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public class BrightnessLevelPreferenceControllerTest {
-
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
     @Mock
     private PowerManager mPowerManager;
     @Mock
@@ -95,28 +89,14 @@ public class BrightnessLevelPreferenceControllerTest {
                 mPowerManager);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         doReturn(mDisplay).when(mContext).getDisplay();
-        mController = spy(new BrightnessLevelPreferenceController(mContext, null));
+        mController = spy(new BrightnessLevelPreferenceController(mContext, /* lifecycle= */ null));
     }
 
     @Test
-    public void isAvailable_shouldAlwaysReturnTrueWhenNotInSetupWizard() {
+    public void isAvailable_shouldAlwaysReturnTrue() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
-    @Test
-    @EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
-    public void isAvailable_inSetupWizardAndFlagOn_shouldReturnTrue() {
-        mController.setInSetupWizard(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    @DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
-    public void isAvailable_inSetupWizardAndFlagOff_shouldReturnFalse() {
-        mController.setInSetupWizard(true);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
     @Test
     public void onStart_shouldRegisterObserver() {
         BrightnessLevelPreferenceController controller =
diff --git a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
index e5940b61432..d1c32a2281f 100644
--- a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
@@ -16,16 +16,26 @@
 
 package com.android.settings.display;
 
+import static android.hardware.devicestate.DeviceState.PROPERTY_EMULATED_ONLY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FEATURE_REAR_DISPLAY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN;
 import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED;
 
 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.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.Resources;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 
 import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,29 +44,61 @@ import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManage
 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.List;
+import java.util.Set;
 
 @RunWith(RobolectricTestRunner.class)
 public class DeviceStateAutoRotateDetailsFragmentTest {
-    private static final int FOLDED_STATE = 0;
-    private static final int HALF_FOLDED_STATE = 1;
-    private static final int UNFOLDED_STATE = 2;
-    private static final int REAR_DISPLAY_STATE = 3;
+    private static final DeviceState DEVICE_STATE_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 0, "FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
+    private static final DeviceState DEVICE_STATE_HALF_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "HALF_FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_UNFOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 2, "UNFOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_REAR_DISPLAY = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 3, "REAR_DISPLAY")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY,
+                            PROPERTY_FEATURE_REAR_DISPLAY, PROPERTY_EMULATED_ONLY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
 
     private final DeviceStateAutoRotateDetailsFragment mFragment =
             spy(new DeviceStateAutoRotateDetailsFragment());
     private final Context mContext = spy(RuntimeEnvironment.application);
     private final Resources mResources = spy(mContext.getResources());
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
 
     @Before
     public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
         when(mContext.getResources()).thenReturn(mResources);
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mFragment.getContext()).thenReturn(mContext);
         when(mFragment.getResources()).thenReturn(mResources);
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
         setUpPostureMappings();
     }
 
@@ -75,8 +117,10 @@ public class DeviceStateAutoRotateDetailsFragmentTest {
     @Test
     public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
         enableDeviceStateSettableRotationStates(
-                new String[]{FOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
-                        UNFOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED},
+                new String[]{DEVICE_STATE_FOLDED.getIdentifier() + ":"
+                        + DEVICE_STATE_ROTATION_LOCK_LOCKED,
+                        DEVICE_STATE_UNFOLDED.getIdentifier() + ":"
+                                + DEVICE_STATE_ROTATION_LOCK_LOCKED},
                 new String[]{"Folded", "Unfolded"});
 
         List<AbstractPreferenceController> preferenceControllers =
@@ -112,18 +156,22 @@ public class DeviceStateAutoRotateDetailsFragmentTest {
                 .resetStateForTesting(mResources);
     }
 
+    // Sets up posture mappings for PosturesHelper
     private void setUpPostureMappings() {
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(
-                new int[]{FOLDED_STATE});
+                    new int[]{DEVICE_STATE_FOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_halfFoldedDeviceStates)).thenReturn(
-                new int[]{HALF_FOLDED_STATE});
+                    new int[]{DEVICE_STATE_HALF_FOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_openDeviceStates)).thenReturn(
-                new int[]{UNFOLDED_STATE});
+                    new int[]{DEVICE_STATE_UNFOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_rearDisplayDeviceStates)).thenReturn(
-                new int[]{REAR_DISPLAY_STATE});
+                    new int[]{DEVICE_STATE_REAR_DISPLAY.getIdentifier()});
+        when(mDeviceStateManager.getSupportedDeviceStates()).thenReturn(
+                List.of(DEVICE_STATE_FOLDED, DEVICE_STATE_HALF_FOLDED, DEVICE_STATE_UNFOLDED,
+                        DEVICE_STATE_REAR_DISPLAY));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
index d364a3be451..cb1be85f881 100644
--- a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
@@ -21,10 +21,13 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
@@ -41,6 +44,7 @@ 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;
@@ -56,15 +60,16 @@ import java.util.List;
 })
 public class DeviceStateAutoRotateSettingControllerTest {
 
-    private static final int DEFAULT_DEVICE_STATE = 1;
+    private static final DeviceState DEFAULT_DEVICE_STATE = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "DEFAULT").build());
     private static final String DEFAULT_DEVICE_STATE_DESCRIPTION = "Device state description";
     private static final int DEFAULT_ORDER = -10;
 
-    private final Context mContext = RuntimeEnvironment.application;
-    private final DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager =
-            DeviceStateRotationLockSettingsManager.getInstance(mContext);
+    private final Context mContext = Mockito.spy(RuntimeEnvironment.application);
+    private DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager;
 
     @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
+    @Mock private DeviceStateManager mDeviceStateManager;
 
     private DeviceStateAutoRotateSettingController mController;
 
@@ -72,9 +77,15 @@ public class DeviceStateAutoRotateSettingControllerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        doReturn(mContext).when(mContext).getApplicationContext();
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
+        doReturn(List.of(DEFAULT_DEVICE_STATE)).when(
+                mDeviceStateManager).getSupportedDeviceStates();
+        mAutoRotateSettingsManager =
+                DeviceStateRotationLockSettingsManager.getInstance(mContext);
         mController = new DeviceStateAutoRotateSettingController(
                 mContext,
-                DEFAULT_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier(),
                 DEFAULT_DEVICE_STATE_DESCRIPTION,
                 DEFAULT_ORDER,
                 mMetricsFeatureProvider
@@ -128,20 +139,22 @@ public class DeviceStateAutoRotateSettingControllerTest {
     public void getPreferenceKey_returnsKeyBasedOnDeviceState() {
         String key = mController.getPreferenceKey();
 
-        String expectedKey = "auto_rotate_device_state_" + DEFAULT_DEVICE_STATE;
+        String expectedKey = "auto_rotate_device_state_" + DEFAULT_DEVICE_STATE.getIdentifier();
         assertThat(key).isEqualTo(expectedKey);
     }
 
     @Test
     public void isChecked_settingForStateIsUnlocked_returnsTrue() {
-        mAutoRotateSettingsManager.updateSetting(DEFAULT_DEVICE_STATE, /* rotationLocked= */ false);
+        mAutoRotateSettingsManager.updateSetting(
+                DEFAULT_DEVICE_STATE.getIdentifier(), /* rotationLocked= */ false);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
     public void isChecked_settingForStateIsLocked_returnsFalse() {
-        mAutoRotateSettingsManager.updateSetting(DEFAULT_DEVICE_STATE, /* rotationLocked= */ true);
+        mAutoRotateSettingsManager.updateSetting(
+                DEFAULT_DEVICE_STATE.getIdentifier(), /* rotationLocked= */ true);
 
         assertThat(mController.isChecked()).isFalse();
     }
@@ -150,7 +163,8 @@ public class DeviceStateAutoRotateSettingControllerTest {
     public void setChecked_true_deviceStateSettingIsUnlocked() {
         mController.setChecked(true);
 
-        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(DEFAULT_DEVICE_STATE);
+        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(
+                DEFAULT_DEVICE_STATE.getIdentifier());
 
         assertThat(rotationLocked).isFalse();
     }
@@ -159,7 +173,8 @@ public class DeviceStateAutoRotateSettingControllerTest {
     public void setChecked_false_deviceStateSettingIsLocked() {
         mController.setChecked(false);
 
-        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(DEFAULT_DEVICE_STATE);
+        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(
+                DEFAULT_DEVICE_STATE.getIdentifier());
 
         assertThat(rotationLocked).isTrue();
     }
@@ -169,7 +184,8 @@ public class DeviceStateAutoRotateSettingControllerTest {
         mController.setChecked(true);
 
         verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_ENABLE_AUTO_ROTATION_DEVICE_STATE, DEFAULT_DEVICE_STATE);
+                SettingsEnums.ACTION_ENABLE_AUTO_ROTATION_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier());
     }
 
     @Test
@@ -177,7 +193,8 @@ public class DeviceStateAutoRotateSettingControllerTest {
         mController.setChecked(false);
 
         verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_DISABLE_AUTO_ROTATION_DEVICE_STATE, DEFAULT_DEVICE_STATE);
+                SettingsEnums.ACTION_DISABLE_AUTO_ROTATION_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
new file mode 100644
index 00000000000..342aa54769c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.internal.widget.LockPatternUtils
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.FakeFeatureFactory
+import com.android.settings.testutils.SystemProperty
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class DisplayScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = DisplayScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_DISPLAY_SETTINGS_SCREEN
+
+    private val mockResources = mock<Resources>()
+
+    private val context =
+        object : ContextWrapper(appContext) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(DisplayScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_configTrue_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    override fun migration() {
+        // avoid UnsupportedOperationException when getDisplay from context
+        SystemProperty("robolectric.createActivityContexts", "true").use {
+            val lockPatternUtils =
+                mock<LockPatternUtils> { on { isSecure(anyInt()) } doReturn true }
+            FakeFeatureFactory.setupForTest().securityFeatureProvider.stub {
+                on { getLockPatternUtils(any()) } doReturn lockPatternUtils
+            }
+
+            super.migration()
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
index 63395d177f3..e2542b0d55b 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
@@ -33,6 +33,8 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 import android.os.UserHandle;
 import android.provider.Settings;
 
@@ -56,6 +58,8 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowSensorPrivacyManager.class, ShadowSystemSettings.class})
 public class SmartAutoRotateControllerTest {
@@ -67,21 +71,30 @@ public class SmartAutoRotateControllerTest {
     private PackageManager mPackageManager;
     @Mock
     private Preference mPreference;
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
     private ContentResolver mContentResolver;
-    private final DeviceStateRotationLockSettingsManager mDeviceStateAutoRotateSettingsManager =
-            DeviceStateRotationLockSettingsManager.getInstance(RuntimeEnvironment.application);
+    private DeviceStateRotationLockSettingsManager mDeviceStateAutoRotateSettingsManager;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = Mockito.spy(RuntimeEnvironment.application);
         mContentResolver = RuntimeEnvironment.application.getContentResolver();
+
         when(context.getPackageManager()).thenReturn(mPackageManager);
         when(context.getContentResolver()).thenReturn(mContentResolver);
         doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName();
         doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(
                 Manifest.permission.CAMERA, PACKAGE_NAME);
+        // Necessary for the DeviceStateRotationLockSettingsManager setup
+        doReturn(context).when(context).getApplicationContext();
+        doReturn(mDeviceStateManager).when(context).getSystemService(DeviceStateManager.class);
+        doReturn(getDeviceStateList()).when(mDeviceStateManager).getSupportedDeviceStates();
+        mDeviceStateAutoRotateSettingsManager = DeviceStateRotationLockSettingsManager.getInstance(
+                context);
         mController = Mockito.spy(new SmartAutoRotateController(context, "test_key"));
+
         when(mController.isCameraLocked()).thenReturn(false);
         when(mController.isPowerSaveMode()).thenReturn(false);
         doReturn(mController.getPreferenceKey()).when(mPreference).getKey();
@@ -183,4 +196,13 @@ public class SmartAutoRotateControllerTest {
                 Shadow.extract(mDeviceStateAutoRotateSettingsManager);
         shadowManager.setRotationLockedForAllStates(false);
     }
+
+    /**
+     * Returns a list that includes a singular default {@link DeviceState}. To be returned when
+     * {@link DeviceStateManager#getSupportedDeviceStates()} is called.
+     */
+    private List<DeviceState> getDeviceStateList() {
+        return List.of(new DeviceState(
+                new DeviceState.Configuration.Builder(0 /* identifier */, "DEFAULT").build()));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
index 3fa4582b7d6..16155384cf8 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
@@ -16,6 +16,13 @@
 
 package com.android.settings.display;
 
+import static android.hardware.devicestate.DeviceState.PROPERTY_EMULATED_ONLY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FEATURE_REAR_DISPLAY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN;
 import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED;
 
 import static com.android.settings.display.SmartAutoRotatePreferenceFragment.AUTO_ROTATE_MAIN_SWITCH_PREFERENCE_KEY;
@@ -39,6 +46,8 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 import android.view.View;
 
 import androidx.preference.Preference;
@@ -61,6 +70,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
+import java.util.Set;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
@@ -70,10 +80,35 @@ import java.util.List;
 })
 public class SmartAutoRotatePreferenceFragmentTest {
 
-    private static final int STATE_FOLDED = 0;
-    private static final int STATE_HALF_FOLDED = 1;
-    private static final int STATE_UNFOLDED = 2;
-    private static final int STATE_REAR_DISPLAY = 3;
+    private static final DeviceState DEVICE_STATE_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 0, "FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
+    private static final DeviceState DEVICE_STATE_HALF_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "HALF_FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_UNFOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 2, "UNFOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_REAR_DISPLAY = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 3, "REAR_DISPLAY")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY,
+                            PROPERTY_FEATURE_REAR_DISPLAY, PROPERTY_EMULATED_ONLY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
 
     private static final String PACKAGE_NAME = "package_name";
 
@@ -96,6 +131,9 @@ public class SmartAutoRotatePreferenceFragmentTest {
     @Mock
     private Preference mRotateMainSwitchPreference;
 
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -105,6 +143,7 @@ public class SmartAutoRotatePreferenceFragmentTest {
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getContentResolver()).thenReturn(mContentResolver);
         when(mContext.getApplicationContext()).thenReturn(mContext);
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
         doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName();
         doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(
                 Manifest.permission.CAMERA, PACKAGE_NAME);
@@ -130,14 +169,7 @@ public class SmartAutoRotatePreferenceFragmentTest {
         when(mFragment.findPreference(AUTO_ROTATE_MAIN_SWITCH_PREFERENCE_KEY))
                 .thenReturn(mRotateMainSwitchPreference);
 
-        when(mResources.getIntArray(com.android.internal.R.array.config_foldedDeviceStates))
-                .thenReturn(new int[] {STATE_FOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_halfFoldedDeviceStates))
-                .thenReturn(new int[] {STATE_HALF_FOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_openDeviceStates))
-                .thenReturn(new int[] {STATE_UNFOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_rearDisplayDeviceStates))
-                .thenReturn(new int[] {STATE_REAR_DISPLAY});
+        setUpPostureMappings();
     }
 
     @Test
@@ -195,8 +227,8 @@ public class SmartAutoRotatePreferenceFragmentTest {
     public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
         enableDeviceStateSettableRotationStates(
                 new String[] {
-                    STATE_FOLDED + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
-                    STATE_UNFOLDED + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED
+                    DEVICE_STATE_FOLDED.getIdentifier() + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
+                    DEVICE_STATE_UNFOLDED.getIdentifier() + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED
                 },
                 new String[] {"Folded", "Unfolded"});
 
@@ -236,4 +268,23 @@ public class SmartAutoRotatePreferenceFragmentTest {
         DeviceStateRotationLockSettingsManager.getInstance(mContext)
                 .resetStateForTesting(mResources);
     }
+
+    // Sets up posture mappings for PosturesHelper
+    private void setUpPostureMappings() {
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_FOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_halfFoldedDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_HALF_FOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_openDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_UNFOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_rearDisplayDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_REAR_DISPLAY.getIdentifier()});
+        when(mDeviceStateManager.getSupportedDeviceStates()).thenReturn(
+                List.of(DEVICE_STATE_FOLDED, DEVICE_STATE_HALF_FOLDED, DEVICE_STATE_UNFOLDED,
+                        DEVICE_STATE_REAR_DISPLAY));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
index 75bd672b955..4b7abec906a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
@@ -16,38 +16,72 @@
 
 package com.android.settings.enterprise;
 
-import static org.junit.Assert.assertEquals;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.security.advancedprotection.AdvancedProtectionManager.ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG;
+import static android.security.advancedprotection.AdvancedProtectionManager.ADVANCED_PROTECTION_SYSTEM_ENTITY;
+import static android.security.advancedprotection.AdvancedProtectionManager.EXTRA_SUPPORT_DIALOG_FEATURE;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+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.app.admin.Authority;
 import android.app.admin.DevicePolicyManager;
+import android.app.admin.EnforcingAdmin;
+import android.app.admin.UnknownAuthority;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.UserHandle;
+import android.os.UserManager;
+import android.platform.test.annotations.RequiresFlagsEnabled;
+import android.platform.test.flag.junit.CheckFlagsRule;
+import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.security.advancedprotection.AdvancedProtectionManager;
 
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 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 org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class ActionDisabledByAdminDialogTest {
+    @Rule
+    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
+    private AdvancedProtectionManager mAdvancedProtectionManager;
 
     private ActionDisabledByAdminDialog mDialog;
+    private final ComponentName mAdminComponent = new ComponentName("admin", "adminclass");
 
     @Before
     public void setUp() {
-        mDialog = new ActionDisabledByAdminDialog();
+        MockitoAnnotations.initMocks(this);
+        mDialog = spy(new ActionDisabledByAdminDialog());
+        doReturn(mDevicePolicyManager).when(mDialog).getSystemService(DevicePolicyManager.class);
+        doReturn(mAdvancedProtectionManager).when(mDialog).getSystemService(
+                AdvancedProtectionManager.class);
     }
 
     @Test
     public void testGetAdminDetailsFromIntent() {
         final int userId = 123;
-        final ComponentName component = new ComponentName("com.some.package", ".SomeClass");
-        final EnforcedAdmin expectedAdmin = new EnforcedAdmin(component, UserHandle.of(userId));
+        final EnforcedAdmin expectedAdmin = new EnforcedAdmin(mAdminComponent, UserHandle.of(
+                userId));
 
         final Intent intent = new Intent();
-        intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, component);
+        intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, mAdminComponent);
         intent.putExtra(Intent.EXTRA_USER_ID, userId);
         assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent));
     }
@@ -73,4 +107,53 @@ public class ActionDisabledByAdminDialogTest {
     public void testGetRestrictionFromNullIntent() {
         assertEquals(null, mDialog.getRestrictionFromIntent(null));
     }
+
+    @RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_API)
+    @Test
+    public void testGetAdminDetailsFromIntent_nullComponent_advancedProtection_launchesNewDialog() {
+        final int userId = UserHandle.myUserId();
+        final Authority advancedProtectionAuthority = new UnknownAuthority(
+                ADVANCED_PROTECTION_SYSTEM_ENTITY);
+        final EnforcingAdmin advancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
+                advancedProtectionAuthority, UserHandle.of(userId), mAdminComponent);
+        final String userRestriction = UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
+
+        final Intent apmIntent = new Intent(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG);
+        apmIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
+        apmIntent.putExtra(EXTRA_SUPPORT_DIALOG_FEATURE, "featureId");
+
+        final Intent dialogIntent = new Intent();
+        dialogIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+        dialogIntent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, userRestriction);
+
+        when(mDevicePolicyManager.getEnforcingAdmin(userId, userRestriction))
+                .thenReturn(advancedProtectionEnforcingAdmin);
+        when(mAdvancedProtectionManager.createSupportIntentForPolicyIdentifierOrRestriction(
+                userRestriction, /* type */ null)).thenReturn(apmIntent);
+        doNothing().when(mDialog).startActivityAsUser(apmIntent, UserHandle.of(userId));
+
+        mDialog.getAdminDetailsFromIntent(dialogIntent);
+
+        verify(mDialog).startActivityAsUser(apmIntent, UserHandle.of(userId));
+        assertTrue(mDialog.isFinishing());
+    }
+
+    @RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_API)
+    @Test
+    public void testGetAdminDetailsFromIntent_nullComponent_notAdvancedProtection_retrievesAdmin() {
+        final int userId = UserHandle.myUserId();
+        final EnforcingAdmin nonAdvancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
+                UnknownAuthority.UNKNOWN_AUTHORITY, UserHandle.of(userId), mAdminComponent);
+        final String userRestriction = UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
+
+        final Intent dialogIntent = new Intent();
+        dialogIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+        dialogIntent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, userRestriction);
+
+        when(mDevicePolicyManager.getEnforcingAdmin(userId, userRestriction))
+                .thenReturn(nonAdvancedProtectionEnforcingAdmin);
+
+        EnforcedAdmin admin = mDialog.getAdminDetailsFromIntent(dialogIntent);
+        assertEquals(mAdminComponent, admin.component);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 1bc00a1fdff..139a15f9716 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -17,14 +17,15 @@
 package com.android.settings.fuelgauge;
 
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
-import static com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 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.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -39,6 +40,7 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.InstallSourceInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -49,18 +51,18 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.Utils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -75,6 +77,8 @@ import org.mockito.junit.MockitoRule;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.concurrent.TimeUnit;
@@ -82,17 +86,17 @@ import java.util.concurrent.TimeUnit;
 @RunWith(RobolectricTestRunner.class)
 @Config(
         shadows = {
-            ShadowEntityHeaderController.class,
             com.android.settings.testutils.shadow.ShadowFragment.class,
         })
 public class AdvancedPowerUsageDetailTest {
 
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     private static final String APP_LABEL = "app label";
+    private static final String APP_ENTRY_LABEL = "app entry label";
     private static final String SUMMARY = "summary";
-    private static final String[] PACKAGE_NAME = {"com.android.app"};
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
     private static final String USAGE_PERCENT = "16%";
     private static final int ICON_ID = 123;
     private static final int UID = 1;
@@ -100,13 +104,11 @@ public class AdvancedPowerUsageDetailTest {
     private static final long FOREGROUND_SERVICE_TIME_MS = 123;
     private static final long BACKGROUND_TIME_MS = 100;
     private static final long SCREEN_ON_TIME_MS = 321;
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
+    private static final Drawable TEST_DRAWABLE = new ColorDrawable(0);
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private FragmentActivity mActivity;
 
-    @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private LayoutPreference mHeaderPreference;
     @Mock private ApplicationsState mState;
     @Mock private ApplicationsState.AppEntry mAppEntry;
     @Mock private BatteryEntry mBatteryEntry;
@@ -114,25 +116,40 @@ public class AdvancedPowerUsageDetailTest {
     @Mock private InstallSourceInfo mInstallSourceInfo;
     @Mock private AppOpsManager mAppOpsManager;
     @Mock private LoaderManager mLoaderManager;
-    @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
 
+    private int mTestMode;
     private Context mContext;
-    private PrimarySwitchPreference mAllowBackgroundUsagePreference;
     private AdvancedPowerUsageDetail mFragment;
     private SettingsActivity mTestActivity;
     private FakeFeatureFactory mFeatureFactory;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private BatteryDiffEntry mBatteryDiffEntry;
     private Bundle mBundle;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+    private IntroPreference mIntroPreference;
+
+    @Implements(Utils.class)
+    private static class ShadowUtils {
+        @Implementation
+        public static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {
+            return AdvancedPowerUsageDetailTest.TEST_DRAWABLE;
+        }
+    }
 
     @Before
-    public void setUp() {
+    public void setUp() throws Exception {
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getPackageName()).thenReturn("foo");
+        when(mContext.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
 
+        prepareTestBatteryOptimizationUtils();
         mFragment = spy(new AdvancedPowerUsageDetail());
+        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
+        mIntroPreference = new IntroPreference(mContext);
+        doReturn(mIntroPreference).when(mFragment).findPreference(any());
         mBundle = spy(new Bundle());
         doReturn(mContext).when(mFragment).getContext();
         doReturn(mActivity).when(mFragment).getActivity();
@@ -141,29 +158,6 @@ public class AdvancedPowerUsageDetailTest {
         when(mFragment.getArguments()).thenReturn(mBundle);
         doReturn(mLoaderManager).when(mFragment).getLoaderManager();
 
-        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setButtonActions(anyInt(), anyInt());
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setIcon(nullable(Drawable.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setIcon(nullable(ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setSummary(nullable(String.class));
-
         when(mBatteryEntry.getUid()).thenReturn(UID);
         when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
         when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(FOREGROUND_TIME_MS);
@@ -195,11 +189,12 @@ public class AdvancedPowerUsageDetailTest {
         when(mBatteryDiffEntry.getAppLabel()).thenReturn(APP_LABEL);
         when(mBatteryDiffEntry.getAppIconId()).thenReturn(ICON_ID);
 
-        mFragment.mHeaderPreference = mHeaderPreference;
         mFragment.mState = mState;
         mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
         mFragment.mLogStringBuilder = new StringBuilder();
+        doNothing().when(mState).ensureIcon(mAppEntry);
         mAppEntry.info = mock(ApplicationInfo.class);
+        mAppEntry.label = APP_ENTRY_LABEL;
 
         mTestActivity = spy(new SettingsActivity());
         doReturn(mPackageManager).when(mTestActivity).getPackageManager();
@@ -219,10 +214,6 @@ public class AdvancedPowerUsageDetailTest {
                 .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
         doAnswer(callable).when(mActivity).startActivity(captor.capture());
         doAnswer(callable).when(mContext).startActivity(captor.capture());
-
-        mAllowBackgroundUsagePreference = new PrimarySwitchPreference(mContext);
-        mAllowBackgroundUsagePreference.setKey(KEY_ALLOW_BACKGROUND_USAGE);
-        mFragment.mAllowBackgroundUsagePreference = mAllowBackgroundUsagePreference;
     }
 
     @After
@@ -236,34 +227,27 @@ public class AdvancedPowerUsageDetailTest {
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_NoAppEntry_BuildByBundle() {
         mFragment.mAppEntry = null;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
-        verify(mEntityHeaderController).setLabel(APP_LABEL);
+        assertThat(mIntroPreference.getIcon()).isNotEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(APP_LABEL);
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_HasAppEntry_BuildByAppEntry() {
-        ReflectionHelpers.setStaticField(
-                AppUtils.class,
-                "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return false;
-                    }
-                });
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(false);
+        assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_HasAppEntry_InstantApp() {
         ReflectionHelpers.setStaticField(
                 AppUtils.class,
@@ -277,9 +261,8 @@ public class AdvancedPowerUsageDetailTest {
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(true);
+        assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
     }
 
     @Test
@@ -320,17 +303,15 @@ public class AdvancedPowerUsageDetailTest {
                 .isEqualTo(SCREEN_ON_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
                 .isEqualTo(USAGE_PERCENT);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_SLOT_TIME))
-                .isEqualTo(null);
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_SLOT_TIME)).isNull();
     }
 
-
     @Test
     public void startBatteryDetailPage_noBatteryUsage_hasBasicData() {
         final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(
-                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);
+                mActivity, mFragment, PACKAGE_NAME, UserHandle.OWNER);
 
         verify(mActivity).startActivity(captor.capture());
 
@@ -338,7 +319,7 @@ public class AdvancedPowerUsageDetailTest {
                         captor.getValue()
                                 .getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
                                 .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
-                .isEqualTo(PACKAGE_NAME[0]);
+                .isEqualTo(PACKAGE_NAME);
 
         assertThat(
                         captor.getValue()
@@ -351,62 +332,21 @@ public class AdvancedPowerUsageDetailTest {
     public void startBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName()
             throws PackageManager.NameNotFoundException {
         mBundle.clear();
-        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
+        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME, 0 /* no flag */);
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(
-                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);
+                mActivity, mFragment, PACKAGE_NAME, UserHandle.OWNER);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
     }
 
     @Test
-    public void initFooter_isValidPackageName_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
+    public void onPause_optimizationModeIsChanged_logPreference() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("This app requires optimized battery usage.");
-    }
-
-    @Test
-    public void initFooter_isSystemOrDefaultApp_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("This app requires unrestricted battery usage.");
-    }
-
-    @Test
-    public void initFooter_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("Enable for real-time updates, disable to save battery");
-    }
-
-    @Test
-    public void onPause_optimizationModeChanged_logPreference()
-            throws PackageManager.NameNotFoundException, InterruptedException {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
-
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
@@ -415,27 +355,18 @@ public class AdvancedPowerUsageDetailTest {
                         SettingsEnums.LEAVE_APP_BATTERY_USAGE,
                         SettingsEnums.ACTION_APP_BATTERY_USAGE_ALLOW_BACKGROUND,
                         SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL,
-                        packageName,
+                        PACKAGE_NAME,
                         /* consumed battery */ 0);
     }
 
     @Test
-    public void onPause_optimizationModeIsNotChanged_notInvokeLogging()
-            throws PackageManager.NameNotFoundException, InterruptedException {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
+    public void onPause_optimizationModeIsNotChanged_notInvokeLogging() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, false);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_RESTRICTED, Action.APPLY);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
@@ -446,4 +377,16 @@ public class AdvancedPowerUsageDetailTest {
     public void shouldSkipForInitialSUW_returnTrue() {
         assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();
     }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
deleted file mode 100644
index 261a3151531..00000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.MainSwitchPreference;
-
-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 AllowBackgroundPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private AllowBackgroundPreferenceController mController;
-    private MainSwitchPreference mMainSwitchPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock private PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new AllowBackgroundPreferenceController(context, UID, PACKAGE_NAME);
-        mMainSwitchPreference = new MainSwitchPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_isValidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isTrue();
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefDisabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isFalse();
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndRestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-        assertThat(mMainSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-        assertThat(mMainSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isRestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-        assertThat(mMainSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-        assertThat(mMainSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mMainSwitchPreference.setKey(
-                AllowBackgroundPreferenceController.KEY_ALLOW_BACKGROUND_USAGE);
-        mController.handlePreferenceTreeClick(mMainSwitchPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mMainSwitchPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mMainSwitchPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java
new file mode 100644
index 00000000000..190446ed116
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+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 androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
+import com.android.settingslib.PrimarySwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BackgroundUsageAllowabilityPreferenceControllerTest {
+    private static final int UID = 12345;
+    private static final String PACKAGE_NAME = "com.android.app";
+
+    private int mTestMode;
+    private Context mContext;
+    private BackgroundUsageAllowabilityPreferenceController mBackgroundUsageController;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+
+    @Mock DashboardFragment mDashboardFragment;
+    @Mock PrimarySwitchPreference mBackgroundUsageAllowabilityPreference;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        prepareTestBatteryOptimizationUtils();
+        mBackgroundUsageController =
+                spy(
+                        new BackgroundUsageAllowabilityPreferenceController(
+                                mContext,
+                                mDashboardFragment,
+                                /* preferenceKey= */ "test",
+                                mBatteryOptimizeUtils));
+        mBackgroundUsageController.mBackgroundUsageAllowabilityPreference =
+                mBackgroundUsageAllowabilityPreference;
+    }
+
+    @Test
+    public void initPreferences_immutableOptimized_setExpectedContent() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(true).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_footer_limited,
+                                mContext.getString(R.string.manager_battery_usage_optimized_only)));
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_immutableUnrestricted_setExpectedContent() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(false).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+        doReturn(true).when(mBatteryOptimizeUtils).isSystemOrDefaultApp();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_footer_limited,
+                                mContext.getString(
+                                        R.string.manager_battery_usage_unrestricted_only)));
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_mutableMode_setExpectedContent() {
+        doReturn(true).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(false).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+        doReturn(false).when(mBatteryOptimizeUtils).isSystemOrDefaultApp();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_allow_background_usage_summary));
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void updatePreferences_setIntoUnrestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoOptimizedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoRestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_OPTIMIZED);
+
+        verify(mBatteryOptimizeUtils)
+                .setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeNotChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_RESTRICTED);
+
+        verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any());
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_RESTRICTED);
+        verify(mBackgroundUsageController, never()).updatePreferences(mTestMode);
+    }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
+
+    private void verifyPreferences(int mode) {
+        boolean isAllowBackground = mode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        verify(mBackgroundUsageAllowabilityPreference).setChecked(isAllowBackground);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index fdb075d2e03..44d386f6b5e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,31 +17,21 @@ package com.android.settings.fuelgauge;
 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.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.usb.UsbManager;
-import android.hardware.usb.UsbPort;
-import android.hardware.usb.UsbPortStatus;
 import android.os.BatteryManager;
-import android.os.PowerManager;
-import android.os.SystemProperties;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
-import com.android.settings.fuelgauge.batterytip.tips.SmartBatteryTip;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
@@ -56,10 +46,9 @@ 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.ShadowPowerManager;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
 public class BatteryHeaderPreferenceControllerTest {
@@ -67,23 +56,17 @@ public class BatteryHeaderPreferenceControllerTest {
     private static final String PREF_KEY = "battery_header";
     private static final int BATTERY_LEVEL = 60;
     private static final int BATTERY_MAX_LEVEL = 100;
-    private static final String TIME_LEFT = "2h30min";
-    private static final String BATTERY_STATUS = "Charging";
 
     @Mock private PreferenceScreen mPreferenceScreen;
-    @Mock private BatteryInfo mBatteryInfo;
+    @Mock private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
     @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPref;
-    @Mock private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
-    @Mock private UsbPort mUsbPort;
+    @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPreference;
     @Mock private UsbManager mUsbManager;
-    @Mock private UsbPortStatus mUsbPortStatus;
+    @Mock private LifecycleOwner mLifecycleOwner;
 
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
-    private ShadowPowerManager mShadowPowerManager;
     private Intent mBatteryIntent;
-    private FakeFeatureFactory mFactory;
 
     @Before
     public void setUp() {
@@ -99,18 +82,12 @@ public class BatteryHeaderPreferenceControllerTest {
         mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
         doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
 
-        doReturn(mBatteryUsageProgressBarPref)
+        doReturn(mBatteryUsageProgressBarPreference)
                 .when(mPreferenceScreen)
-                .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
-
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-
-        mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
-        mFactory = FakeFeatureFactory.setupForTest();
+                .findPreference(PREF_KEY);
 
         mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
-        mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
-        mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
+        mController.mBatteryUsageProgressBarPreference = mBatteryUsageProgressBarPreference;
 
         BatteryUtils.setChargingStringV2Enabled(null);
     }
@@ -121,383 +98,45 @@ public class BatteryHeaderPreferenceControllerTest {
         ShadowUtils.reset();
     }
 
+    @Test
+    public void onStateChanged_onCreate_receiverCreated() {
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_CREATE);
+
+        assertThat(mController.mBatteryBroadcastReceiver).isNotNull();
+    }
+
+    @Test
+    public void onStateChanged_onStart_receiverRegistered() {
+        mController.mBatteryBroadcastReceiver = mBatteryBroadcastReceiver;
+
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_START);
+
+        verify(mBatteryBroadcastReceiver).register();
+    }
+
+    @Test
+    public void onStateChanged_onStop_receiverUnregistered() {
+        mController.mBatteryBroadcastReceiver = mBatteryBroadcastReceiver;
+
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_STOP);
+
+        verify(mBatteryBroadcastReceiver).unRegister();
+    }
+
     @Test
     public void displayPreference_displayBatteryLevel() {
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_hasRemainingTime_showRemainingLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updatePreference_updateBatteryInfo() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_noRemainingTime_showStatusLabel() {
-        mBatteryInfo.remainingLabel = null;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
-    }
-
-    @Test
-    public void updatePreference_statusAnomalous_showStatusLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-        mBatteryInfo.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
-    }
-
-    @Test
-    public void updatePreference_charging_showFullText() {
-        setChargingState(/* isDischarging */ false, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        final String expectedResult = BATTERY_STATUS + " • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updatePreference_powerSaverOn_showPowerSaverOn() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        mShadowPowerManager.setIsPowerSaveMode(true);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        final String expectedResult = "Battery Saver on • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updatePreference_triggerBatteryStatusUpdateTrue_updatePercentageAndUsageOnly() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ true);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_triggerBatteryStatusUpdateFalse_updateBatteryInfo() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updateBatteryStatus_nullLabel_updateSummaryOnly() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateBatteryStatus(null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updateBatteryStatus_withLabel_showLabelText() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        final String label = "Update by battery status • " + TIME_LEFT;
-        mController.updateBatteryStatus(label, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingString_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "1 hr, 40 min left until full",
-                        /* statusLabel= */ "Charging rapidly",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ false);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingStringV2FastCharging_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingStringV2NonFastCharging_remainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Fully charged by 11:10 PM",
-                        /* statusLabel= */ "Charging",
-                        /* isFastCharging= */ false,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_customizedWirelessChargingLabel_customizedLabel() {
-        var label = "Customized Wireless Charging Label";
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingLabel(
-                        eq(mContext), any(BatteryInfo.class)))
-                .thenReturn(label);
-        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingContentDescription(
-                        eq(mContext), any(BatteryInfo.class)))
-                .thenReturn(contentDescription);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
-        verify(mBatteryUsageProgressBarPref).setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_statusWithRemainingLabel() {
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_v1StatusWithRemainingLabel() {
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "1 hr, 40 min left until full",
-                        /* statusLabel= */ "Charging wirelessly",
-                        /* isFastCharging= */ false,
-                        /* isChargingStringV2= */ false);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingOptimizationMode_remainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Expected remaining label",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.remainingLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingOptimizationModeNoRemainingLabel_statusLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ null,
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_notChargingOptimizationMode_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(false);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_dockDefend_chargingOnHold() {
-        var expected = "Charging on hold";
-        mBatteryInfo.isBatteryDefender = false;
-        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
-    }
-
-    @Test
-    public void updateBatteryStatus_batteryDefender_chargingOnHold() {
-        var expected = "Charging on hold";
-        mBatteryInfo.isBatteryDefender = true;
-        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false);
-
-        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
-    }
-
-    private BatteryInfo arrangeUpdateBatteryStatusTestWithRemainingLabel(
-            String remainingLabel,
-            String statusLabel,
-            boolean isFastCharging,
-            boolean isChargingStringV2) {
-        SystemProperties.set(
-                BatteryUtils.PROPERTY_CHARGING_STRING_V2_KEY, String.valueOf(isChargingStringV2));
-        mBatteryInfo.isBatteryDefender = false;
-        mBatteryInfo.remainingLabel = remainingLabel;
-        mBatteryInfo.statusLabel = statusLabel;
-        mBatteryInfo.discharging = false;
-        mBatteryInfo.isFastCharging = isFastCharging;
-        return mBatteryInfo;
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        BatteryTip lowBatteryTip =
-                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
-
-        final String expectedResult = "Low battery • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_notLowBatteryTip_showRemainingLabel() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        BatteryTip lowBatteryTip = new SmartBatteryTip(BatteryTip.StateType.NEW);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_noTip_noAction() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderByBatteryTips(null, mBatteryInfo);
-
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_noBatteryInfo_noAction() {
-        BatteryTip lowBatteryTip =
-                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, null);
-
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
-    }
-
-    @Test
-    public void updatePreference_isBatteryDefender_showEmptyText() {
-        mBatteryInfo.isBatteryDefender = true;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
-                        mContext.getString(
-                                com.android.settingslib.R.string
-                                        .battery_info_status_charging_on_hold));
-    }
-
-    @Test
-    public void updatePreference_incompatibleCharger_showNotChargingState() {
-        BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
-                        mContext.getString(
-                                com.android.settingslib.R.string.battery_info_status_not_charging));
+        verify(mBatteryUsageProgressBarPreference).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPreference).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
     public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
         mController.quickUpdateHeaderPreference();
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+        verify(mBatteryUsageProgressBarPreference).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPreference).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
@@ -512,26 +151,18 @@ public class BatteryHeaderPreferenceControllerTest {
 
         mController.displayPreference(mPreferenceScreen);
 
-        assertThat(mBatteryUsageProgressBarPref.isVisible()).isFalse();
+        assertThat(mBatteryUsageProgressBarPreference.isVisible()).isFalse();
     }
 
     @Test
-    public void displayPreference_init_showEmptySpace() {
+    public void displayPreference_init_setEmptyBottomSummary() {
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(" ");
+        verify(mBatteryUsageProgressBarPreference).setBottomSummary("");
     }
 
     private CharSequence formatBatteryPercentageText() {
         return com.android.settings.Utils.formatPercentage(BATTERY_LEVEL);
     }
-
-    private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-        mBatteryInfo.discharging = isDischarging;
-
-        when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(mController, mBatteryInfo))
-                .thenReturn(updatedByStatusFeature);
-    }
 }
+// LINT.ThenChange(BatteryHeaderPreferenceTest.java)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt
new file mode 100644
index 00000000000..27e14c85632
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager.EXTRA_LEVEL
+import android.os.BatteryManager.EXTRA_SCALE
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.UsageProgressBarPreference
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class BatteryHeaderPreferenceTest {
+    private val mockLifecycleContext = mock<PreferenceLifecycleContext>()
+    private val mockBatteryBroadcastReceiver = mock<BatteryBroadcastReceiver>()
+    private val batteryHeaderPreference = BatteryHeaderPreference()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun registerReceiver(receiver: BroadcastReceiver?, filter: IntentFilter?) =
+                Intent(Intent.ACTION_BATTERY_CHANGED)
+                    .putExtra(EXTRA_LEVEL, 60)
+                    .putExtra(EXTRA_SCALE, 100)
+        }
+
+    @Test
+    fun createAndBindWidget_selectableIsFalse() {
+        val usageProgressBarPreference =
+            batteryHeaderPreference.createAndBindWidget<UsageProgressBarPreference>(context)
+
+        assertThat(usageProgressBarPreference.isSelectable).isFalse()
+    }
+
+    @Test
+    fun onCreate_createBatteryBroadcastReceiver() {
+        batteryHeaderPreference.onCreate(mockLifecycleContext)
+
+        assertThat(batteryHeaderPreference.batteryBroadcastReceiver).isNotNull()
+    }
+
+    @Test
+    fun onStart_invokeRegisterMethod() {
+        batteryHeaderPreference.batteryBroadcastReceiver = mockBatteryBroadcastReceiver
+
+        batteryHeaderPreference.onStart(mockLifecycleContext)
+
+        verify(mockBatteryBroadcastReceiver).register()
+    }
+
+    @Test
+    fun onStop_invokeUnRegisterMethod() {
+        batteryHeaderPreference.batteryBroadcastReceiver = mockBatteryBroadcastReceiver
+
+        batteryHeaderPreference.onStop(mockLifecycleContext)
+
+        verify(mockBatteryBroadcastReceiver).unRegister()
+    }
+}
+// LINT.ThenChange(BatteryHeaderPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java
new file mode 100644
index 00000000000..18fb90d758b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.usb.UsbManager;
+import android.hardware.usb.UsbPort;
+import android.hardware.usb.UsbPortStatus;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+import android.os.SystemProperties;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.SmartBatteryTip;
+import com.android.settings.testutils.BatteryTestUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.fuelgauge.BatteryUtils;
+
+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.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPowerManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
+public class BatteryHeaderTextPreferenceControllerTest {
+
+    private static final String PREF_KEY = "battery_header_text";
+    private static final int BATTERY_LEVEL = 60;
+    private static final String TIME_LEFT = "2h30min";
+    private static final String BATTERY_STATUS = "Charging";
+
+    @Mock private PreferenceScreen mPreferenceScreen;
+    @Mock private BatteryInfo mBatteryInfo;
+    @Mock private EntityHeaderController mEntityHeaderController;
+    @Mock private BatteryHeaderTextPreference mBatteryHeaderTextPreference;
+    @Mock private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+    @Mock private UsbPort mUsbPort;
+    @Mock private UsbManager mUsbManager;
+    @Mock private UsbPortStatus mUsbPortStatus;
+
+    private BatteryHeaderTextPreferenceController mController;
+    private Context mContext;
+    private ShadowPowerManager mShadowPowerManager;
+    private Intent mBatteryIntent;
+    private FakeFeatureFactory mFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
+        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
+
+        mBatteryIntent = new Intent();
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
+        doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
+
+        doReturn(mBatteryHeaderTextPreference)
+                .when(mPreferenceScreen)
+                .findPreference(PREF_KEY);
+
+        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
+
+        mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
+        mFactory = FakeFeatureFactory.setupForTest();
+
+        mController = spy(new BatteryHeaderTextPreferenceController(mContext, PREF_KEY));
+        mController.mBatteryHeaderTextPreference = mBatteryHeaderTextPreference;
+        mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
+
+        BatteryUtils.setChargingStringV2Enabled(null);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void updatePreference_hasRemainingTime_showRemainingLabel() {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updatePreference_updateBatteryInfo() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updatePreference_noRemainingTime_showStatusLabel() {
+        mBatteryInfo.remainingLabel = null;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(BATTERY_STATUS);
+    }
+
+    @Test
+    public void updatePreference_statusAnomalous_showStatusLabel() {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+        mBatteryInfo.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(BATTERY_STATUS);
+    }
+
+    @Test
+    public void updatePreference_charging_showFullText() {
+        setChargingState(/* isDischarging */ false, /* updatedByStatusFeature */ false);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        final String expectedResult = BATTERY_STATUS + " • " + TIME_LEFT;
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
+    }
+
+    @Test
+    public void updatePreference_powerSaverOn_showPowerSaverOn() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+        mShadowPowerManager.setIsPowerSaveMode(true);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        final String expectedResult = "Battery Saver on • " + TIME_LEFT;
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
+    }
+
+    @Test
+    public void updatePreference_triggerBatteryStatusUpdateFalse_updateBatteryInfo() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updateBatteryStatus_nullLabel_updateSummaryOnly() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateBatteryStatus(null, mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updateBatteryStatus_withLabel_showLabelText() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        final String label = "Update by battery status • " + TIME_LEFT;
+        mController.updateBatteryStatus(label, mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(label);
+    }
+
+    @Test
+    public void updateBatteryStatus_chargingString_statusWithRemainingLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "1 hr, 40 min left until full",
+                        /* statusLabel= */ "Charging rapidly",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ false);
+        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_chargingStringV2FastCharging_statusWithRemainingLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Full by 1:30 PM",
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_chargingStringV2NonFastCharging_remainingLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Fully charged by 11:10 PM",
+                        /* statusLabel= */ "Charging",
+                        /* isFastCharging= */ false,
+                        /* isChargingStringV2= */ true);
+        var expectedChargingString = batteryInfo.remainingLabel;
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_customizedWirelessChargingLabel_customizedLabel() {
+        var label = "Customized Wireless Charging Label";
+        var contentDescription = "Customized Wireless Charging description";
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Full by 1:30 PM",
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
+        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingLabel(
+                        eq(mContext), any(BatteryInfo.class)))
+                .thenReturn(label);
+        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingContentDescription(
+                        eq(mContext), any(BatteryInfo.class)))
+                .thenReturn(contentDescription);
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(label);
+        verify(mBatteryHeaderTextPreference).setContentDescription(contentDescription);
+    }
+
+    @Test
+    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_statusWithRemainingLabel() {
+        var contentDescription = "Customized Wireless Charging description";
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Full by 1:30 PM",
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
+        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+        verify(mBatteryHeaderTextPreference, never()).setContentDescription(contentDescription);
+    }
+
+    @Test
+    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_v1StatusWithRemainingLabel() {
+        var contentDescription = "Customized Wireless Charging description";
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "1 hr, 40 min left until full",
+                        /* statusLabel= */ "Charging wirelessly",
+                        /* isFastCharging= */ false,
+                        /* isChargingStringV2= */ false);
+        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
+        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+        verify(mBatteryHeaderTextPreference, never()).setContentDescription(contentDescription);
+    }
+
+    @Test
+    public void updateBatteryStatus_chargingOptimizationMode_remainingLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Expected remaining label",
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        var expectedChargingString = batteryInfo.remainingLabel;
+        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(true);
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_chargingOptimizationModeNoRemainingLabel_statusLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ null,
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        var expectedChargingString = batteryInfo.statusLabel;
+        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(true);
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_notChargingOptimizationMode_statusWithRemainingLabel() {
+        var batteryInfo =
+                arrangeUpdateBatteryStatusTestWithRemainingLabel(
+                        /* remainingLabel= */ "Full by 1:30 PM",
+                        /* statusLabel= */ "Fast Charging",
+                        /* isFastCharging= */ true,
+                        /* isChargingStringV2= */ true);
+        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
+        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(false);
+
+        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+    }
+
+    @Test
+    public void updateBatteryStatus_dockDefend_chargingOnHold() {
+        var expected = "Charging on hold";
+        mBatteryInfo.isBatteryDefender = false;
+        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true);
+
+        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expected);
+    }
+
+    @Test
+    public void updateBatteryStatus_batteryDefender_chargingOnHold() {
+        var expected = "Charging on hold";
+        mBatteryInfo.isBatteryDefender = true;
+        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false);
+
+        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(expected);
+    }
+
+    private BatteryInfo arrangeUpdateBatteryStatusTestWithRemainingLabel(
+            String remainingLabel,
+            String statusLabel,
+            boolean isFastCharging,
+            boolean isChargingStringV2) {
+        SystemProperties.set(
+                BatteryUtils.PROPERTY_CHARGING_STRING_V2_KEY, String.valueOf(isChargingStringV2));
+        mBatteryInfo.isBatteryDefender = false;
+        mBatteryInfo.remainingLabel = remainingLabel;
+        mBatteryInfo.statusLabel = statusLabel;
+        mBatteryInfo.discharging = false;
+        mBatteryInfo.isFastCharging = isFastCharging;
+        return mBatteryInfo;
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+        BatteryTip lowBatteryTip =
+                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
+
+        final String expectedResult = "Low battery • " + TIME_LEFT;
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_notLowBatteryTip_showRemainingLabel() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+        BatteryTip lowBatteryTip = new SmartBatteryTip(BatteryTip.StateType.NEW);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_noTip_noAction() {
+        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
+
+        mController.updateHeaderByBatteryTips(null, mBatteryInfo);
+
+        verifyNoInteractions(mBatteryHeaderTextPreference);
+    }
+
+    @Test
+    public void updateHeaderByBatteryTips_noBatteryInfo_noAction() {
+        BatteryTip lowBatteryTip =
+                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
+
+        mController.updateHeaderByBatteryTips(lowBatteryTip, null);
+
+        verifyNoInteractions(mBatteryHeaderTextPreference);
+    }
+
+    @Test
+    public void updatePreference_isBatteryDefender_showEmptyText() {
+        mBatteryInfo.isBatteryDefender = true;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference).setText(mContext.getString(
+                                com.android.settingslib.R.string
+                                        .battery_info_status_charging_on_hold));
+    }
+
+    @Test
+    public void updatePreference_incompatibleCharger_showNotChargingState() {
+        BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus);
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryHeaderTextPreference)
+                .setText(
+                        mContext.getString(
+                                com.android.settingslib.R.string.battery_info_status_not_charging));
+    }
+
+    @Test
+    public void getAvailabilityStatus_returnAvailableUnsearchable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void displayPreference_batteryNotPresent_isInvisible() {
+        ShadowUtils.setIsBatteryPresent(false);
+
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mBatteryHeaderTextPreference.isVisible()).isFalse();
+    }
+
+    private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+        mBatteryInfo.discharging = isDischarging;
+
+        when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(mController, mBatteryInfo))
+                .thenReturn(updatedByStatusFeature);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java
new file mode 100644
index 00000000000..2ddc7ebbc72
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+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 androidx.test.core.app.ApplicationProvider;
+
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BatteryOptimizationModePreferenceControllerTest {
+    private static final int UID = 12345;
+    private static final String PACKAGE_NAME = "com.android.app";
+
+    private int mTestMode;
+    private Context mContext;
+    private BatteryOptimizationModePreferenceController mBackgroundUsageController;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+
+    @Mock MainSwitchPreference mBackgroundUsageAllowabilityPreference;
+    @Mock SelectorWithWidgetPreference mOptimizedPreference;
+    @Mock SelectorWithWidgetPreference mUnrestrictedPreference;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        prepareTestBatteryOptimizationUtils();
+        mBackgroundUsageController =
+                spy(
+                        new BatteryOptimizationModePreferenceController(
+                                mContext, "test", mBatteryOptimizeUtils));
+        mBackgroundUsageController.mBackgroundUsageAllowabilityPreference =
+                mBackgroundUsageAllowabilityPreference;
+        mBackgroundUsageController.mOptimizedPreference = mOptimizedPreference;
+        mBackgroundUsageController.mUnrestrictedPreference = mUnrestrictedPreference;
+    }
+
+    @Test
+    public void initPreferences_mutableMode_setEnabled() {
+        doReturn(true).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(true);
+        verify(mOptimizedPreference).setEnabled(true);
+        verify(mUnrestrictedPreference).setEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceChangeListener(any());
+        verify(mOptimizedPreference).setOnPreferenceClickListener(any());
+        verify(mUnrestrictedPreference).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_immutableMode_setDisabledAndSkipSetListeners() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mOptimizedPreference).setEnabled(false);
+        verify(mUnrestrictedPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mOptimizedPreference, never()).setOnPreferenceClickListener(any());
+        verify(mUnrestrictedPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void updatePreferences_setIntoUnrestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoOptimizedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoRestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_OPTIMIZED);
+
+        verify(mBatteryOptimizeUtils)
+                .setAppUsageState(
+                        BatteryOptimizeUtils.MODE_OPTIMIZED,
+                        BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verifyPreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeNotChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_RESTRICTED);
+
+        verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any());
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_RESTRICTED);
+        verify(mBackgroundUsageController, never()).updatePreferences(anyInt());
+    }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
+
+    private void verifyPreferences(int mode) {
+        boolean isAllowBackground = mode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        verify(mBackgroundUsageAllowabilityPreference).setChecked(isAllowBackground);
+        verify(mOptimizedPreference).setEnabled(isAllowBackground);
+        verify(mUnrestrictedPreference).setEnabled(isAllowBackground);
+        verify(mOptimizedPreference).setChecked(mode == BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verify(mUnrestrictedPreference).setChecked(mode == BatteryOptimizeUtils.MODE_UNRESTRICTED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index 72b49e27de5..41e9dca86f1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -127,6 +127,15 @@ public class BatteryOptimizeUtilsTest {
         assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_OPTIMIZED);
     }
 
+    @Test
+    public void testGetAppOptimizationMode_unknownMode_returnOptimized() throws Exception {
+        when(mMockBackend.isAllowlisted(anyString(), anyInt())).thenReturn(true);
+        when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
+                .thenReturn(AppOpsManager.MODE_IGNORED);
+
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_UNRESTRICTED);
+    }
+
     @Test
     public void testIsSystemOrDefaultApp_isSystemOrDefaultApp_returnTrue() {
         when(mMockBackend.isAllowlisted(anyString(), anyInt())).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
deleted file mode 100644
index 66564718d0e..00000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-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 OptimizedPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private OptimizedPreferenceController mController;
-    private SelectorWithWidgetPreference mPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new OptimizedPreferenceController(context, UID, PACKAGE_NAME);
-        mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndOptimizeStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isOptimizedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mPreference.setKey(mController.KEY_OPTIMIZED_PREF);
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
index 90611178fdb..2451cc51205 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
@@ -17,14 +17,15 @@
 package com.android.settings.fuelgauge;
 
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
-import static com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 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.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -39,28 +40,25 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.InstallSourceInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.widget.CompoundButton;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settings.testutils.shadow.ShadowHelpUtils;
+import com.android.settingslib.Utils;
 import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
+import com.android.settingslib.widget.IntroPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -75,44 +73,43 @@ import org.mockito.junit.MockitoRule;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 
 import java.util.concurrent.TimeUnit;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
         shadows = {
-            ShadowEntityHeaderController.class,
+            ShadowHelpUtils.class,
             com.android.settings.testutils.shadow.ShadowFragment.class,
         })
 public class PowerBackgroundUsageDetailTest {
 
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     private static final String APP_LABEL = "app label";
+    private static final String APP_ENTRY_LABEL = "app entry label";
     private static final String SUMMARY = "summary";
     private static final int ICON_ID = 123;
     private static final int UID = 1;
-    private static final String KEY_PREF_UNRESTRICTED = "unrestricted_preference";
-    private static final String KEY_PREF_OPTIMIZED = "optimized_preference";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String KEY_PREF_HEADER = "header_view";
+    private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
+    private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
+    private static final Drawable TEST_DRAWABLE = new ColorDrawable(0);
 
+    private int mTestMode;
     private Context mContext;
     private PowerBackgroundUsageDetail mFragment;
-    private FooterPreference mFooterPreference;
-    private MainSwitchPreference mMainSwitchPreference;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private SelectorWithWidgetPreference mOptimizePreference;
-    private SelectorWithWidgetPreference mUnrestrictedPreference;
     private SettingsActivity mTestActivity;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+    private IntroPreference mIntroPreference;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private FragmentActivity mActivity;
 
-    @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @Mock private LayoutPreference mHeaderPreference;
     @Mock private ApplicationsState mState;
     @Mock private Bundle mBundle;
     @Mock private LoaderManager mLoaderManager;
@@ -120,21 +117,34 @@ public class PowerBackgroundUsageDetailTest {
     @Mock private BatteryEntry mBatteryEntry;
     @Mock private PackageManager mPackageManager;
     @Mock private AppOpsManager mAppOpsManager;
-    @Mock private CompoundButton mMockSwitch;
     @Mock private InstallSourceInfo mInstallSourceInfo;
+    @Mock private FooterPreference mFooterPreference;
+
+    @Implements(Utils.class)
+    private static class ShadowUtils {
+        @Implementation
+        public static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {
+            return PowerBackgroundUsageDetailTest.TEST_DRAWABLE;
+        }
+    }
 
     @Before
     public void setUp() throws Exception {
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getPackageName()).thenReturn("foo");
+        when(mContext.getPackageName()).thenReturn(PACKAGE_NAME);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
 
         final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();
         mMetricsFeatureProvider = fakeFeatureFactory.metricsFeatureProvider;
 
+        prepareTestBatteryOptimizationUtils();
         mFragment = spy(new PowerBackgroundUsageDetail());
+        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
         mFragment.mLogStringBuilder = new StringBuilder();
+        mIntroPreference = new IntroPreference(mContext);
+        doReturn(mIntroPreference).when(mFragment).findPreference(KEY_PREF_HEADER);
+        doReturn(mFooterPreference).when(mFragment).findPreference(KEY_FOOTER_PREFERENCE);
         doReturn(mContext).when(mFragment).getContext();
         doReturn(mActivity).when(mFragment).getActivity();
         doReturn(SUMMARY).when(mFragment).getString(anyInt());
@@ -142,37 +152,14 @@ public class PowerBackgroundUsageDetailTest {
         when(mFragment.getArguments()).thenReturn(mBundle);
         doReturn(mLoaderManager).when(mFragment).getLoaderManager();
 
-        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setButtonActions(anyInt(), anyInt());
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setIcon(nullable(Drawable.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setIcon(nullable(ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setLabel(nullable(ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController)
-                .when(mEntityHeaderController)
-                .setSummary(nullable(String.class));
-
         when(mBatteryEntry.getUid()).thenReturn(UID);
         when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
         mBatteryEntry.mIconId = ICON_ID;
 
-        mFragment.mHeaderPreference = mHeaderPreference;
         mFragment.mState = mState;
-        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
+        doNothing().when(mState).ensureIcon(mAppEntry);
         mAppEntry.info = mock(ApplicationInfo.class);
+        mAppEntry.label = APP_ENTRY_LABEL;
 
         mTestActivity = spy(new SettingsActivity());
         doReturn(mPackageManager).when(mTestActivity).getPackageManager();
@@ -191,158 +178,102 @@ public class PowerBackgroundUsageDetailTest {
                 .when(mActivity)
                 .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
         doAnswer(callable).when(mActivity).startActivity(captor.capture());
-
-        mFooterPreference = spy(new FooterPreference(mContext));
-        mMainSwitchPreference = spy(new MainSwitchPreference(mContext));
-        mMainSwitchPreference.setKey(KEY_ALLOW_BACKGROUND_USAGE);
-        mOptimizePreference = spy(new SelectorWithWidgetPreference(mContext));
-        mOptimizePreference.setKey(KEY_PREF_OPTIMIZED);
-        mUnrestrictedPreference = spy(new SelectorWithWidgetPreference(mContext));
-        mUnrestrictedPreference.setKey(KEY_PREF_UNRESTRICTED);
-        mFragment.mFooterPreference = mFooterPreference;
-        mFragment.mMainSwitchPreference = mMainSwitchPreference;
-        mFragment.mOptimizePreference = mOptimizePreference;
-        mFragment.mUnrestrictedPreference = mUnrestrictedPreference;
     }
 
     @After
     public void reset() {
-        ShadowEntityHeaderController.reset();
+        ShadowHelpUtils.reset();
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_NoAppEntry_BuildByBundle() {
         mFragment.mAppEntry = null;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
-        verify(mEntityHeaderController).setLabel(APP_LABEL);
+        assertThat(mIntroPreference.getIcon()).isNotEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(APP_LABEL);
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_HasAppEntry_BuildByAppEntry() {
-        ReflectionHelpers.setStaticField(
-                AppUtils.class,
-                "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return false;
-                    }
-                });
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(false);
+        assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void initHeader_HasAppEntry_InstantApp() {
-        ReflectionHelpers.setStaticField(
-                AppUtils.class,
-                "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return true;
-                    }
-                });
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(true);
+        assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+        assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
     }
 
     @Test
-    public void initFooter_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
+    public void initFooter_setExpectedFooterContent() {
         mFragment.initFooter();
 
-        assertThat(mFooterPreference.getTitle().toString())
-                .isEqualTo("Changing how an app uses your battery can affect its performance.");
+        verify(mFooterPreference)
+                .setTitle(mContext.getString(R.string.manager_battery_usage_footer));
+        verify(mFooterPreference).setLearnMoreAction(any());
+        verify(mFooterPreference)
+                .setLearnMoreText(mContext.getString(R.string.manager_battery_usage_link_a11y));
     }
 
     @Test
-    public void onSwitchChanged_fromUnrestrictedModeSetDisabled_becomeRestrictedMode() {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = optimizedMode;
+    public void onPause_optimizationModeIsChanged_logPreference() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false);
-
-        verify(mOptimizePreference).setEnabled(false);
-        verify(mUnrestrictedPreference).setEnabled(false);
-        verify(mFragment).onRadioButtonClicked(null);
-        verify(mMainSwitchPreference).setChecked(false);
-        assertThat(mFragment.getSelectedPreference()).isEqualTo(restrictedMode);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-    }
-
-    @Test
-    public void onSwitchChanged_fromRestrictedModeSetEnabled_becomeOptimizedMode() {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-
-        verify(mOptimizePreference).setEnabled(true);
-        verify(mUnrestrictedPreference).setEnabled(true);
-        verify(mFragment).onRadioButtonClicked(mOptimizePreference);
-        verify(mMainSwitchPreference).setChecked(true);
-        verify(mOptimizePreference).setChecked(true);
-        assertThat(mFragment.getSelectedPreference()).isEqualTo(optimizedMode);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-    }
-
-    @Test
-    public void onPause_optimizationModeChanged_logPreference() throws Exception {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
-
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_UNRESTRICTED);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
         verify(mMetricsFeatureProvider)
                 .action(
                         SettingsEnums.LEAVE_POWER_USAGE_MANAGE_BACKGROUND,
-                        SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
+                        SettingsEnums.ACTION_APP_BATTERY_USAGE_UNRESTRICTED,
                         SettingsEnums.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND,
-                        packageName,
+                        PACKAGE_NAME,
                         /* consumed battery */ 0);
     }
 
     @Test
     public void onPause_optimizationModeIsNotChanged_notInvokeLogging() throws Exception {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_UNRESTRICTED);
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
         verifyNoInteractions(mMetricsFeatureProvider);
     }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
deleted file mode 100644
index 0c6f7da2109..00000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-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 UnrestrictedPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private UnrestrictedPreferenceController mController;
-    private SelectorWithWidgetPreference mPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new UnrestrictedPreferenceController(context, UID, PACKAGE_NAME);
-        mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_isValidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isTrue();
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefDisabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndUnrestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isUnrestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mPreference.setKey(mController.KEY_UNRESTRICTED_PREF);
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index cdcb12fdd35..8fe18eb7e1d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -40,6 +40,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class BatterySaverButtonPreferenceControllerTest {
 
@@ -120,3 +121,4 @@ public class BatterySaverButtonPreferenceControllerTest {
         assertThat(mController.isPublicSlice()).isTrue();
     }
 }
+// LINT.ThenChange(BatterySaverPreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreferenceTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreferenceTest.kt
new file mode 100644
index 00000000000..ef190a7cc9c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreferenceTest.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager.EXTRA_PLUGGED
+import android.os.PowerManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.MainSwitchPreference
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.verify
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class BatterySaverPreferenceTest {
+    private val powerManager = mock<PowerManager>()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when {
+                    name == getSystemServiceName(PowerManager::class.java) -> powerManager
+                    else -> super.getSystemService(name)
+                }
+
+            override fun registerReceiver(receiver: BroadcastReceiver?, filter: IntentFilter?) =
+                Intent().putExtra(EXTRA_PLUGGED, 0)
+        }
+
+    private val contextPlugIn: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun registerReceiver(receiver: BroadcastReceiver?, filter: IntentFilter?) =
+                Intent().putExtra(EXTRA_PLUGGED, 1)
+        }
+
+    private val batterySaverPreference = BatterySaverPreference()
+
+    @Test
+    fun lowPowerOn_preferenceIsChecked() {
+        powerManager.stub { on { isPowerSaveMode } doReturn true }
+
+        assertThat(getMainSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun lowPowerOff_preferenceIsUnChecked() {
+        powerManager.stub { on { isPowerSaveMode } doReturn false }
+
+        assertThat(getMainSwitchPreference().isChecked).isFalse()
+    }
+
+    @Test
+    fun storeSetOn_setPowerSaveMode() {
+        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, true)
+
+        verify(powerManager).setPowerSaveModeEnabled(true)
+    }
+
+    @Test
+    fun storeSetOff_unsetPowerSaveMode() {
+        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, false)
+
+        verify(powerManager).setPowerSaveModeEnabled(false)
+    }
+
+    @Test
+    fun isUnPlugIn_preferenceEnabled() {
+        assertThat(getMainSwitchPreference().isEnabled).isTrue()
+    }
+
+    @Test
+    fun isPlugIn_preferenceDisabled() {
+        assertThat(getMainSwitchPreference(contextPlugIn).isEnabled).isFalse()
+    }
+
+    private fun getMainSwitchPreference(ctx: Context = context) =
+        batterySaverPreference.createAndBindWidget<MainSwitchPreference>(ctx)
+}
+// LINT.ThenChange(BatterySaverButtonPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt
new file mode 100644
index 00000000000..f706351167e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Intent
+import android.os.BatteryManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BatterySaverScreenTest : CatalystScreenTestCase() {
+    private val intent =
+        Intent(Intent.ACTION_BATTERY_CHANGED).putExtra(BatteryManager.EXTRA_PLUGGED, 0)
+
+    override val preferenceScreenCreator = BatterySaverScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_BATTERY_SAVER_SCREEN
+
+    @Before
+    fun setUp() {
+        appContext.sendStickyBroadcast(intent)
+    }
+
+    @After
+    fun tearDown() {
+        appContext.removeStickyBroadcast(intent)
+    }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(BatterySaverScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
index 85fc6e210ce..c4cbb988ae6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
@@ -59,11 +59,12 @@ public final class BatteryUsageBreakdownControllerTest {
     private static final String PREF_KEY2 = "pref_key2";
     private static final String PREF_SUMMARY = "fake preference summary";
     private static final String KEY_SPINNER_POSITION = "spinner_position";
-    private static final long TIME_LESS_THAN_HALF_MINUTE  = DateUtils.MINUTE_IN_MILLIS / 2  - 1;
+    private static final int ENTRY_PREF_ORDER_OFFSET = 100;
+    private static final long TIME_LESS_THAN_HALF_MINUTE = DateUtils.MINUTE_IN_MILLIS / 2 - 1;
 
     @Mock private InstrumentedPreferenceFragment mFragment;
     @Mock private SettingsActivity mSettingsActivity;
-    @Mock private PreferenceGroup mAppListPreferenceGroup;
+    @Mock private PreferenceGroup mRootPreferenceGroup;
     @Mock private Drawable mDrawable;
     @Mock private BatteryHistEntry mBatteryHistEntry;
     @Mock private AnomalyAppItemPreference mAnomalyAppItemPreference;
@@ -90,7 +91,7 @@ public final class BatteryUsageBreakdownControllerTest {
                 .when(mFeatureFactory.powerUsageFeatureProvider)
                 .getHideApplicationSet();
         mBatteryUsageBreakdownController = createController();
-        mBatteryUsageBreakdownController.mAppListPreferenceGroup = mAppListPreferenceGroup;
+        mBatteryUsageBreakdownController.mRootPreferenceGroup = mRootPreferenceGroup;
         mBatteryDiffEntry =
                 new BatteryDiffEntry(
                         mContext,
@@ -130,7 +131,7 @@ public final class BatteryUsageBreakdownControllerTest {
         BatteryDiffEntry.sResourceCache.put(
                 "fakeBatteryDiffEntryKey",
                 new BatteryEntry.NameAndIcon("fakeName", /* icon= */ null, /* iconId= */ 1));
-        doReturn(mAnomalyAppItemPreference).when(mAppListPreferenceGroup).findPreference(PREF_KEY);
+        doReturn(mAnomalyAppItemPreference).when(mRootPreferenceGroup).findPreference(PREF_KEY);
     }
 
     @Test
@@ -147,7 +148,7 @@ public final class BatteryUsageBreakdownControllerTest {
     @Test
     public void onDestroy_removeAllPreferenceFromPreferenceGroup() {
         mBatteryUsageBreakdownController.onDestroy();
-        verify(mAppListPreferenceGroup).removeAll();
+        verify(mRootPreferenceGroup).removeAll();
     }
 
     @Test
@@ -162,11 +163,11 @@ public final class BatteryUsageBreakdownControllerTest {
     @Test
     public void addAllPreferences_addAllPreferences() {
         final String appLabel = "fake app label";
-        doReturn(1).when(mAppListPreferenceGroup).getPreferenceCount();
+        doReturn(1).when(mRootPreferenceGroup).getPreferenceCount();
         doReturn(mDrawable).when(mBatteryDiffEntry).getAppIcon();
         doReturn(appLabel).when(mBatteryDiffEntry).getAppLabel();
         doReturn(PREF_KEY).when(mBatteryDiffEntry).getKey();
-        doReturn(null).when(mAppListPreferenceGroup).findPreference(PREF_KEY);
+        doReturn(null).when(mRootPreferenceGroup).findPreference(PREF_KEY);
         doReturn(false).when(mBatteryDiffEntry).validForRestriction();
 
         mBatteryUsageBreakdownController.addAllPreferences();
@@ -177,11 +178,11 @@ public final class BatteryUsageBreakdownControllerTest {
                         mBatteryUsageBreakdownController.mPreferenceCache.get(PREF_KEY);
         assertThat(pref).isNotNull();
         // Verifies the added preference configuration.
-        verify(mAppListPreferenceGroup).addPreference(pref);
+        verify(mRootPreferenceGroup).addPreference(pref);
         assertThat(pref.getKey()).isEqualTo(PREF_KEY);
         assertThat(pref.getTitle().toString()).isEqualTo(appLabel);
         assertThat(pref.getIcon()).isEqualTo(mDrawable);
-        assertThat(pref.getOrder()).isEqualTo(1);
+        assertThat(pref.getOrder()).isEqualTo(ENTRY_PREF_ORDER_OFFSET + 1);
         assertThat(pref.getBatteryDiffEntry()).isSameInstanceAs(mBatteryDiffEntry);
         assertThat(pref.isSingleLineTitle()).isTrue();
         assertThat(pref.isSelectable()).isFalse();
@@ -190,20 +191,20 @@ public final class BatteryUsageBreakdownControllerTest {
     @Test
     public void addPreferenceToScreen_alreadyInScreen_notAddPreferenceAgain() {
         final String appLabel = "fake app label";
-        doReturn(1).when(mAppListPreferenceGroup).getPreferenceCount();
+        doReturn(1).when(mRootPreferenceGroup).getPreferenceCount();
         doReturn(mDrawable).when(mBatteryDiffEntry).getAppIcon();
         doReturn(appLabel).when(mBatteryDiffEntry).getAppLabel();
         doReturn(PREF_KEY).when(mBatteryDiffEntry).getKey();
 
         mBatteryUsageBreakdownController.addAllPreferences();
 
-        verify(mAppListPreferenceGroup, never()).addPreference(any());
+        verify(mRootPreferenceGroup, never()).addPreference(any());
     }
 
     @Test
     public void removeAndCacheAllUnusedPreferences_removePref_buildCacheAndRemoveAllPreference() {
-        doReturn(1).when(mAppListPreferenceGroup).getPreferenceCount();
-        doReturn(mAnomalyAppItemPreference).when(mAppListPreferenceGroup).getPreference(0);
+        doReturn(1).when(mRootPreferenceGroup).getPreferenceCount();
+        doReturn(mAnomalyAppItemPreference).when(mRootPreferenceGroup).getPreference(0);
         doReturn(PREF_KEY2).when(mBatteryHistEntry).getKey();
         doReturn(PREF_KEY).when(mAnomalyAppItemPreference).getKey();
         // Ensures the testing data is correct.
@@ -213,13 +214,13 @@ public final class BatteryUsageBreakdownControllerTest {
 
         assertThat(mBatteryUsageBreakdownController.mPreferenceCache.get(PREF_KEY))
                 .isEqualTo(mAnomalyAppItemPreference);
-        verify(mAppListPreferenceGroup).removePreference(mAnomalyAppItemPreference);
+        verify(mRootPreferenceGroup).removePreference(mAnomalyAppItemPreference);
     }
 
     @Test
     public void removeAndCacheAllUnusedPreferences_keepPref_KeepAllPreference() {
-        doReturn(1).when(mAppListPreferenceGroup).getPreferenceCount();
-        doReturn(mAnomalyAppItemPreference).when(mAppListPreferenceGroup).getPreference(0);
+        doReturn(1).when(mRootPreferenceGroup).getPreferenceCount();
+        doReturn(mAnomalyAppItemPreference).when(mRootPreferenceGroup).getPreference(0);
         doReturn(PREF_KEY).when(mBatteryDiffEntry).getKey();
         doReturn(PREF_KEY).when(mAnomalyAppItemPreference).getKey();
         // Ensures the testing data is correct.
@@ -227,15 +228,13 @@ public final class BatteryUsageBreakdownControllerTest {
 
         mBatteryUsageBreakdownController.removeAndCacheAllUnusedPreferences();
 
-        verify(mAppListPreferenceGroup, never()).removePreference(any());
+        verify(mRootPreferenceGroup, never()).removePreference(any());
         assertThat(mBatteryUsageBreakdownController.mPreferenceCache).isEmpty();
     }
 
     @Test
     public void handlePreferenceTreeClick_notPowerGaugePreference_returnFalse() {
-        assertThat(
-                        mBatteryUsageBreakdownController.handlePreferenceTreeClick(
-                                mAppListPreferenceGroup))
+        assertThat(mBatteryUsageBreakdownController.handlePreferenceTreeClick(mRootPreferenceGroup))
                 .isFalse();
 
         verify(mMetricsFeatureProvider, never())
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
index 2f20b425788..1fed13f8e8f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
@@ -110,7 +110,6 @@ public final class DataProcessManagerTest {
         mDataProcessManager =
                 new DataProcessManager(
                         mContext,
-                        /* handler= */ null,
                         mUserIdsSeries,
                         /* isFromPeriodJob= */ false,
                         /* rawStartTimestamp= */ 0L,
@@ -131,7 +130,6 @@ public final class DataProcessManagerTest {
         final DataProcessManager dataProcessManager =
                 new DataProcessManager(
                         mContext,
-                        /* handler= */ null,
                         mUserIdsSeries,
                         /* callbackFunction= */ null);
         assertThat(dataProcessManager.getShowScreenOnTime()).isFalse();
@@ -257,7 +255,6 @@ public final class DataProcessManagerTest {
         final DataProcessManager dataProcessManager =
                 new DataProcessManager(
                         mContext,
-                        /* handler= */ null,
                         mUserIdsSeries,
                         /* isFromPeriodJob= */ false,
                         /* rawStartTimestamp= */ 2L,
@@ -349,7 +346,6 @@ public final class DataProcessManagerTest {
         assertThat(
                         DataProcessManager.getBatteryLevelData(
                                 mContext,
-                                /* handler= */ null,
                                 mUserIdsSeries,
                                 /* isFromPeriodJob= */ false,
                                 /* asyncResponseDelegate= */ null))
@@ -357,7 +353,6 @@ public final class DataProcessManagerTest {
         assertThat(
                         DataProcessManager.getBatteryLevelData(
                                 mContext,
-                                /* handler= */ null,
                                 mUserIdsSeries,
                                 /* isFromPeriodJob= */ true,
                                 /* asyncResponseDelegate= */ null))
@@ -379,7 +374,6 @@ public final class DataProcessManagerTest {
         final BatteryLevelData resultData =
                 DataProcessManager.getBatteryLevelData(
                         mContext,
-                        /* handler= */ null,
                         mUserIdsSeries,
                         /* isFromPeriodJob= */ false,
                         /* asyncResponseDelegate= */ null);
@@ -408,7 +402,6 @@ public final class DataProcessManagerTest {
         final BatteryLevelData resultData =
                 DataProcessManager.getBatteryLevelData(
                         mContext,
-                        /* handler= */ null,
                         mUserIdsSeries,
                         /* isFromPeriodJob= */ false,
                         /* asyncResponseDelegate= */ null);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index ae4c56d035a..1f3067e81ce 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -903,6 +903,7 @@ public final class DataProcessorTest {
                                                 ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                                                 0L,
                                                 0L,
+                                                0L,
                                                 false)),
                         batteryHistoryKeys[1],
                                 Map.of(
@@ -920,6 +921,7 @@ public final class DataProcessorTest {
                                                 ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                                                 0L,
                                                 0L,
+                                                0L,
                                                 false)),
                         batteryHistoryKeys[2],
                                 Map.of(
@@ -937,6 +939,7 @@ public final class DataProcessorTest {
                                                 ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                                                 0L,
                                                 0L,
+                                                0L,
                                                 false)));
         final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
         final Map<Integer, Map<Integer, Map<Long, Map<String, List<AppUsagePeriod>>>>>
@@ -993,6 +996,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         // Adds the index = 0 data.
@@ -1010,6 +1014,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1034,6 +1039,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 15L,
+                        /* foregroundServiceUsageTimeInMs= */ 20L,
                         /* backgroundUsageTimeInMs= */ 25L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1054,6 +1060,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 25L,
+                        /* foregroundServiceUsageTimeInMs= */ 30L,
                         /* backgroundUsageTimeInMs= */ 35L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1070,6 +1077,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
                         /* foregroundUsageTimeInMs= */ 40L,
+                        /* foregroundServiceUsageTimeInMs= */ 45L,
                         /* backgroundUsageTimeInMs= */ 50L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1086,6 +1094,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 5L,
+                        /* foregroundServiceUsageTimeInMs= */ 5L,
                         /* backgroundUsageTimeInMs= */ 5L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1106,6 +1115,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 30L,
+                        /* foregroundServiceUsageTimeInMs= */ 35L,
                         /* backgroundUsageTimeInMs= */ 40L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1122,6 +1132,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
                         /* foregroundUsageTimeInMs= */ 50L,
+                        /* foregroundServiceUsageTimeInMs= */ 55L,
                         /* backgroundUsageTimeInMs= */ 60L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1138,6 +1149,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 5L,
+                        /* foregroundServiceUsageTimeInMs= */ 5L,
                         /* backgroundUsageTimeInMs= */ 5L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1195,6 +1207,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 9,
                 /* cachedUsageConsumePower= */ 8,
                 /* foregroundUsageTimeInMs= */ 30,
+                /* foregroundServiceUsageTimeInMs= */ 35,
                 /* backgroundUsageTimeInMs= */ 40,
                 /* screenOnTimeInMs= */ 12);
         assertBatteryDiffEntry(
@@ -1208,6 +1221,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 8,
                 /* cachedUsageConsumePower= */ 8,
                 /* foregroundUsageTimeInMs= */ 5,
+                /* foregroundServiceUsageTimeInMs= */ 5,
                 /* backgroundUsageTimeInMs= */ 5,
                 /* screenOnTimeInMs= */ 0);
         assertBatteryDiffEntry(
@@ -1221,6 +1235,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 5,
                 /* cachedUsageConsumePower= */ 5,
                 /* foregroundUsageTimeInMs= */ 16,
+                /* foregroundServiceUsageTimeInMs= */ 55,
                 /* backgroundUsageTimeInMs= */ 60,
                 /* screenOnTimeInMs= */ 9);
         resultDiffData = resultMap.get(0).get(DataProcessor.SELECTED_INDEX_ALL);
@@ -1235,6 +1250,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 5,
                 /* cachedUsageConsumePower= */ 5,
                 /* foregroundUsageTimeInMs= */ 15,
+                /* foregroundServiceUsageTimeInMs= */ 20,
                 /* backgroundUsageTimeInMs= */ 25,
                 /* screenOnTimeInMs= */ 5);
         resultDiffData = resultMap.get(1).get(DataProcessor.SELECTED_INDEX_ALL);
@@ -1249,6 +1265,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 8,
                 /* cachedUsageConsumePower= */ 8,
                 /* foregroundUsageTimeInMs= */ 5,
+                /* foregroundServiceUsageTimeInMs= */ 5,
                 /* backgroundUsageTimeInMs= */ 5,
                 /* screenOnTimeInMs= */ 0);
         assertBatteryDiffEntry(
@@ -1262,6 +1279,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 4,
                 /* cachedUsageConsumePower= */ 3,
                 /* foregroundUsageTimeInMs= */ 15,
+                /* foregroundServiceUsageTimeInMs= */ 15,
                 /* backgroundUsageTimeInMs= */ 15,
                 /* screenOnTimeInMs= */ 7);
         assertBatteryDiffEntry(
@@ -1275,6 +1293,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 5,
                 /* cachedUsageConsumePower= */ 5,
                 /* foregroundUsageTimeInMs= */ 16,
+                /* foregroundServiceUsageTimeInMs= */ 55,
                 /* backgroundUsageTimeInMs= */ 60,
                 /* screenOnTimeInMs= */ 9);
     }
@@ -1308,6 +1327,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1324,6 +1344,7 @@ public final class DataProcessorTest {
                         currentUserId + 1,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1340,6 +1361,7 @@ public final class DataProcessorTest {
                         currentUserId + 2,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 20L,
+                        /* foregroundServiceUsageTimeInMs= */ 25L,
                         /* backgroundUsageTimeInMs= */ 30L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1359,6 +1381,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 20L,
+                        /* foregroundServiceUsageTimeInMs= */ 25L,
                         /* backgroundUsageTimeInMs= */ 30L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1375,6 +1398,7 @@ public final class DataProcessorTest {
                         currentUserId + 1,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1391,6 +1415,7 @@ public final class DataProcessorTest {
                         currentUserId + 2,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 30L,
+                        /* foregroundServiceUsageTimeInMs= */ 30L,
                         /* backgroundUsageTimeInMs= */ 30L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1410,6 +1435,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 20L,
+                        /* foregroundServiceUsageTimeInMs= */ 25L,
                         /* backgroundUsageTimeInMs= */ 30L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1426,6 +1452,7 @@ public final class DataProcessorTest {
                         currentUserId + 1,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 20L,
+                        /* foregroundServiceUsageTimeInMs= */ 20L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1442,6 +1469,7 @@ public final class DataProcessorTest {
                         currentUserId + 2,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 30L,
+                        /* foregroundServiceUsageTimeInMs= */ 30L,
                         /* backgroundUsageTimeInMs= */ 30L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1477,6 +1505,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 5,
                 /* cachedUsageConsumePower= */ 5,
                 /* foregroundUsageTimeInMs= */ 10,
+                /* foregroundServiceUsageTimeInMs= */ 10,
                 /* backgroundUsageTimeInMs= */ 10,
                 /* screenOnTimeInMs= */ 0);
         assertThat(resultDiffData.getSystemDiffEntryList()).isEmpty();
@@ -1509,6 +1538,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1528,6 +1558,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1547,6 +1578,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 3600000L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 7200000L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1587,6 +1619,7 @@ public final class DataProcessorTest {
         final BatteryDiffEntry resultEntry = resultDiffData.getAppDiffEntryList().get(0);
         assertThat(resultEntry.mForegroundUsageTimeInMs)
                 .isEqualTo(Math.round(entry.mForegroundUsageTimeInMs * ratio));
+        assertThat(resultEntry.mForegroundServiceUsageTimeInMs).isEqualTo(0);
         assertThat(resultEntry.mBackgroundUsageTimeInMs).isEqualTo(0);
         assertThat(resultEntry.mConsumePower).isEqualTo(entry.mConsumePower * ratio);
         assertThat(resultEntry.mForegroundUsageConsumePower)
@@ -1627,6 +1660,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1643,6 +1677,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1662,6 +1697,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1678,6 +1714,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1697,6 +1734,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1713,6 +1751,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1748,6 +1787,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 5,
                 /* cachedUsageConsumePower= */ 5,
                 /* foregroundUsageTimeInMs= */ 10,
+                /* foregroundServiceUsageTimeInMs= */ 15,
                 /* backgroundUsageTimeInMs= */ 20,
                 /* screenOnTimeInMs= */ 0);
     }
@@ -1777,6 +1817,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1793,6 +1834,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1812,6 +1854,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1828,6 +1871,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 0L,
+                        /* foregroundServiceUsageTimeInMs= */ 0L,
                         /* backgroundUsageTimeInMs= */ 0L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1847,6 +1891,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1863,6 +1908,7 @@ public final class DataProcessorTest {
                         currentUserId,
                         ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                         /* foregroundUsageTimeInMs= */ 10L,
+                        /* foregroundServiceUsageTimeInMs= */ 15L,
                         /* backgroundUsageTimeInMs= */ 20L,
                         /* isHidden= */ false);
         entryMap.put(entry.getKey(), entry);
@@ -1892,6 +1938,7 @@ public final class DataProcessorTest {
         assertThat(resultEntry.mBackgroundUsageTimeInMs).isEqualTo(20);
         resultEntry = resultDiffData.getAppDiffEntryList().get(1);
         assertThat(resultEntry.mBackgroundUsageTimeInMs).isEqualTo(0);
+        assertThat(resultEntry.mForegroundServiceUsageTimeInMs).isEqualTo(0);
     }
 
     @Test
@@ -1921,6 +1968,7 @@ public final class DataProcessorTest {
         doReturn(0.0).when(mMockBatteryEntry1).getConsumedPowerInBackground();
         doReturn(0.0).when(mMockBatteryEntry1).getConsumedPowerInCached();
         doReturn(30L).when(mMockBatteryEntry1).getTimeInForegroundMs();
+        doReturn(35L).when(mMockBatteryEntry1).getTimeInForegroundServiceMs();
         doReturn(40L).when(mMockBatteryEntry1).getTimeInBackgroundMs();
         doReturn(1).when(mMockBatteryEntry1).getUid();
         doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry1).getConsumerType();
@@ -1930,6 +1978,7 @@ public final class DataProcessorTest {
         doReturn(0.0).when(mMockBatteryEntry2).getConsumedPowerInBackground();
         doReturn(0.0).when(mMockBatteryEntry2).getConsumedPowerInCached();
         doReturn(20L).when(mMockBatteryEntry2).getTimeInForegroundMs();
+        doReturn(20L).when(mMockBatteryEntry2).getTimeInForegroundServiceMs();
         doReturn(20L).when(mMockBatteryEntry2).getTimeInBackgroundMs();
         doReturn(2).when(mMockBatteryEntry2).getUid();
         doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry2).getConsumerType();
@@ -1939,6 +1988,7 @@ public final class DataProcessorTest {
         doReturn(0.0).when(mMockBatteryEntry3).getConsumedPowerInBackground();
         doReturn(0.0).when(mMockBatteryEntry3).getConsumedPowerInCached();
         doReturn(0L).when(mMockBatteryEntry3).getTimeInForegroundMs();
+        doReturn(0L).when(mMockBatteryEntry3).getTimeInForegroundServiceMs();
         doReturn(0L).when(mMockBatteryEntry3).getTimeInBackgroundMs();
         doReturn(3).when(mMockBatteryEntry3).getUid();
         doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry3).getConsumerType();
@@ -1948,6 +1998,7 @@ public final class DataProcessorTest {
         doReturn(0.3).when(mMockBatteryEntry4).getConsumedPowerInBackground();
         doReturn(0.1).when(mMockBatteryEntry4).getConsumedPowerInCached();
         doReturn(10L).when(mMockBatteryEntry4).getTimeInForegroundMs();
+        doReturn(10L).when(mMockBatteryEntry4).getTimeInForegroundServiceMs();
         doReturn(10L).when(mMockBatteryEntry4).getTimeInBackgroundMs();
         doReturn(4).when(mMockBatteryEntry4).getUid();
         doReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY)
@@ -1978,6 +2029,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 0,
                 /* cachedUsageConsumePower= */ 0,
                 /* foregroundUsageTimeInMs= */ 20,
+                /* foregroundServiceUsageTimeInMs= */ 20,
                 /* backgroundUsageTimeInMs= */ 20,
                 /* screenOnTimeInMs= */ 0);
         assertBatteryDiffEntry(
@@ -1991,6 +2043,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 0,
                 /* cachedUsageConsumePower= */ 0,
                 /* foregroundUsageTimeInMs= */ 30,
+                /* foregroundServiceUsageTimeInMs= */ 35,
                 /* backgroundUsageTimeInMs= */ 40,
                 /* screenOnTimeInMs= */ 0);
         assertBatteryDiffEntry(
@@ -2004,6 +2057,7 @@ public final class DataProcessorTest {
                 /* backgroundUsageConsumePower= */ 0.3,
                 /* cachedUsageConsumePower= */ 0.1,
                 /* foregroundUsageTimeInMs= */ 10,
+                /* foregroundServiceUsageTimeInMs= */ 10,
                 /* backgroundUsageTimeInMs= */ 10,
                 /* screenOnTimeInMs= */ 0);
     }
@@ -2390,6 +2444,7 @@ public final class DataProcessorTest {
             final long userId,
             final int consumerType,
             final long foregroundUsageTimeInMs,
+            final long foregroundServiceUsageTimeInMs,
             final long backgroundUsageTimeInMs,
             final boolean isHidden) {
         // Only insert required fields.
@@ -2402,6 +2457,7 @@ public final class DataProcessorTest {
                         .setBackgroundUsageConsumePower(backgroundUsageConsumePower)
                         .setCachedUsageConsumePower(cachedUsageConsumePower)
                         .setForegroundUsageTimeInMs(foregroundUsageTimeInMs)
+                        .setForegroundServiceUsageTimeInMs(foregroundServiceUsageTimeInMs)
                         .setBackgroundUsageTimeInMs(backgroundUsageTimeInMs)
                         .setIsHidden(isHidden)
                         .build();
@@ -2531,6 +2587,7 @@ public final class DataProcessorTest {
             final double backgroundUsageConsumePower,
             final double cachedUsageConsumePower,
             final long foregroundUsageTimeInMs,
+            final long foregroundServiceUsageTimeInMs,
             final long backgroundUsageTimeInMs,
             final long screenOnTimeInMs) {
         assertThat(entry.mUserId).isEqualTo(userId);
@@ -2543,6 +2600,8 @@ public final class DataProcessorTest {
         assertThat(entry.mBackgroundUsageConsumePower).isEqualTo(backgroundUsageConsumePower);
         assertThat(entry.mCachedUsageConsumePower).isEqualTo(cachedUsageConsumePower);
         assertThat(entry.mForegroundUsageTimeInMs).isEqualTo(foregroundUsageTimeInMs);
+        assertThat(entry.mForegroundServiceUsageTimeInMs)
+                .isEqualTo(foregroundServiceUsageTimeInMs);
         assertThat(entry.mBackgroundUsageTimeInMs).isEqualTo(backgroundUsageTimeInMs);
         assertThat(entry.mScreenOnTimeInMs).isEqualTo(screenOnTimeInMs);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt
new file mode 100644
index 00000000000..80a6b2ef8f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batteryusage
+
+import android.content.ContextWrapper
+import android.content.res.Resources
+import android.platform.test.annotations.DisableFlags
+import android.platform.test.annotations.EnableFlags
+import androidx.fragment.app.testing.FragmentScenario
+import androidx.preference.PreferenceFragmentCompat
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowUtils
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.robolectric.annotation.Config
+
+@Config(shadows = [ShadowUtils::class])
+class PowerUsageSummaryScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = PowerUsageSummaryScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_POWER_USAGE_SUMMARY_SCREEN
+
+    private val mockResources = mock<Resources>()
+
+    private val context =
+        object : ContextWrapper(appContext) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    @After
+    fun tearDown() {
+        ShadowUtils.reset()
+    }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(PowerUsageSummaryScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_configTrue_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
+    fun getIcon_whenHomePageRevampFlagOn() {
+        assertThat(preferenceScreenCreator.getIcon(context))
+            .isEqualTo(R.drawable.ic_settings_battery_filled)
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
+    fun getIcon_whenHomePageRevampFlagOff() {
+        assertThat(preferenceScreenCreator.getIcon(context))
+            .isEqualTo(R.drawable.ic_settings_battery_white)
+    }
+
+    override fun migration() {
+        ShadowUtils.setIsBatteryPresent(false)
+
+        super.migration()
+    }
+
+    override fun launchFragmentScenario(fragmentClass: Class<PreferenceFragmentCompat>) =
+        FragmentScenario.launch(
+            fragmentClass,
+            themeResId = R.style.Theme_CollapsingToolbar_Settings,
+        )
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
index 19d5e593eff..04732288154 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
@@ -37,13 +37,13 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
@@ -82,7 +82,7 @@ public class PowerUsageSummaryTest {
         sAdditionalBatteryInfoIntent = new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
     }
 
-    @Mock private SettingsActivity mSettingsActivity;
+    @Mock private FragmentActivity mActivity;
     @Mock private LoaderManager mLoaderManager;
     @Mock private Loader<BatteryTip> mBatteryTipLoader;
     @Mock private Loader<BatteryInfo> mBatteryInfoLoader;
@@ -106,7 +106,7 @@ public class PowerUsageSummaryTest {
         mFragment = spy(new TestFragment(mRealContext, mLoaderManager));
         mFragment.initFeatureProvider();
         doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
-        when(mFragment.getActivity()).thenReturn(mSettingsActivity);
+        when(mFragment.getActivity()).thenReturn(mActivity);
         when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
                 .thenReturn(sAdditionalBatteryInfoIntent);
         mFragment.mBatteryUtils = Mockito.spy(new BatteryUtils(mRealContext));
diff --git a/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java b/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
index d961cdf161d..493fb01fa99 100644
--- a/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.mock;
@@ -23,6 +25,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.provider.Settings;
 
@@ -40,13 +43,16 @@ public class ButtonNavigationSettingsAssistControllerTest {
             "assistant_long_press_home_gesture";
 
     private Context mContext;
+    private PackageManager mPackageManager;
     private Resources mResources;
     private ButtonNavigationSettingsAssistController mController;
 
     @Before
     public void setUp() {
         mContext = spy(ApplicationProvider.getApplicationContext());
+        mPackageManager = mock(PackageManager.class);
         mResources = mock(Resources.class);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getResources()).thenReturn(mResources);
 
         mController = new ButtonNavigationSettingsAssistController(
@@ -97,4 +103,23 @@ public class ButtonNavigationSettingsAssistControllerTest {
                 Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(1);
     }
 
+    @Test
+    public void onPreferenceChange_preferenceChecked_valueTrue() {
+        mController.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_valueFalse() {
+        mController.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(0);
+    }
+
+    @Test
+    public void isAvailable_hasContextualSearchSystemFeature_shouldReturnFalse() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(true);
+        assertThat(mController.isAvailable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java
new file mode 100644
index 00000000000..cc710ec29e6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerForCameraPreferenceControllerTest {
+
+    private static final String KEY = "gesture_double_power_tap_launch_camera";
+    private Context mContext;
+    private Resources mResources;
+    private DoubleTapPowerForCameraPreferenceController mController;
+    private SelectorWithWidgetPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+        mController = new DoubleTapPowerForCameraPreferenceController(mContext, KEY);
+        mPreference = new SelectorWithWidgetPreference(mContext);
+    }
+
+    @Test
+    public void updateState_launchCameraEnabled_preferenceChecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_launchCameraDisabled_preferenceNotChecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerCameraLaunchEnabled_preferenceEnabled() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java
new file mode 100644
index 00000000000..c86a82edd0d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerForWalletPreferenceControllerTest {
+
+    private static final String KEY = "gesture_double_power_tap_launch_wallet";
+    private Context mContext;
+    private Resources mResources;
+    private DoubleTapPowerForWalletPreferenceController mController;
+    private SelectorWithWidgetPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+        mController = new DoubleTapPowerForWalletPreferenceController(mContext, KEY);
+        mPreference = new SelectorWithWidgetPreference(mContext);
+    }
+
+    @Test
+    public void updateState_launchWalletEnabled_preferenceChecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_launchWalletDisabled_preferenceNotChecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerWalletLaunchEnabled_preferenceEnabled() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java
new file mode 100644
index 00000000000..1ea2a4ed8bb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.IllustrationPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerIllustrationPreferenceControllerTest {
+
+    private static final String KEY = "gesture_double_tap_power_video";
+    private Application mContext;
+    private IllustrationPreference mPreference;
+    private DoubleTapPowerIllustrationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new IllustrationPreference(mContext);
+        mController = new DoubleTapPowerIllustrationPreferenceController(mContext, KEY);
+
+        PreferenceScreen mScreen = mock(PreferenceScreen.class);
+        when(mScreen.findPreference(KEY)).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_setDoubleTapPowerForCamera_showsCameraIllustration() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getLottieAnimationResId()).isEqualTo(R.drawable.quickly_open_camera);
+    }
+
+    @Test
+    public void updateState_setDoubleTapPowerForWallet_showsWalletIllustration() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getLottieAnimationResId())
+                .isEqualTo(R.drawable.double_tap_power_for_wallet);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java
new file mode 100644
index 00000000000..502e52ec6c3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerMainSwitchPreferenceControllerTest {
+
+    private static final String KEY = "gesture_double_tap_power_enabled_main_switch";
+
+    private Context mContext;
+    private Resources mResources;
+    private DoubleTapPowerMainSwitchPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+        mController = new DoubleTapPowerMainSwitchPreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureAvailable_preferenceEnabled() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureUnavailable_preferenceUnsupported() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isChecked_setDoubleTapPowerGestureEnabled_mainSwitchChecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_setDoubleTapPowerGestureDisabled_mainSwitchUnchecked() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_checkMainSwitch_doubleTapPowerGestureEnabled() {
+        mController.setChecked(true);
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void setChecked_uncheckMainSwitch_doubleTapPowerGestureDisabled() {
+        mController.setChecked(false);
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+                .isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index 72dd36e60a0..17b03f355bf 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -17,23 +17,37 @@
 package com.android.settings.gestures;
 
 import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+import static android.provider.Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
 
-import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF;
-import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON;
 import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.service.quickaccesswallet.Flags;
+import android.text.TextUtils;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -44,16 +58,22 @@ import org.robolectric.annotation.Config;
 @Config(shadows = SettingsShadowResources.class)
 public class DoubleTapPowerPreferenceControllerTest {
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private Context mContext;
     private ContentResolver mContentResolver;
     private DoubleTapPowerPreferenceController mController;
+    private Preference mPreference;
+    private PreferenceScreen mScreen;
     private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
 
     @Before
     public void setUp() {
-        mContext = RuntimeEnvironment.application;
+        mContext = RuntimeEnvironment.getApplication();
         mContentResolver = mContext.getContentResolver();
         mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+        mPreference = new Preference(mContext);
+        mScreen = mock(PreferenceScreen.class);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
     @After
@@ -62,7 +82,26 @@ public class DoubleTapPowerPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isAvailable_flagEnabled_configIsTrue_returnsTrue() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.TRUE);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isAvailable_flagEnabled_configIsFalse_returnsFalse() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.FALSE);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isAvailable_flagDisabled_configIsTrue_returnsTrue() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
                 Boolean.TRUE);
@@ -71,7 +110,8 @@ public class DoubleTapPowerPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_configIsTrue_shouldReturnFalse() {
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isAvailable_flagDisabled_configIsFalse_returnsFalse() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
                 Boolean.FALSE);
@@ -80,43 +120,63 @@ public class DoubleTapPowerPreferenceControllerTest {
     }
 
     @Test
-    public void testIsChecked_configIsNotSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
-        mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenNotAvailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, false);
 
-        assertThat(mController.isChecked()).isTrue();
+        assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue();
     }
 
     @Test
-    public void testIsChecked_configIsSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
-        mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_enableFlag_doubleTapPower_falseWhenNotVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true);
+        // No stored value in shared preferences if not visited yet.
+        final SharedPreferences prefs =
+                new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
 
-        assertThat(mController.isChecked()).isFalse();
+        assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
     }
 
     @Test
-    public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true);
+        // No stored value in shared preferences if not visited yet.
+        final SharedPreferences prefs =
+                new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
+        prefs.edit().putBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(isSuggestionComplete(mContext, prefs)).isTrue();
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_disableFlag_doubleTapPower_trueWhenNotAvailable() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
 
-        assertThat(isSuggestionComplete(mContext, null/* prefs */)).isTrue();
+        assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue();
     }
 
     @Test
-    public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() {
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_disableFlag_doubleTapPower_falseWhenNotVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
         final SharedPreferences prefs =
                 new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
+
         assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
     }
 
     @Test
-    public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void isSuggestionCompleted_disableFlag_doubleTapPower_trueWhenVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
@@ -128,21 +188,92 @@ public class DoubleTapPowerPreferenceControllerTest {
     }
 
     @Test
-    public void isSliceableCorrectKey_returnsTrue() {
-        final DoubleTapPowerPreferenceController controller =
-                new DoubleTapPowerPreferenceController(mContext, "gesture_double_tap_power");
-        assertThat(controller.isSliceable()).isTrue();
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void displayPreference_flagDisabled_doubleTapPowerLegacyTitleIsDisplayed() {
+        mController.displayPreference(mScreen);
+
+        assertThat(
+                        TextUtils.equals(
+                                mPreference.getTitle(),
+                                mContext.getText(R.string.double_tap_power_for_camera_title)))
+                .isTrue();
     }
 
     @Test
-    public void isSliceableIncorrectKey_returnsFalse() {
-        final DoubleTapPowerPreferenceController controller =
-                new DoubleTapPowerPreferenceController(mContext, "bad_key");
-        assertThat(controller.isSliceable()).isFalse();
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getSummary_flagDisabled_doubleTapPowerEnabled_returnsOn() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+        assertThat(
+                        TextUtils.equals(
+                                mController.getSummary(),
+                                mContext.getText(R.string.gesture_setting_on)))
+                .isTrue();
     }
 
     @Test
-    public void isPublicSlice_returnTrue() {
-        assertThat(mController.isPublicSlice()).isTrue();
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getSummary_flagDisabled_doubleTapPowerDisabled_returnsOff() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+
+        assertThat(
+                        TextUtils.equals(
+                                mController.getSummary(),
+                                mContext.getText(R.string.gesture_setting_off)))
+                .isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getSummary_flagEnabled_doubleTapPowerDisabled_returnsOff() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(
+                mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 0 /* OFF */);
+
+        assertThat(
+                        TextUtils.equals(
+                                mController.getSummary(),
+                                mContext.getText(R.string.gesture_setting_off)))
+                .isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getSummary_flagEnabled_doubleTapPowerEnabled_cameraTargetAction_returnsSummary() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(
+                mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 1 /* ON */);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+        assertThat(
+                        TextUtils.equals(
+                                mController.getSummary(),
+                                mContext.getString(
+                                        R.string.double_tap_power_summary,
+                                        mContext.getText(R.string.gesture_setting_on),
+                                        mContext.getText(
+                                                R.string.double_tap_power_camera_action_summary))))
+                .isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getSummary_flagEnabled_doubleTapPowerEnabled_walletTargetAction_returnsSummary() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(
+                mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 1 /* ON */);
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+        assertThat(
+                        TextUtils.equals(
+                                mController.getSummary(),
+                                mContext.getString(
+                                        R.string.double_tap_power_summary,
+                                        mContext.getText(R.string.gesture_setting_on),
+                                        mContext.getText(
+                                                R.string.double_tap_power_wallet_action_summary))))
+                .isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index a08b81800a4..7d4f52e67a2 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -18,9 +18,16 @@ package com.android.settings.gestures;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.SearchIndexableResource;
+import android.service.quickaccesswallet.Flags;
+
+import com.android.settings.R;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -31,6 +38,7 @@ import java.util.List;
 @RunWith(RobolectricTestRunner.class)
 public class DoubleTapPowerSettingsTest {
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private DoubleTapPowerSettings mSettings;
 
     @Before
@@ -39,12 +47,38 @@ public class DoubleTapPowerSettingsTest {
     }
 
     @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getPreferenceScreenResId_flagEnabled_returnsFlagEnabledResId() {
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.double_tap_power_settings);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void getPreferenceScreenResId_flagDisabled_returnsFlagDisabledResId() {
+        assertThat(mSettings.getPreferenceScreenResId())
+                .isEqualTo(R.xml.double_tap_power_to_open_camera_settings);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void testSearchIndexProvider_flagEnabled_shouldIndexFlagEnabledResource() {
         final List<SearchIndexableResource> indexRes =
-            DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                RuntimeEnvironment.application, true /* enabled */);
+                DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.getApplication(), true /* enabled */);
 
         assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.double_tap_power_settings);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+    public void testSearchIndexProvider_flagDisabled_shouldIndexFlagDisabledResource() {
+        final List<SearchIndexableResource> indexRes =
+                DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.getApplication(), true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId)
+                .isEqualTo(R.xml.double_tap_power_to_open_camera_settings);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java
new file mode 100644
index 00000000000..817f198a5b2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.OFF;
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerSettingsUtilsTest {
+
+    private static final int DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE = 0;
+    private static final int DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE = 1;
+
+    private Context mContext;
+    private Resources mResources;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureAvailable_setAvailable_returnsTrue() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureAvailable_setUnavailable_returnsFalse() {
+        when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureEnabled_setEnabled_returnsTrue() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+                ON);
+
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureEnabled_setDisabled_returnsFalse() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+                OFF);
+
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureEnabled_valueNotSet_returnsTrue() {
+        assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void setDoubleTapPowerButtonGestureEnabled_setEnabled_returnsEnabled() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+                                OFF))
+                .isEqualTo(ON);
+    }
+
+    @Test
+    public void setDoubleTapPowerButtonGestureEnabled_setDisabled_returnsDisabled() {
+        DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+                                ON))
+                .isEqualTo(OFF);
+    }
+
+    @Test
+    public void isDoubleTapPowerButtonGestureForCameraLaunchEnabled_valueSetToCamera_returnsTrue() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+                DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+
+        assertThat(
+                        DoubleTapPowerSettingsUtils
+                                .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void
+            isDoubleTapPowerButtonGestureForCameraLaunchEnabled_valueNotSetToCamera_returnsFalse() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+                DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+
+        assertThat(
+                        DoubleTapPowerSettingsUtils
+                                .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void
+            isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultSetToCamera_returnsTrue() {
+        when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction))
+                .thenReturn(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+
+        assertThat(
+                        DoubleTapPowerSettingsUtils
+                                .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void
+            isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultNotCamera_returnsFalse() {
+        when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction))
+                .thenReturn(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+
+        assertThat(
+                        DoubleTapPowerSettingsUtils
+                                .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void setDoubleTapPowerButtonForCameraLaunch_setGestureBehaviorToCameraLaunch() {
+        boolean result =
+                DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+        assertThat(result).isTrue();
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+                                DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE))
+                .isEqualTo(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+    }
+
+    @Test
+    public void setDoubleTapPowerButtonForWalletLaunch_setGestureBehaviorToWalletLaunch() {
+        boolean result =
+                DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+        assertThat(result).isTrue();
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+                                DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE))
+                .isEqualTo(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java
new file mode 100644
index 00000000000..54d17ba258c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.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.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(AndroidJUnit4.class)
+@Config(shadows = SettingsShadowResources.class)
+public class DoubleTapPowerToOpenCameraPreferenceControllerTest {
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private Context mContext;
+    private Resources mResources;
+    private DoubleTapPowerToOpenCameraPreferenceController mController;
+    private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.getApplication());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+        mController =
+                new DoubleTapPowerToOpenCameraPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureDisabled_preferenceUnsupported() {
+        when(mResources.getBoolean(R.bool.config_cameraDoubleTapPowerGestureEnabled))
+                .thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_setDoubleTapPowerGestureEnabled_preferenceSupported() {
+        when(mResources.getBoolean(R.bool.config_cameraDoubleTapPowerGestureEnabled))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_configIsNotSet_returnsTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_setConfigFalse_returnsFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_setConfigTrue_returnsFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_checkToggle_cameraDoubleTapPowerGestureEnabled() {
+        mController.setChecked(true);
+
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                                OFF))
+                .isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_uncheckToggle_cameraDoubleTapPowerGestureDisabled() {
+        mController.setChecked(false);
+
+        assertThat(
+                        Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                                ON))
+                .isEqualTo(OFF);
+    }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final DoubleTapPowerToOpenCameraPreferenceController controller =
+                new DoubleTapPowerToOpenCameraPreferenceController(
+                        mContext, "gesture_double_tap_power");
+
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final DoubleTapPowerToOpenCameraPreferenceController controller =
+                new DoubleTapPowerToOpenCameraPreferenceController(mContext, "bad_key");
+
+        assertThat(controller.isSliceable()).isFalse();
+    }
+
+    @Test
+    public void isPublicSlice_returnTrue() {
+        assertThat(mController.isPublicSlice()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java b/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java
new file mode 100644
index 00000000000..a4744dbc690
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
+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.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
+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 = ShadowDeviceConfig.class)
+public class NavigationSettingsContextualSearchControllerTest {
+
+    private static final String KEY_PRESS_HOLD_FOR_SEARCH = "search_gesture_press_hold";
+
+    private NavigationSettingsContextualSearchController mController;
+    private Context mContext;
+    private PackageManager mPackageManager;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mPackageManager = mock(PackageManager.class);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new NavigationSettingsContextualSearchController(
+                mContext, KEY_PRESS_HOLD_FOR_SEARCH);
+    }
+
+    @Test
+    public void isAvailable_hasContextualSearchSystemFeature_shouldReturnTrue() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_doesNotHaveContextualSearchSystemFeature_shouldReturnFalse() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_noDefault_true() {
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_valueFalse_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, 0);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_valueTrue_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, 1);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_valueTrue() {
+        mController.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, -1)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_valueFalse() {
+        mController.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, -1)).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
index 9633b15bec4..a03ca6192b6 100644
--- a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settings.gestures.OneHandedSettings.ONE_HANDED_SHORTCUT_KEY;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.spy;
@@ -23,14 +25,19 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.os.SystemProperties;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.SearchIndexableResource;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
+import com.android.settingslib.search.SearchIndexableRaw;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -43,12 +50,16 @@ import java.util.List;
 @RunWith(RobolectricTestRunner.class)
 public class OneHandedSettingsTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private OneHandedSettings mSettings;
 
     @Before
     public void setUp() {
         mSettings = spy(new OneHandedSettings());
+        SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
     }
 
     @Test
@@ -102,4 +113,35 @@ public class OneHandedSettingsTest {
         final boolean isEnabled = (Boolean) obj;
         assertThat(isEnabled).isFalse();
     }
+
+    @Test
+    @DisableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_flagDisabled_isEmpty() {
+        final List<SearchIndexableRaw> rawData = OneHandedSettings
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+        final List<String> actualSearchKeys = rawData.stream().map(raw -> raw.key).toList();
+
+        assertThat(actualSearchKeys).isEmpty();
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getRawDataToIndex_returnsOnlyShortcutKey() {
+        final List<SearchIndexableRaw> rawData = OneHandedSettings
+                .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+        final List<String> actualSearchKeys = rawData.stream().map(raw -> raw.key).toList();
+
+        assertThat(actualSearchKeys).containsExactly(ONE_HANDED_SHORTCUT_KEY);
+    }
+
+    @Test
+    public void getNonIndexableKeys_containsNonSearchableElements() {
+        final List<String> niks = OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+
+        assertThat(niks).containsExactly(
+                "gesture_one_handed_mode_intro",
+                "one_handed_header",
+                "one_handed_mode_footer");
+    }
 }
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 06cd726a538..35fa6d806a3 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
@@ -25,8 +25,12 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -39,6 +43,9 @@ public class ConditionManagerTest {
 
     private static final long ID = 123L;
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private ConditionalCardController mController;
     @Mock
@@ -66,6 +73,22 @@ public class ConditionManagerTest {
         assertThat(mManager.getDisplayableCards()).isEmpty();
     }
 
+    @Test
+    @DisableFlags(android.app.Flags.FLAG_MODES_UI)
+    public void cardControllers_beforeModesUi_includesDnd() {
+        ConditionManager manager = new ConditionManager(mContext, mConditionListener);
+        assertThat(manager.mCardControllers.stream()
+                .filter(c -> c instanceof DndConditionCardController).toList()).hasSize(1);
+    }
+
+    @Test
+    @EnableFlags(android.app.Flags.FLAG_MODES_UI)
+    public void cardControllers_doesNotIncludeDnd() {
+        ConditionManager manager = new ConditionManager(mContext, mConditionListener);
+        assertThat(manager.mCardControllers.stream()
+                .filter(c -> c instanceof DndConditionCardController).toList()).isEmpty();
+    }
+
     @Test
     public void onPrimaryClick_shouldRelayToController() {
         mManager.onPrimaryClick(mContext, ID);
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
index 8ac5a5dee65..b385b2f32a5 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
@@ -18,39 +18,59 @@ package com.android.settings.inputmethod;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.hardware.input.InputSettings;
 import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.widget.RadioGroup;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
+        ShadowAlertDialogCompat.class,
 })
 public class KeyboardAccessibilityBounceKeysControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    private static final String PREFERENCE_KEY = "keyboard_a11y_page_bounce_keys";
+    @Mock
+    private Preference mPreference;
     private Context mContext;
     private KeyboardAccessibilityBounceKeysController mKeyboardAccessibilityBounceKeysController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
+        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
         mKeyboardAccessibilityBounceKeysController = new KeyboardAccessibilityBounceKeysController(
                 mContext,
-                "accessibility_bounce_keys");
+                PREFERENCE_KEY);
+        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
     }
 
     @Test
@@ -82,4 +102,28 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
 
         assertThat(isEnabled).isFalse();
     }
+
+    @Test
+    public void handlePreferenceTreeClick_dialogShows() {
+        mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+
+        assertThat(alertDialog.isShowing()).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
+        mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
+        radioGroup.check(R.id.input_setting_keys_value_200);
+
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        ShadowLooper.idleMainLooper();
+
+        assertThat(alertDialog.isShowing()).isFalse();
+        int threshold = InputSettings.getAccessibilityBounceKeysThreshold(mContext);
+        assertThat(threshold).isEqualTo(200);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
index 59224970b56..fdb4ab96bc4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
@@ -50,7 +50,7 @@ public class KeyboardAccessibilityMouseKeysControllerTest {
         mContext = RuntimeEnvironment.application;
         mKeyboardAccessibilityMouseKeysController = new KeyboardAccessibilityMouseKeysController(
                 mContext,
-                "accessibility_mouse_keys");
+                "keyboard_a11y_page_mouse_keys");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
index 5f6908aae25..9f82b759cdc 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
@@ -18,39 +18,59 @@ package com.android.settings.inputmethod;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.hardware.input.InputSettings;
 import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.widget.RadioGroup;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
+        ShadowAlertDialogCompat.class,
 })
 public class KeyboardAccessibilitySlowKeysControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    private static final String PREFERENCE_KEY = "keyboard_a11y_page_slow_keys";
+    @Mock
+    private Preference mPreference;
     private Context mContext;
     private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
+        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
         mKeyboardAccessibilitySlowKeysController = new KeyboardAccessibilitySlowKeysController(
                 mContext,
-                "accessibility_slow_keys");
+                PREFERENCE_KEY);
+        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
     }
 
     @Test
@@ -82,4 +102,28 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
 
         assertThat(isEnabled).isFalse();
     }
+
+    @Test
+    public void handlePreferenceTreeClick_dialogShows() {
+        mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+
+        assertThat(alertDialog.isShowing()).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_performClickOn200_updatesSlowKeysThreshold() {
+        mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
+        radioGroup.check(R.id.input_setting_keys_value_200);
+
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        ShadowLooper.idleMainLooper();
+
+        assertThat(alertDialog.isShowing()).isFalse();
+        int threshold = InputSettings.getAccessibilitySlowKeysThreshold(mContext);
+        assertThat(threshold).isEqualTo(200);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
index 06cb5585456..4631f571697 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
@@ -50,7 +50,7 @@ public class KeyboardAccessibilityStickyKeysControllerTest {
         mContext = RuntimeEnvironment.application;
         mKeyboardAccessibilityStickyKeysController = new KeyboardAccessibilityStickyKeysController(
                 mContext,
-                "accessibility_sticky_keys");
+                "keyboard_a11y_page_sticky_keys");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysControllerTest.java
new file mode 100644
index 00000000000..d511edcf4ee
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysControllerTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+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 = {
+        com.android.settings.testutils.shadow.ShadowFragment.class,
+})
+public class KeyboardRepeatKeysControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private Context mContext;
+
+    private KeyboardRepeatKeysController mKeyboardRepeatKeysController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mKeyboardRepeatKeysController = new KeyboardRepeatKeysController(mContext,
+                "physical_keyboard_repeat_keys");
+    }
+
+    @Test
+    @EnableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsEnabled_isAvailable() {
+        assertThat(mKeyboardRepeatKeysController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsDisabled_notSupport() {
+        assertThat(mKeyboardRepeatKeysController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isChecked_sameWithInputSettingValue() {
+        boolean isRepeatKeysEnabled = InputSettings.isRepeatKeysEnabled(mContext);
+        assertThat(mKeyboardRepeatKeysController.isChecked()).isEqualTo(isRepeatKeysEnabled);
+    }
+
+    @Test
+    public void setChecked_updatesInputSettingValue() {
+        mKeyboardRepeatKeysController.setChecked(false);
+
+        assertThat(InputSettings.isRepeatKeysEnabled(mContext)).isEqualTo(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceControllerTest.java
new file mode 100644
index 00000000000..0f2deacbcdd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysDelayPreferenceControllerTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+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 = {
+        com.android.settings.testutils.shadow.ShadowFragment.class,
+})
+public class KeyboardRepeatKeysDelayPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private Context mContext;
+    private KeyboardRepeatKeysDelayPreferenceController mRepeatKeysDelayPreferenceController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mRepeatKeysDelayPreferenceController = new KeyboardRepeatKeysDelayPreferenceController(
+                mContext, "repeat_keys_delay_preference");
+    }
+
+    @Test
+    @EnableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsEnabled_isAvailable() {
+        assertThat(mRepeatKeysDelayPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsDisabled_notSupport() {
+        assertThat(mRepeatKeysDelayPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void setSliderPosition_updatesInputSettingValue() {
+        int sliderPosition = 1;
+        mRepeatKeysDelayPreferenceController.setSliderPosition(sliderPosition);
+        assertThat(InputSettings.getRepeatKeysDelay(mContext)).isEqualTo(
+                KeyboardRepeatKeysDelayPreferenceController.REPEAT_KEY_DELAY_VALUE_LIST.get(
+                        sliderPosition));
+    }
+
+    @Test
+    public void getSliderPosition_matchesWithDelayValue() {
+        int timeout = InputSettings.getRepeatKeysDelay(mContext);
+        assertThat(mRepeatKeysDelayPreferenceController.getSliderPosition()).isEqualTo(
+                KeyboardRepeatKeysDelayPreferenceController.REPEAT_KEY_DELAY_VALUE_LIST.indexOf(
+                        timeout));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceControllerTest.java
new file mode 100644
index 00000000000..f192c0ca5ed
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardRepeatKeysTimeOutPreferenceControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+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 = {
+        com.android.settings.testutils.shadow.ShadowFragment.class,
+})
+public class KeyboardRepeatKeysTimeOutPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private Context mContext;
+    private KeyboardRepeatKeysTimeOutPreferenceController
+            mKeyboardRepeatKeysTimeOutPreferenceController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mKeyboardRepeatKeysTimeOutPreferenceController =
+                new KeyboardRepeatKeysTimeOutPreferenceController(mContext,
+                        "repeat_keys_timeout_preference");
+    }
+
+    @Test
+    @EnableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsEnabled_isAvailable() {
+        assertThat(mKeyboardRepeatKeysTimeOutPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(FLAG_KEYBOARD_REPEAT_KEYS)
+    public void getAvailabilityStatus_flagIsDisabled_notSupport() {
+        assertThat(mKeyboardRepeatKeysTimeOutPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void setSliderPosition_updatesInputSettingValue() {
+        int sliderPosition = 1;
+        mKeyboardRepeatKeysTimeOutPreferenceController.setSliderPosition(sliderPosition);
+        assertThat(InputSettings.getRepeatKeysTimeout(mContext)).isEqualTo(
+                KeyboardRepeatKeysTimeOutPreferenceController.REPEAT_KEY_TIMEOUT_VALUE_LIST.get(
+                        sliderPosition));
+    }
+
+    @Test
+    public void getSliderPosition_matchesWithTimeoutValue() {
+        int timeout = InputSettings.getRepeatKeysTimeout(mContext);
+        assertThat(mKeyboardRepeatKeysTimeOutPreferenceController.getSliderPosition()).isEqualTo(
+                KeyboardRepeatKeysTimeOutPreferenceController.REPEAT_KEY_TIMEOUT_VALUE_LIST.indexOf(
+                        timeout));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceControllerTest.java
new file mode 100644
index 00000000000..a962b1ade14
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceControllerTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.hardware.input.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link MouseReverseVerticalScrollingPreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+})
+public class MouseReverseVerticalScrollingPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "mouse_reverse_vertical_scrolling";
+    private static final String SETTING_KEY = Settings.System.MOUSE_REVERSE_VERTICAL_SCROLLING;
+
+    private Context mContext;
+    private MouseReverseVerticalScrollingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MouseReverseVerticalScrollingPreferenceController(
+                mContext, PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void getAvailabilityStatus_expected() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void getAvailabilityStatus_flagIsDisabled_notSupport() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void setChecked_true_shouldReturn1() {
+        mController.setChecked(true);
+
+        boolean isEnabled = InputSettings.isMouseReverseVerticalScrollingEnabled(mContext);
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void setChecked_false_shouldReturn0() {
+        mController.setChecked(false);
+
+        boolean isEnabled = InputSettings.isMouseReverseVerticalScrollingEnabled(mContext);
+        assertThat(isEnabled).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void isChecked_providerPutInt1_returnTrue() {
+        Settings.System.putIntForUser(
+                mContext.getContentResolver(),
+                SETTING_KEY,
+                1,
+                UserHandle.USER_CURRENT);
+
+        boolean result = mController.isChecked();
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_REVERSE_VERTICAL_SCROLLING)
+    public void isChecked_providerPutInt0_returnFalse() {
+        Settings.System.putIntForUser(
+                mContext.getContentResolver(),
+                SETTING_KEY,
+                0,
+                UserHandle.USER_CURRENT);
+
+        boolean result = mController.isChecked();
+
+        assertThat(result).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/MouseSettingsControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/MouseSettingsControllerTest.java
new file mode 100644
index 00000000000..b5e0a843587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/MouseSettingsControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.view.InputDevice;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link TouchpadSettingsController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+        ShadowInputDevice.class,
+})
+public class MouseSettingsControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    private static final String PREFERENCE_KEY = "keyboard_mouse_settings";
+
+    private Context mContext;
+    private MouseSettingsController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MouseSettingsController(mContext, PREFERENCE_KEY);
+        ShadowInputDevice.reset();
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_flagIsDisable_returnsUnavailable() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        ShadowInputDevice.addDevice(deviceId, ShadowInputDevice.makeInputDevicebyId(deviceId));
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_isMouse_returnsAvailable() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_MOUSE);
+        ShadowInputDevice.addDevice(deviceId, device);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceControllerTest.java
new file mode 100644
index 00000000000..fe401f29c5a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceControllerTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.hardware.input.InputSettings;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.hardware.input.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link MouseReverseVerticalScrollingPreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+})
+public class MouseSwapPrimaryButtonPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "mouse_swap_primary_button";
+    private static final String SETTING_KEY = Settings.System.MOUSE_SWAP_PRIMARY_BUTTON;
+
+    private Context mContext;
+    private MouseSwapPrimaryButtonPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MouseSwapPrimaryButtonPreferenceController(
+                mContext, PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void getAvailabilityStatus_expected() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void getAvailabilityStatus_flagIsDisabled_notSupport() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void setChecked_true_shouldReturn1() {
+        mController.setChecked(true);
+
+        boolean isEnabled = InputSettings.isMouseSwapPrimaryButtonEnabled(mContext);
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void setChecked_false_shouldReturn0() {
+        mController.setChecked(false);
+
+        boolean isEnabled = InputSettings.isMouseSwapPrimaryButtonEnabled(mContext);
+        assertThat(isEnabled).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void isChecked_providerPutInt1_returnTrue() {
+        Settings.System.putIntForUser(
+                mContext.getContentResolver(),
+                SETTING_KEY,
+                1,
+                UserHandle.USER_CURRENT);
+
+        boolean result = mController.isChecked();
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MOUSE_SWAP_PRIMARY_BUTTON)
+    public void isChecked_providerPutInt0_returnFalse() {
+        Settings.System.putIntForUser(
+                mContext.getContentResolver(),
+                SETTING_KEY,
+                0,
+                UserHandle.USER_CURRENT);
+
+        boolean result = mController.isChecked();
+
+        assertThat(result).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceControllerTest.java
new file mode 100644
index 00000000000..5c6dd14d841
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardA11yPreferenceControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.view.InputDevice;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link PhysicalKeyboardA11yPreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowInputDevice.class,
+})
+public class PhysicalKeyboardA11yPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+    private static final String PREFERENCE_KEY = "physical_keyboard_a11y";
+    private Context mContext;
+    private PhysicalKeyboardA11yPreferenceController mController;
+    @Mock
+    InputDevice mInputDevice;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new PhysicalKeyboardA11yPreferenceController(mContext, PREFERENCE_KEY);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_expected() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        when(mInputDevice.isVirtual()).thenReturn(false);
+        when(mInputDevice.isFullKeyboard()).thenReturn(true);
+
+        ShadowInputDevice.addDevice(deviceId, mInputDevice);
+
+        assertThat(InputDevice.getDeviceIds()).isNotEmpty();
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_deviceIsNotAsExpected_unavailable() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        when(mInputDevice.isVirtual()).thenReturn(true);
+        when(mInputDevice.isFullKeyboard()).thenReturn(false);
+
+        ShadowInputDevice.addDevice(deviceId, mInputDevice);
+
+        assertThat(InputDevice.getDeviceIds()).isNotEmpty();
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/TrackpadSettingsControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TouchpadAndMouseSettingsControllerTest.java
similarity index 77%
rename from tests/robotests/src/com/android/settings/inputmethod/TrackpadSettingsControllerTest.java
rename to tests/robotests/src/com/android/settings/inputmethod/TouchpadAndMouseSettingsControllerTest.java
index bb97d716ead..9d3cc5ff77f 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/TrackpadSettingsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/TouchpadAndMouseSettingsControllerTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assume.assumeTrue;
 import android.content.Context;
 import android.view.InputDevice;
 
+import androidx.preference.Preference;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.core.BasePreferenceController;
@@ -39,28 +40,45 @@ import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/** Tests for {@link TrackpadSettingsController} */
+/** Tests for {@link TouchpadAndMouseSettingsController} */
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowSystemSettings.class,
         ShadowInputDevice.class,
 })
-public class TrackpadSettingsControllerTest {
+public class TouchpadAndMouseSettingsControllerTest {
     @Rule
     public MockitoRule rule = MockitoJUnit.rule();
 
     private static final String PREFERENCE_KEY = "trackpad_settings";
 
     private Context mContext;
-    private TrackpadSettingsController mController;
+    private TouchpadAndMouseSettingsController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
-        mController = new TrackpadSettingsController(mContext, PREFERENCE_KEY);
+        mController = new TouchpadAndMouseSettingsController(mContext, PREFERENCE_KEY);
+        mPreference = new Preference(mContext);
         ShadowInputDevice.reset();
     }
 
+    @Test
+    public void updateState_setTitleBasedOnDeviceSource() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_TOUCHPAD);
+        ShadowInputDevice.addDevice(deviceId, device);
+        String expectedTitle = mContext.getString(
+                InputPeripheralsSettingsUtils.getTouchpadAndMouseTitleTitleResId());
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getTitle()).isEqualTo(expectedTitle);
+    }
+
     @Test
     public void getAvailabilityStatus_isTouchpadAvailable() {
         int deviceId = 1;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/TouchpadSettingsControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TouchpadSettingsControllerTest.java
new file mode 100644
index 00000000000..9f47991af14
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/TouchpadSettingsControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.view.InputDevice;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link TouchpadSettingsController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+        ShadowInputDevice.class,
+})
+public class TouchpadSettingsControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    private static final String PREFERENCE_KEY = "keyboard_touchpad_settings";
+
+    private Context mContext;
+    private TouchpadSettingsController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new TouchpadSettingsController(mContext, PREFERENCE_KEY);
+        ShadowInputDevice.reset();
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_flagIsDisable_returnsUnavailable() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        ShadowInputDevice.addDevice(deviceId, ShadowInputDevice.makeInputDevicebyId(deviceId));
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_KEYBOARD_AND_TOUCHPAD_A11Y_NEW_PAGE_ENABLED)
+    public void getAvailabilityStatus_isTouchpad_returnsAvailable() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_TOUCHPAD);
+        ShadowInputDevice.addDevice(deviceId, device);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceControllerTest.java
new file mode 100644
index 00000000000..b39fb3cb7c6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/TouchpadThreeFingerTapPreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
+
+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.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+import android.view.InputDevice;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+import com.android.settings.testutils.shadow.ShadowSystemSettings;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link TouchpadThreeFingerTapPreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowSystemSettings.class,
+        ShadowInputDevice.class,
+})
+public class TouchpadThreeFingerTapPreferenceControllerTest {
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
+    @Mock
+    LifecycleOwner mLifecycleOwner;
+
+    private Context mContext;
+    private TouchpadThreeFingerTapPreferenceController mController;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mController = new TouchpadThreeFingerTapPreferenceController(mContext, "three_finger_tap");
+        ShadowInputDevice.reset();
+    }
+
+    @Test
+    @EnableFlags(com.android.hardware.input.Flags.FLAG_TOUCHPAD_THREE_FINGER_TAP_SHORTCUT)
+    public void getAvailabilityStatus_flagEnabledHasTouchPad() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_TOUCHPAD);
+        ShadowInputDevice.addDevice(deviceId, device);
+
+        assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(com.android.hardware.input.Flags.FLAG_TOUCHPAD_THREE_FINGER_TAP_SHORTCUT)
+    public void getAvailabilityStatus_flagEnabledNoTouchPad() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_BLUETOOTH_STYLUS);
+        ShadowInputDevice.addDevice(deviceId, device);
+
+        assertEquals(mController.getAvailabilityStatus(), CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @DisableFlags(com.android.hardware.input.Flags.FLAG_TOUCHPAD_THREE_FINGER_TAP_SHORTCUT)
+    public void getAvailabilityStatus_flagDisabled() {
+        int deviceId = 1;
+        ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+        InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+                InputDevice.SOURCE_TOUCHPAD);
+        ShadowInputDevice.addDevice(deviceId, device);
+
+        assertEquals(mController.getAvailabilityStatus(), CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void onPause_logCurrentFillValue() {
+        int customizationValue = 1;
+        Settings.System.putIntForUser(mContext.getContentResolver(),
+                Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION, customizationValue,
+                UserHandle.USER_CURRENT);
+
+        mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                    any(), eq(SettingsEnums.ACTION_TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION_CHANGED),
+                    eq(customizationValue));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
index 375e1520096..1e85fbf5d92 100644
--- a/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.admin.DevicePolicyResourcesManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.UserInfo;
@@ -83,6 +84,8 @@ public class LocationInjectedServicesPreferenceControllerTest {
     private AppSettingsInjector mSettingsInjector;
     @Mock
     private DevicePolicyManager mDevicePolicyManager;
+    @Mock
+    private DevicePolicyResourcesManager mDevicePolicyResourcesManager;
 
     private Context mContext;
     private LocationInjectedServicesPreferenceController mController;
@@ -104,6 +107,7 @@ public class LocationInjectedServicesPreferenceControllerTest {
         when(mCategoryPrimary.getKey()).thenReturn(key);
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.getResources()).thenReturn(mDevicePolicyResourcesManager);
     }
 
     @Test
@@ -276,6 +280,7 @@ public class LocationInjectedServicesPreferenceControllerTest {
                 UserHandle.of(userId),
                 enforcingUsers);
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(componentName);
+        when(mDevicePolicyResourcesManager.getString(any(), any())).thenReturn(any());
 
         mController.displayPreference(mScreen);
 
diff --git a/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt b/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt
new file mode 100644
index 00000000000..1d1696d2d1a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.location.LocationManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class LocationScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = LocationScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_LOCATION_SETTINGS
+
+    private val mockLocationManager = mock<LocationManager>()
+
+    private val context =
+            object : ContextWrapper(appContext) {
+                override fun getSystemService(name: String): Any =
+                    when (name) {
+                        Context.LOCATION_SERVICE -> mockLocationManager
+                        else -> super.getSystemService(name)
+                    }
+            }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(LocationScreen.KEY)
+    }
+
+    @Test
+    fun getSummary_enableLocation_shouldReturnLoading() {
+        mockLocationManager.stub { on { isLocationEnabled } doReturn true }
+
+        assertThat(preferenceScreenCreator.getSummary(context)).isEqualTo(
+                context.getString(R.string.location_settings_loading_app_permission_stats))
+    }
+
+    @Test
+    fun getSummary_disableLocation_shouldReturnLocationOff() {
+        mockLocationManager.stub { on { isLocationEnabled } doReturn false }
+
+        assertThat(preferenceScreenCreator.getSummary(context)).isEqualTo(
+                context.getString(R.string.location_settings_summary_location_off))
+    }
+
+    override fun migration() {
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index e9284ee5b57..7673f38bccf 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -17,12 +17,15 @@ package com.android.settings.location;
 
 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.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.Intent;
+import android.location.LocationManager;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.view.LayoutInflater;
@@ -65,7 +68,8 @@ public class RecentLocationAccessPreferenceControllerTest {
     private DashboardFragment mDashboardFragment;
     @Mock
     private RecentAppOpsAccess mRecentLocationApps;
-
+    @Mock
+    private LocationManager mLocationManager;
     private Context mContext;
     private RecentLocationAccessPreferenceController mController;
     private View mAppEntitiesHeaderView;
@@ -130,4 +134,23 @@ public class RecentLocationAccessPreferenceControllerTest {
                 mContext.getContentResolver(), Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 1);
         verify(mLayoutPreference, Mockito.times(1)).addPreference(Mockito.any());
     }
+
+    @Test
+    public void testPreferenceClick_onExtraLocationPackage_startsExtraLocationActivity() {
+        String extraLocationPkgName = "extraLocationPkgName";
+        when(mContext.getSystemService(LocationManager.class)).thenReturn(mLocationManager);
+        when(mLocationManager.getExtraLocationControllerPackage()).thenReturn(extraLocationPkgName);
+        RecentLocationAccessPreferenceController.PackageEntryClickedListener listener =
+                new RecentLocationAccessPreferenceController.PackageEntryClickedListener(
+                        mContext, extraLocationPkgName, UserHandle.CURRENT);
+        doNothing().when(mContext).startActivityAsUser(Mockito.refEq(new Intent(
+                Settings.ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS)),
+                Mockito.eq(UserHandle.CURRENT));
+
+        listener.onPreferenceClick(mLayoutPreference);
+
+        verify(mContext).startActivityAsUser(Mockito.refEq(new Intent(
+                Settings.ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS)),
+                Mockito.eq(UserHandle.CURRENT));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityScreenTest.kt b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityScreenTest.kt
new file mode 100644
index 00000000000..f575fe78256
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityScreenTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class AdaptiveConnectivityScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = AdaptiveConnectivityScreen()
+    override val flagName
+        get() = Flags.FLAG_CATALYST_ADAPTIVE_CONNECTIVITY
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(AdaptiveConnectivityScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
index c95797f3e34..02d233864e9 100644
--- a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
@@ -36,10 +36,11 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class AdaptiveConnectivityTogglePreferenceControllerTest {
 
-    private static final String PREF_KEY = "adaptive_connectivity";
+    private static final String PREF_KEY = "adaptive_connectivity_enabled";
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -87,3 +88,4 @@ public class AdaptiveConnectivityTogglePreferenceControllerTest {
         verify(mWifiManager).setWifiScoringEnabled(false);
     }
 }
+// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
new file mode 100644
index 00000000000..a06a1fe70d0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.ContextWrapper
+import android.net.wifi.WifiManager
+import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.MainSwitchPreference
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class AdaptiveConnectivityTogglePreferenceTest {
+    private val mockWifiManager = mock<WifiManager>()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when {
+                    name == getSystemServiceName(WifiManager::class.java) -> mockWifiManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    private val adaptiveConnectivityTogglePreference = AdaptiveConnectivityTogglePreference()
+
+    @Test
+    fun switchClick_defaultDisabled_returnFalse() {
+        setAdaptiveConnectivityEnabled(false)
+
+        assertThat(getMainSwitchPreference().isChecked).isFalse()
+    }
+
+    @Test
+    fun switchClick_defaultEnabled_returnTrue() {
+        setAdaptiveConnectivityEnabled(true)
+
+        assertThat(getMainSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun setChecked_defaultEnabled_updatesCorrectly() {
+        val preference = getMainSwitchPreference()
+        assertThat(preference.isChecked).isTrue()
+
+        preference.performClick()
+
+        assertThat(preference.isChecked).isFalse()
+
+        preference.performClick()
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    @Test
+    fun storeSetTrue_wifiManagerSetWifiScoringEnabled() {
+        setAdaptiveConnectivityEnabled(true)
+
+        assertThat(getAdaptiveConnectivityEnabled()).isTrue()
+        verify(mockWifiManager).setWifiScoringEnabled(true)
+    }
+
+    @Test
+    fun storeSetFalse_wifiManagerSetWifiScoringDisabled() {
+        setAdaptiveConnectivityEnabled(false)
+
+        assertThat(getAdaptiveConnectivityEnabled()).isFalse()
+        verify(mockWifiManager).setWifiScoringEnabled(false)
+    }
+
+    private fun getMainSwitchPreference(): MainSwitchPreference =
+        adaptiveConnectivityTogglePreference.createAndBindWidget(context)
+
+    private fun setAdaptiveConnectivityEnabled(enabled: Boolean) =
+        adaptiveConnectivityTogglePreference
+            .storage(context)
+            .setBoolean(ADAPTIVE_CONNECTIVITY_ENABLED, enabled)
+
+    private fun getAdaptiveConnectivityEnabled() =
+        adaptiveConnectivityTogglePreference
+            .storage(context)
+            .getBoolean(ADAPTIVE_CONNECTIVITY_ENABLED)
+}
+// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceTest.kt b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceTest.kt
new file mode 100644
index 00000000000..a0f380fa5ec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceTest.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.ContextWrapper
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.FEATURE_LEANBACK
+import android.content.res.Resources
+import android.provider.Settings
+import android.telephony.TelephonyManager
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.datastore.SettingsGlobalStore
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class AirplaneModePreferenceTest {
+
+    private val mockResources = mock<Resources>()
+    private val mockPackageManager = mock<PackageManager>()
+    private var mockTelephonyManager = mock<TelephonyManager>()
+
+    private val context = ApplicationProvider.getApplicationContext<Context>()
+    private val contextWrapper =
+        object : ContextWrapper(context) {
+            override fun getResources(): Resources = mockResources
+
+            override fun getPackageManager(): PackageManager = mockPackageManager
+
+            override fun getSystemService(name: String): Any? =
+                when (name) {
+                    getSystemServiceName(TelephonyManager::class.java) -> mockTelephonyManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    private val airplaneModePreference = AirplaneModePreference()
+
+    @Test
+    fun isAvailable_hasConfigAndNoFeatureLeanback_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+        mockPackageManager.stub { on { hasSystemFeature(FEATURE_LEANBACK) } doReturn false }
+
+        assertThat(airplaneModePreference.isAvailable(contextWrapper)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_noConfig_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+        mockPackageManager.stub { on { hasSystemFeature(FEATURE_LEANBACK) } doReturn false }
+
+        assertThat(airplaneModePreference.isAvailable(contextWrapper)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_hasFeatureLeanback_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+        mockPackageManager.stub { on { hasSystemFeature(FEATURE_LEANBACK) } doReturn true }
+
+        assertThat(airplaneModePreference.isAvailable(contextWrapper)).isFalse()
+    }
+
+    @Test
+    fun getValue_defaultOn_returnOn() {
+        SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 1)
+
+        val getValue =
+            airplaneModePreference.storage(context).getBoolean(AirplaneModePreference.KEY)
+
+        assertThat(getValue).isTrue()
+    }
+
+    @Test
+    fun getValue_defaultOff_returnOff() {
+        SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 0)
+
+        val getValue =
+            airplaneModePreference.storage(context).getBoolean(AirplaneModePreference.KEY)
+
+        assertThat(getValue).isFalse()
+    }
+
+    @Test
+    fun performClick_defaultOn_checkedIsFalse() {
+        SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 1)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun performClick_defaultOff_checkedIsTrue() {
+        SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 0)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    private fun getSwitchPreference(): SwitchPreferenceCompat =
+        airplaneModePreference.createAndBindWidget(context)
+}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt
new file mode 100644
index 00000000000..1d7a1d989e4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MobileNetworkListScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = MobileNetworkListScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_MOBILE_NETWORK_LIST
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(MobileNetworkListScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
new file mode 100644
index 00000000000..13e568d5880
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowConnectivityManager
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowConnectivityManager::class])
+class NetworkDashboardScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = NetworkDashboardScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_NETWORK_PROVIDER_AND_INTERNET_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(NetworkDashboardScreen.KEY)
+    }
+
+    override fun migration() {
+        // Avoid thread hanging when invoke TetheringManager.isTetheringSupported
+        ShadowConnectivityManager.getShadow().setTetheringSupported(true)
+
+        // ignore the test temporarily, @Ignore does not work as expected
+        // super.migration()
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt b/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt
new file mode 100644
index 00000000000..d8888c5cc3c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class NetworkProviderScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = NetworkProviderScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_INTERNET_SETTINGS
+
+    private val mockResources = mock<Resources>()
+
+    private val context =
+        object : ContextWrapper(appContext) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(NetworkProviderScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_showInternetSettings_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_notShowInternetSettings_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    override fun migration() {}
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
index 400f73f7f56..9c881fe41bb 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -70,6 +70,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
@@ -98,6 +99,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowToast;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
@@ -165,6 +167,7 @@ public class NetworkProviderSettingsTest {
         });
         doReturn(mContext).when(mNetworkProviderSettings).getContext();
         doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
+        doReturn(null).when(mNetworkProviderSettings).getPreferenceScreenBindingKey(mContext);
         doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
         doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
@@ -190,6 +193,9 @@ public class NetworkProviderSettingsTest {
                 .when(mFirstWifiEntryPreferenceCategory).getKey();
         mNetworkProviderSettings.mFirstWifiEntryPreferenceCategory =
                 mFirstWifiEntryPreferenceCategory;
+
+        ReflectionHelpers.setField(mNetworkProviderSettings, "mDashboardFeatureProvider",
+                mock(DashboardFeatureProvider.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
deleted file mode 100644
index d8895d5ddd6..00000000000
--- a/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
+++ /dev/null
@@ -1,625 +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.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.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.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.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.os.PersistableBundle;
-import android.os.UserManager;
-import android.telephony.CarrierConfigManager;
-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 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)
-@Config(shadows = {
-        com.android.settings.testutils.shadow.ShadowFragment.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 UserManager mUserManager;
-    @Mock
-    private ProxySubscriptionManager mProxySubscriptionMgr;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Captor
-    private ArgumentCaptor<Uri> mUriCaptor;
-
-    private ApnEditor mApnEditorUT;
-    private Context mContext;
-    private Resources mResources;
-    private PersistableBundle mBundle = new PersistableBundle();
-
-    @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();
-
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        doReturn(true).when(mUserManager).isAdminUser();
-        doReturn(false).when(mUserManager)
-                .hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-        doReturn(mCarrierConfigManager).when(mContext)
-                .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt());
-
-        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 getApnDataFromUri_emptyCursor_returnsNull() {
-        var mockContentResolver = mock(ContentResolver.class);
-        var mockCursor = mock(Cursor.class);
-        doReturn(mockContentResolver).when(mActivity).getContentResolver();
-        when(mockContentResolver.query(any(), any(), any(), any(), any())).thenReturn(mockCursor);
-        when(mockCursor.moveToFirst()).thenReturn(false);
-
-        var apnData = mApnEditorUT.getApnDataFromUri(mock(Uri.class));
-
-        assertThat(apnData).isNull();
-    }
-
-    @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
-    public void testDeleteApnData_shouldNotPresentMenuWhenNotSupportAdding() {
-        mBundle.putBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL, false);
-
-        MenuItem item = Mockito.mock(MenuItem.class);
-        Menu menu = Mockito.mock(Menu.class);
-        doReturn(item).when(menu).add(anyInt(), anyInt(), anyInt(), anyInt());
-
-        mApnEditorUT.getCarrierCustomizedConfig(mContext);
-        mApnEditorUT.onCreateOptionsMenu(menu, null);
-
-        verify(menu, times(0)).add(anyInt(), eq(ApnEditor.MENU_DELETE), anyInt(), anyInt());
-    }
-
-    @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
-    public void onCreate_notAdminUser_shouldFinish() {
-        doReturn(false).when(mUserManager).isAdminUser();
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void onCreate_hasUserRestriction_shouldFinish() {
-        doReturn(true).when(mUserManager)
-                .hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    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/tether/TetherScreenTest.kt b/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt
new file mode 100644
index 00000000000..f3d1d394e30
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.tether
+
+import android.net.TetheringManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowConnectivityManager
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal
+import com.android.settingslib.Utils
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.Implementation
+import org.robolectric.annotation.Implements
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowConnectivityManager::class, ShadowRestrictedLockUtilsInternal::class,
+    ShadowTetheringManager::class])
+class TetherScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = TetherScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_TETHER_SETTINGS
+
+    // TODO: Remove override (See b/368359963#comment7)
+    override fun migration() {}
+
+    @Before
+    fun setUp() {
+        ShadowConnectivityManager.getShadow().setTetheringSupported(true)
+    }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(TetherScreen.KEY)
+    }
+
+    @Test
+    fun getPreferenceTitle_tetherConfigDisallowed_shouldShowAll() {
+        ShadowRestrictedLockUtilsInternal.setRestricted(true)
+
+        assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo(
+                appContext.getString(R.string.tether_settings_title_all))
+    }
+
+    @Test
+    fun getPreferenceTitle_tetherConfigAllowed_shouldShowTetheringLabel() {
+        ShadowRestrictedLockUtilsInternal.setRestricted(false)
+        val tm = appContext.getSystemService(TetheringManager::class.java)
+
+        assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo(
+                appContext.getText(Utils.getTetheringLabel(tm)))
+    }
+
+    @Test
+    fun isAvailable_tetherIsAvailable_shouldReturnTrue() {
+        ShadowRestrictedLockUtilsInternal.setRestricted(false)
+
+        assertThat(preferenceScreenCreator.isAvailable(appContext)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_tetherIsUnavailable_shouldReturnFalse() {
+        ShadowRestrictedLockUtilsInternal.setRestricted(true)
+
+        assertThat(preferenceScreenCreator.isAvailable(appContext)).isFalse()
+    }
+}
+
+@Implements(TetheringManager::class)
+class ShadowTetheringManager {
+    private val emptyArray = arrayOf<String>()
+
+    @Implementation
+    fun getTetheredIfaces() = emptyArray
+
+    @Implementation
+    fun getTetherableIfaces() = emptyArray
+
+    @Implementation
+    fun getTetherableWifiRegexs() = emptyArray
+
+    @Implementation
+    fun getTetherableUsbRegexs() = emptyArray
+
+    @Implementation
+    fun getTetherableBluetoothRegexs() = emptyArray
+}
diff --git a/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
index 4e0fb03cefe..8c537e036cc 100644
--- a/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
@@ -54,7 +54,7 @@ import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.wifi.tether.WifiTetherPreferenceController;
 import com.android.settingslib.RestrictedSwitchPreference;
 
@@ -130,14 +130,12 @@ public class TetherSettingsTest {
     }
 
     @Test
-    @Config(shadows = ShadowRestrictedSettingsFragment.class)
+    @Config(shadows = ShadowRestrictedDashboardFragment.class)
     public void onCreate_isUiRestricted_doNotSetupViewModel() {
-        doNothing().when(mTetherSettings).addPreferencesFromResource(anyInt());
         when(mTetherSettings.isUiRestricted()).thenReturn(true);
 
         mTetherSettings.onCreate(null);
 
-        verify(mTetherSettings).addPreferencesFromResource(anyInt());
         verify(mTetherSettings, never()).setupViewModel();
     }
 
@@ -454,8 +452,8 @@ public class TetherSettingsTest {
         }
     }
 
-    @Implements(RestrictedSettingsFragment.class)
-    public static final class ShadowRestrictedSettingsFragment {
+    @Implements(RestrictedDashboardFragment.class)
+    public static final class ShadowRestrictedDashboardFragment {
         @Implementation
         public void onCreate(Bundle icicle) {
             // do nothing
diff --git a/tests/robotests/src/com/android/settings/notification/BundleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BundleGlobalPreferenceControllerTest.java
new file mode 100644
index 00000000000..c389247389f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/BundleGlobalPreferenceControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.service.notification.Adjustment.KEY_IMPORTANCE;
+import static android.service.notification.Adjustment.KEY_TYPE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Flags;
+import android.app.INotificationManager;
+import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class BundleGlobalPreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "preference_key";
+
+    private Context mContext;
+    BundleGlobalPreferenceController mController;
+    @Mock
+    INotificationManager mInm;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSetFlagsRule.enableFlags(
+                android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION,
+                Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        mController = new BundleGlobalPreferenceController(mContext, PREFERENCE_KEY);
+        mController.mBackend.setNm(mInm);
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasSupports_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasDoesNotSupport_shouldReturnFalse() throws Exception {
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_flagDisabledNasSupports_shouldReturnFalse() {
+        mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked() throws Exception {
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isChecked()).isTrue();
+
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_IMPORTANCE));
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked() throws Exception {
+        mController.setChecked(false);
+        verify(mInm).disallowAssistantAdjustment(KEY_TYPE);
+
+        mController.setChecked(true);
+        verify(mInm).allowAssistantAdjustment(KEY_TYPE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BundlePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BundlePreferenceControllerTest.java
new file mode 100644
index 00000000000..75da895c88c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/BundlePreferenceControllerTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.service.notification.Adjustment.KEY_IMPORTANCE;
+import static android.service.notification.Adjustment.KEY_TYPE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import android.app.Flags;
+import android.app.INotificationManager;
+import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class BundlePreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "preference_key";
+
+    private Context mContext;
+    BundlePreferenceController mController;
+    @Mock
+    INotificationManager mInm;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSetFlagsRule.enableFlags(
+                android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION,
+                Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        mController = new BundlePreferenceController(mContext, PREFERENCE_KEY);
+        mController.mBackend.setNm(mInm);
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasSupports_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasDoesNotSupport_shouldReturnFalse() throws Exception {
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_flagDisabledNasSupports_shouldReturnFalse() {
+        mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getSummary() throws Exception {
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.getSummary()).isEqualTo("On");
+
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_IMPORTANCE));
+        assertThat(mController.getSummary()).isEqualTo("Off");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BundleTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BundleTypePreferenceControllerTest.java
new file mode 100644
index 00000000000..68bb1bb276e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/BundleTypePreferenceControllerTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.service.notification.Adjustment.KEY_TYPE;
+import static android.service.notification.Adjustment.TYPE_CONTENT_RECOMMENDATION;
+import static android.service.notification.Adjustment.TYPE_NEWS;
+import static android.service.notification.Adjustment.TYPE_PROMOTION;
+import static android.service.notification.Adjustment.TYPE_SOCIAL_MEDIA;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Flags;
+import android.app.INotificationManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+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 org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class BundleTypePreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "preference_key";
+
+    private Context mContext;
+    BundleTypePreferenceController mController;
+    @Mock
+    INotificationManager mInm;
+
+    @Before
+    public void setUp() throws RemoteException {
+        MockitoAnnotations.initMocks(this);
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of());
+        mSetFlagsRule.enableFlags(
+                android.service.notification.Flags.FLAG_NOTIFICATION_CLASSIFICATION,
+                Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        mContext = RuntimeEnvironment.application;
+        mController = new BundleTypePreferenceController(mContext, PREFERENCE_KEY);
+        mController.mBackend.setNm(mInm);
+    }
+
+    @Test
+    public void isAvailable() throws RemoteException {
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasDoesNotSupport_shouldReturnFalse()
+            throws RemoteException {
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of(KEY_TYPE));
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_flagDisabledNasSupports_shouldReturnFalse() throws RemoteException {
+        mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of());
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_flagEnabledNasDisabled_shouldReturnFalse() throws RemoteException {
+        when(mInm.getUnsupportedAdjustmentTypes()).thenReturn(List.of());
+        when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of());
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_promotions() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.PROMO_KEY);
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{TYPE_PROMOTION});
+        assertThat(mController.isChecked()).isTrue();
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{});
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_news() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.NEWS_KEY);
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{TYPE_NEWS});
+        assertThat(mController.isChecked()).isTrue();
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{});
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_social() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.SOCIAL_KEY);
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{TYPE_SOCIAL_MEDIA});
+        assertThat(mController.isChecked()).isTrue();
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{});
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_recs() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.RECS_KEY);
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(
+                new int[]{TYPE_CONTENT_RECOMMENDATION});
+        assertThat(mController.isChecked()).isTrue();
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(new int[]{});
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_mixed() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.RECS_KEY);
+
+        when(mInm.getAllowedAdjustmentKeyTypes()).thenReturn(
+                new int[]{TYPE_PROMOTION, TYPE_CONTENT_RECOMMENDATION});
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked() throws RemoteException {
+        mController = new BundleTypePreferenceController(mContext,
+                BundleTypePreferenceController.PROMO_KEY);
+        mController.setChecked(false);
+        verify(mInm).setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, false);
+
+        mController.setChecked(true);
+        verify(mInm).setAssistantAdjustmentKeyTypeState(TYPE_PROMOTION, true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
index ed65d5b9432..f9f3be753f5 100644
--- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
@@ -36,6 +36,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 public class CallVolumePreferenceControllerTest {
     private static final String TEST_KEY = "Test_Key";
@@ -108,3 +109,4 @@ public class CallVolumePreferenceControllerTest {
         assertThat(mController.isPublicSlice()).isTrue();
     }
 }
+// LINT.ThenChange(CallVolumePreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceTest.kt
new file mode 100644
index 00000000000..d6bc6d0a675
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceTest.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.ContextWrapper
+import android.content.res.Resources
+import android.media.AudioManager
+import android.media.AudioManager.STREAM_BLUETOOTH_SCO
+import android.media.AudioManager.STREAM_VOICE_CALL
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class CallVolumePreferenceTest {
+    private var audioHelper = mock<AudioHelper>()
+    private var mockResources = mock<Resources>()
+
+    private var audioManager: AudioManager? = null
+
+    private var callVolumePreference = CallVolumePreference()
+    private val context = object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+        override fun getSystemService(name: String): Any? =
+            when (name) {
+                Context.AUDIO_SERVICE -> audioManager
+                else -> super.getSystemService(name)
+            }
+
+        override fun getResources(): Resources = mockResources
+    }
+
+    @Test
+    fun isAvailable_configTrueAndNoSingleVolume_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+        audioHelper = mock { on { isSingleVolume } doReturn false }
+        callVolumePreference = spy(callVolumePreference).stub {
+            onGeneric { createAudioHelper(context) } doReturn audioHelper
+        }
+
+        assertThat(callVolumePreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configTrueAndSingleVolume_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+        audioHelper = mock { on { isSingleVolume } doReturn true }
+        callVolumePreference = spy(callVolumePreference).stub {
+            onGeneric { createAudioHelper(context) } doReturn audioHelper
+        }
+
+        assertThat(callVolumePreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(callVolumePreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    @Suppress("DEPRECATION")
+    fun getAudioStream_onBluetoothScoOn_shouldEqualToStreamBluetoothSco() {
+        audioManager = mock { on { isBluetoothScoOn } doReturn true }
+
+        assertThat(callVolumePreference.getAudioStream(context)).isEqualTo(STREAM_BLUETOOTH_SCO)
+    }
+
+    @Test
+    @Suppress("DEPRECATION")
+    fun getAudioStream_onBluetoothScoOff_shouldEqualToStreamVoiceCall() {
+        audioManager = mock { on { isBluetoothScoOn } doReturn false }
+
+        assertThat(callVolumePreference.getAudioStream(context)).isEqualTo(STREAM_VOICE_CALL)
+    }
+}
+// LINT.ThenChange(CallVolumePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index c6511ef3cf5..362660860f9 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -39,6 +39,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
@@ -123,3 +124,4 @@ public class DialPadTonePreferenceControllerTest {
         assertThat(System.getInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1)).isEqualTo(0);
     }
 }
+// LINT.ThenChange(DialPadTonePreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
new file mode 100644
index 00000000000..ef14166dd64
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.ContextWrapper
+import android.provider.Settings.System.DTMF_TONE_WHEN_DIALING
+import android.telephony.TelephonyManager
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class DialPadTonePreferenceTest {
+    private var telephonyManager: TelephonyManager? = null
+
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when (name) {
+                    Context.TELEPHONY_SERVICE -> telephonyManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    private val dialPadTonePreference = DialPadTonePreference()
+
+    @Test
+    fun isAvailable_voiceCapable_shouldReturnTrue() {
+        telephonyManager = mock { on { isVoiceCapable } doReturn true }
+
+        assertThat(dialPadTonePreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_noVoicCapable_shouldReturnFalse() {
+        telephonyManager = mock { on { isVoiceCapable } doReturn false }
+
+        assertThat(dialPadTonePreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun performClick_shouldPreferenceChangeToChecked() {
+        enableDialPadTone(false)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    @Test
+    fun performClick_shouldPreferenceChangeToUnchecked() {
+        enableDialPadTone(true)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun dialToneEnabled_shouldCheckedPreference() {
+        enableDialPadTone(true)
+
+        assertThat(getSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun dialToneDisabled_shouldUncheckedPreference() {
+        enableDialPadTone(false)
+
+        assertThat(getSwitchPreference().isChecked).isFalse()
+    }
+
+    private fun getSwitchPreference(): SwitchPreferenceCompat =
+        dialPadTonePreference.createAndBindWidget(context)
+
+    private fun enableDialPadTone(enabled: Boolean) =
+        SettingsSystemStore.get(context).setBoolean(DTMF_TONE_WHEN_DIALING, enabled)
+}
+// LINT.ThenChange(DialPadTonePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleControllerTest.java b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleControllerTest.java
new file mode 100644
index 00000000000..ea556a592d8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleControllerTest.java
@@ -0,0 +1,354 @@
+/*
+ * 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.notification;
+
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS;
+import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
+
+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.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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 java.util.Arrays;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowUtils.class,
+        ShadowRestrictedLockUtilsInternal.class,
+})
+public class LockScreenNotificationShowSensitiveToggleControllerTest {
+
+    @Mock
+    private DevicePolicyManager mDpm;
+    @Mock
+    UserManager mUm;
+    @Mock
+    KeyguardManager mKm;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private Context mMockContext;
+
+    private Context mContext;
+    private LockScreenNotificationShowSensitiveToggleController mController;
+    private LockScreenNotificationShowSensitiveToggleController mWorkController;
+    private RestrictedSwitchPreference mPreference;
+    private RestrictedSwitchPreference mWorkPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+
+        FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
+        when(featureFactory.securityFeatureProvider.getLockPatternUtils(mMockContext))
+                .thenReturn(mLockPatternUtils);
+        when(mMockContext.getContentResolver()).thenReturn(mContext.getContentResolver());
+        when(mMockContext.getSystemService(UserManager.class)).thenReturn(mUm);
+        when(mMockContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDpm);
+        when(mMockContext.getSystemService(KeyguardManager.class)).thenReturn(mKm);
+        when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(new UserInfo(0, "", 0)));
+
+        mController = new LockScreenNotificationShowSensitiveToggleController(
+                mMockContext,
+                LockScreenNotificationShowSensitiveToggleController.KEY_SHOW_SENSITIVE
+        );
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(
+                mController.getPreferenceKey())).thenReturn(mPreference);
+
+        when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(
+                new UserInfo(5, "", 0),
+                new UserInfo(10, "", UserInfo.FLAG_MANAGED_PROFILE | UserInfo.FLAG_PROFILE)));
+        mWorkController = new LockScreenNotificationShowSensitiveToggleController(
+                mMockContext,
+                LockScreenNotificationShowSensitiveToggleController.KEY_SHOW_SENSITIVE_WORK_PROFILE
+        );
+        mWorkPreference = new RestrictedSwitchPreference(mContext);
+        mWorkPreference.setKey(mWorkController.getPreferenceKey());
+        when(mScreen.findPreference(
+                mWorkController.getPreferenceKey())).thenReturn(mWorkPreference);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowRestrictedLockUtilsInternal.reset();
+    }
+
+    @Test
+    public void profileUserIds() {
+        assertThat(mController.mWorkProfileUserId).isEqualTo(0);
+        assertThat(mWorkController.mWorkProfileUserId).isEqualTo(10);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noSecureLockscreen() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 10);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noWorkProfile() {
+        // reset controllers with no work profile
+        when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(
+                new UserInfo(UserHandle.myUserId(), "", 0)));
+        mWorkController = new LockScreenNotificationShowSensitiveToggleController(
+                mMockContext,
+                LockScreenNotificationShowSensitiveToggleController.KEY_SHOW_SENSITIVE_WORK_PROFILE
+        );
+        mController = new LockScreenNotificationShowSensitiveToggleController(mMockContext,
+                LockScreenNotificationShowSensitiveToggleController.KEY_SHOW_SENSITIVE);
+
+        // should otherwise show
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void displayPreference_adminSaysNoRedaction() {
+        ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
+                KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
+
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isDisabledByAdmin()).isTrue();
+        mWorkController.displayPreference(mScreen);
+        assertThat(mWorkPreference.isDisabledByAdmin()).isTrue();
+    }
+
+    @Test
+    public void displayPreference_adminSaysNoSecure() {
+        ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
+                KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isDisabledByAdmin()).isTrue();
+        mWorkController.displayPreference(mScreen);
+        assertThat(mWorkPreference.isDisabledByAdmin()).isTrue();
+    }
+
+    @Test
+    public void displayPreference() {
+        ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(0);
+
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isDisabledByAdmin()).isFalse();
+        mWorkController.displayPreference(mScreen);
+        assertThat(mWorkPreference.isDisabledByAdmin()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_adminSaysNoNotifications() {
+        when(mDpm.getKeyguardDisabledFeatures(eq(null), anyInt())).thenReturn(
+                KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+
+        // should show
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 10);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noNotifications() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                0, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                0, 10);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_workProfileLocked() {
+        // should otherwise show
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 10);
+
+        when(mKm.isDeviceLocked(10)).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_show() {
+        // should show
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_NOTIFICATIONS,
+                1, 10);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void isChecked() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                0, 0);
+
+        assertThat(mController.isChecked()).isTrue();
+
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 0);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_work() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                0, 10);
+
+        assertThat(mWorkController.isChecked()).isTrue();
+
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 10);
+
+        assertThat(mWorkController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_admin() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 0);
+
+        ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
+                KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_false() throws Exception {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                0, 0);
+
+        mController.setChecked(false);
+        assertThat(Settings.Secure.getIntForUser(
+                mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void setChecked_workProfile_true() throws Exception {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 10);
+
+        mWorkController.setChecked(true);
+        assertThat(Settings.Secure.getIntForUser(
+                mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 10))
+                .isEqualTo(0);
+    }
+
+    @Test
+    public void setChecked_true() throws Exception {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                1, 10);
+
+        mController.setChecked(true);
+        mWorkController.setChecked(true);
+        assertThat(Settings.Secure.getIntForUser(
+                mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 10))
+                .isEqualTo(0);
+        assertThat(Settings.Secure.getIntForUser(
+                mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0))
+                .isEqualTo(0);
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java
new file mode 100644
index 00000000000..472d9cb6f65
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+// TODO(b/367455695): remove test when feature flag is cleaned
+@RunWith(RobolectricTestRunner.class)
+public class LockScreenNotificationsPreferencePageControllerTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PREFERENCE_KEY = "lock_screen_notifications_page";
+
+    private LockScreenNotificationsPreferencePageController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new LockScreenNotificationsPreferencePageController(
+                RuntimeEnvironment.application,
+                PREFERENCE_KEY);
+    }
+
+    @Test
+    public void isAvailable_flagEnabled_shouldReturnTrue() {
+        mSetFlagsRule.enableFlags(Flags.FLAG_NOTIFICATION_LOCK_SCREEN_SETTINGS);
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isAvailable_flagDisabled_shouldReturnFalse() {
+        mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_LOCK_SCREEN_SETTINGS);
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceControllerTest.java
new file mode 100644
index 00000000000..86dc06fc4d1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceControllerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM;
+
+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.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import org.junit.Before;
+import org.junit.Rule;
+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;
+
+@RunWith(RobolectricTestRunner.class)
+public class LockscreenNotificationMinimalismPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private LockscreenNotificationMinimalismPreferenceController mController;
+    private Preference mPreference;
+    static final int ON = 1;
+    static final int OFF = 0;
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        doReturn(mock(DevicePolicyManager.class)).when(mContext)
+                .getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mController = new LockscreenNotificationMinimalismPreferenceController(mContext,
+                "key");
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    @DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
+    public void display_featureFlagOff_shouldNotDisplay() {
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
+    public void display_featureFlagOn_shouldDisplay() {
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
+    public void isChecked_settingIsOff_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                LOCK_SCREEN_NOTIFICATION_MINIMALISM, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
+    public void isChecked_settingIsOn_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index a25f47200a3..2965acfa3fb 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -58,6 +58,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = MediaVolumePreferenceControllerTest.ShadowSliceBackgroundWorker.class)
 public class MediaVolumePreferenceControllerTest {
@@ -269,3 +270,4 @@ public class MediaVolumePreferenceControllerTest {
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 }
+// LINT.ThenChange(MediaVolumePreference.kt)
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceTest.kt
new file mode 100644
index 00000000000..383acfbc277
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.content.res.Resources
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class MediaVolumePreferenceTest {
+    private val mockResources = mock<Resources>()
+
+    private val mediaVolumePreference = MediaVolumePreference()
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    @Test
+    fun isAvailable_configTrue_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(mediaVolumePreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(mediaVolumePreference.isAvailable(context)).isFalse()
+    }
+}
+// LINT.ThenChange(MediaVolumePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
index 9b510fb43e3..0a953615abf 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java
@@ -31,8 +31,6 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.settings.R;
-
 import com.google.common.base.Strings;
 
 import org.junit.Test;
@@ -45,15 +43,14 @@ import org.robolectric.RuntimeEnvironment;
 public class NotificationAccessConfirmationActivityTest {
 
     @Test
-    public void start_showsDialog() {
+    public void start_withMissingIntentFilter_finishes() {
         ComponentName cn = new ComponentName("com.example", "com.example.SomeService");
         installPackage(cn.getPackageName(), "X");
 
         NotificationAccessConfirmationActivity activity = startActivityWithIntent(cn);
 
-        assertThat(activity.isFinishing()).isFalse();
-        assertThat(getDialogText(activity)).isEqualTo(
-                activity.getString(R.string.notification_listener_security_warning_summary, "X"));
+        assertThat(getDialogText(activity)).isNull();
+        assertThat(activity.isFinishing()).isTrue();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 24e845851a4..9e49653c233 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -21,17 +21,22 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.media.RingtoneManager;
+import android.media.audio.Flags;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.telephony.TelephonyManager;
 
+
 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 org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(RobolectricTestRunner.class)
 public class PhoneRingtonePreferenceControllerTest {
@@ -39,32 +44,59 @@ public class PhoneRingtonePreferenceControllerTest {
     @Mock
     private TelephonyManager mTelephonyManager;
 
-    private Context mContext;
+    @Mock
+    private Context mMockContext;
+
+    @Mock
+    private Resources mMockResources;
+
     private PhoneRingtonePreferenceController mController;
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-        mContext = RuntimeEnvironment.application;
-        mController = new PhoneRingtonePreferenceController(mContext);
+        when(mMockContext.getResources()).thenReturn(mMockResources);
+        when(mMockContext.getSystemService(
+                Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        mController = new PhoneRingtonePreferenceController(mMockContext);
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
     public void isAvailable_notVoiceCapable_shouldReturnFalse() {
+        when(mMockResources
+                .getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
+                .thenReturn(false);
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
     public void isAvailable_VoiceCapable_shouldReturnTrue() {
+        when(mMockResources
+                .getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
+                .thenReturn(false);
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
+    public void isAvailable_vibrationSupported_shouldReturnFalse() {
+        when(mMockResources
+                .getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
+                .thenReturn(true);
+        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
     @Test
     public void getRingtoneType_shouldReturnRingtone() {
         assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_RINGTONE);
diff --git a/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceControllerTest.java
index 2974af6f185..a243643d38a 100644
--- a/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceControllerTest.java
@@ -41,6 +41,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowDeviceConfig.class})
 public class SeparateRingVolumePreferenceControllerTest {
@@ -108,3 +109,4 @@ public class SeparateRingVolumePreferenceControllerTest {
     }
 
 }
+// LINT.ThenChange(SeparateRingVolumePreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceTest.kt
new file mode 100644
index 00000000000..0cdd7c0b01c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SeparateRingVolumePreferenceTest.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.media.AudioManager
+import android.media.AudioManager.RINGER_MODE_NORMAL
+import android.media.AudioManager.RINGER_MODE_SILENT
+import android.media.AudioManager.RINGER_MODE_VIBRATE
+import android.os.Vibrator
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class SeparateRingVolumePreferenceTest {
+    private var audioHelper = mock<AudioHelper>()
+    private var audioManager = mock<AudioManager>()
+    private var vibrator: Vibrator? = null
+    private var ringVolumePreference = SeparateRingVolumePreference()
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when (name) {
+                    getSystemServiceName(Vibrator::class.java) -> vibrator
+                    getSystemServiceName(AudioManager::class.java) -> audioManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    @Test
+    fun isAvailable_singleVolume_shouldReturnFalse() {
+        audioHelper = mock { on { isSingleVolume } doReturn true }
+        ringVolumePreference =
+            spy(ringVolumePreference).stub {
+                onGeneric { createAudioHelper(context) } doReturn audioHelper
+            }
+
+        assertThat(ringVolumePreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun isAvailable_noSingleVolume_shouldReturnTrue() {
+        audioHelper = mock { on { isSingleVolume } doReturn false }
+        ringVolumePreference =
+            spy(ringVolumePreference).stub {
+                onGeneric { createAudioHelper(context) } doReturn audioHelper
+            }
+
+        assertThat(ringVolumePreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun getEffectiveRingerMode_noVibratorAndVibrateMode_shouldReturnSilentMode() {
+        vibrator = mock { on { hasVibrator() } doReturn false }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getEffectiveRingerMode()).isEqualTo(RINGER_MODE_SILENT)
+    }
+
+    @Test
+    fun getEffectiveRingerMode_hasVibratorAndVibrateMode_shouldReturnVibrateMode() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getEffectiveRingerMode()).isEqualTo(RINGER_MODE_VIBRATE)
+    }
+
+    @Test
+    fun getEffectiveRingerMode_hasVibratorAndNormalMode_shouldReturnNormalMode() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_NORMAL }
+
+        assertThat(context.getEffectiveRingerMode()).isEqualTo(RINGER_MODE_NORMAL)
+    }
+
+    @Test
+    fun getIconRes_normalMode_shouldReturnRingVolumeIcon() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_NORMAL }
+
+        assertThat(context.getIconRes()).isEqualTo(R.drawable.ic_ring_volume)
+    }
+
+    @Test
+    fun getMuteIcon_vibrateMode_shouldReturnVibrateIcon() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getIconRes()).isEqualTo(R.drawable.ic_volume_ringer_vibrate)
+    }
+
+    @Test
+    fun getMuteIcon_silentMode_shouldReturnSilentIcon() {
+        vibrator = mock { on { hasVibrator() } doReturn false }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getIconRes()).isEqualTo(R.drawable.ic_ring_volume_off)
+    }
+
+    @Test
+    fun getContentDescription_normalMode_shouldReturnTitleDescription() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_NORMAL }
+
+        assertThat(context.getContentDescription())
+            .isEqualTo(context.getString(R.string.separate_ring_volume_option_title))
+    }
+
+    @Test
+    fun getContentDescription_vibrateMode_shouldReturnVibrateModeDescription() {
+        vibrator = mock { on { hasVibrator() } doReturn true }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getContentDescription())
+            .isEqualTo(context.getString(R.string.ringer_content_description_vibrate_mode))
+    }
+
+    @Test
+    fun getContentDescription_silentMode_shouldReturnSilentModeDescription() {
+        vibrator = mock { on { hasVibrator() } doReturn false }
+        audioManager = mock { on { getRingerModeInternal() } doReturn RINGER_MODE_VIBRATE }
+
+        assertThat(context.getContentDescription())
+            .isEqualTo(context.getString(R.string.ringer_content_description_silent_mode))
+    }
+}
+// LINT.ThenChange(SeparateRingVolumePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java
index cc26e542dc4..8877f300e22 100644
--- a/tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java
@@ -29,12 +29,16 @@ import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -53,6 +57,8 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
 
     private ShowOnlyUnseenNotificationsOnLockscreenPreferenceController mController;
     private Preference mPreference;
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     @Before
     public void setUp() {
@@ -67,12 +73,14 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
     }
 
     @Test
+    @DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
     public void display_configUnset_shouldNotDisplay() {
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
+    @DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
     public void display_configSet_showDisplay() {
         Settings.Secure.putInt(mContext.getContentResolver(),
                 LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);
@@ -80,6 +88,15 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
         assertThat(mPreference.isVisible()).isTrue();
     }
 
+    @Test
+    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
+    public void display_configUnset_minimalismEnabled_shouldDisplay() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, ON);
+        mController.displayPreference(mScreen);
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
     @Test
     public void isChecked_settingIsOff_shouldReturnFalse() {
         Settings.Secure.putInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/notification/SoundScreenTest.kt b/tests/robotests/src/com/android/settings/notification/SoundScreenTest.kt
new file mode 100644
index 00000000000..1333ed5e4cc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SoundScreenTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SoundScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = SoundScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_SOUND_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(SoundScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java
index 8b8c77e9f30..a8de8ef533e 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java
@@ -89,15 +89,6 @@ public class BundleListPreferenceControllerTest {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mGroupList = new PreferenceCategory(mContext);
         mPreferenceScreen.addPreference(mGroupList);
-
-        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID)).thenReturn(
-                new NotificationChannel(PROMOTIONS_ID, PROMOTIONS_ID, 2));
-        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID)).thenReturn(
-                new NotificationChannel(NEWS_ID, NEWS_ID, 2));
-        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID)).thenReturn(
-                new NotificationChannel(SOCIAL_MEDIA_ID, SOCIAL_MEDIA_ID, 2));
-        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID)).thenReturn(
-                new NotificationChannel(RECS_ID, RECS_ID, 2));
     }
 
     @Test
@@ -132,6 +123,14 @@ public class BundleListPreferenceControllerTest {
 
     @Test
     public void updateState() {
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID)).thenReturn(
+                new NotificationChannel(PROMOTIONS_ID, PROMOTIONS_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID)).thenReturn(
+                new NotificationChannel(NEWS_ID, NEWS_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID)).thenReturn(
+                new NotificationChannel(SOCIAL_MEDIA_ID, SOCIAL_MEDIA_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID)).thenReturn(
+                new NotificationChannel(RECS_ID, RECS_ID, 2));
         mController.updateState(mGroupList);
         assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
         assertThat(mGroupList.findPreference(PROMOTIONS_ID).getTitle()).isEqualTo(PROMOTIONS_ID);
@@ -142,19 +141,38 @@ public class BundleListPreferenceControllerTest {
     }
 
     @Test
-    public void updateState_updateChildren() {
+    public void updateState_noBundles() {
         mController.updateState(mGroupList);
-        assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
+        assertThat(mGroupList.getPreferenceCount()).isEqualTo(0);
+        assertThat(mGroupList.isVisible()).isFalse();
+    }
 
+    @Test
+    public void updateState_onlySomeBundlesUsed() {
         when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID)).thenReturn(
                 new NotificationChannel(PROMOTIONS_ID, PROMOTIONS_ID, 2));
+        mController.updateState(mGroupList);
+        assertThat(mGroupList.getPreferenceCount()).isEqualTo(1);
+        assertThat(mGroupList.findPreference(PROMOTIONS_ID).getTitle()).isEqualTo(PROMOTIONS_ID);
+    }
+
+    @Test
+    public void updateState_noDuplicateChannelsOnReload() {
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID)).thenReturn(
+                new NotificationChannel(PROMOTIONS_ID, PROMOTIONS_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID)).thenReturn(
+                new NotificationChannel(NEWS_ID, NEWS_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID)).thenReturn(
+                new NotificationChannel(SOCIAL_MEDIA_ID, SOCIAL_MEDIA_ID, 2));
+        when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID)).thenReturn(
+                new NotificationChannel(RECS_ID, RECS_ID, 2));
 
         mController.updateState(mGroupList);
         assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
+        mController.updateState(mGroupList);
+        assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
 
         assertThat(((PrimarySwitchPreference) mGroupList.findPreference(NEWS_ID)).isChecked())
                 .isEqualTo(false);
-        assertThat(((PrimarySwitchPreference) mGroupList.findPreference(NEWS_ID)).isChecked())
-                .isEqualTo(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
index 273bcdbe213..6ec3eb2bec0 100644
--- a/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
@@ -302,6 +302,26 @@ public class SoundPreferenceControllerTest {
                         RingtoneManager.EXTRA_RINGTONE_TYPE, 0));
     }
 
+    @Test
+    public void testOnPreferenceTreeClick_noAudioAttributes() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
+        channel.setSound(null, null);
+        mController.onResume(appRow, channel, null, null, null, null, null);
+
+        AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        NotificationSoundPreference pref =
+                spy(new NotificationSoundPreference(mContext, attributeSet));
+        pref.setKey(mController.getPreferenceKey());
+        mController.handlePreferenceTreeClick(pref);
+
+        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(pref, times(1)).onPrepareRingtonePickerIntent(intentArgumentCaptor.capture());
+        assertEquals(RingtoneManager.TYPE_NOTIFICATION,
+                intentArgumentCaptor.getValue().getIntExtra(
+                        RingtoneManager.EXTRA_RINGTONE_TYPE, 0));
+    }
+
     @Test
     public void testOnActivityResult() {
         NotificationSoundPreference pref = mock(NotificationSoundPreference.class);
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenHelperBackendTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenHelperBackendTest.java
new file mode 100644
index 00000000000..2288099c26e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenHelperBackendTest.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.modes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Flags;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.ProviderInfo;
+import android.content.pm.UserInfo;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.ContactsContract;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.notification.modes.ZenHelperBackend.Contact;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+
+@RunWith(RobolectricTestRunner.class)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public class ZenHelperBackendTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private Context mContext;
+    private ZenHelperBackend mBackend;
+    private HashMap<Integer, FakeContactsProvider> mContactsProviders = new HashMap<>();
+
+    private int mUserId;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.getApplication();
+        mBackend = new ZenHelperBackend(mContext);
+
+        mUserId = mContext.getUserId();
+        addContactsProvider(mUserId);
+    }
+
+    private int addMainUserProfile() {
+        UserInfo workProfile = new UserInfo(mUserId + 10, "Work Profile", 0);
+        workProfile.userType = UserManager.USER_TYPE_PROFILE_MANAGED;
+        UserManager userManager = mContext.getSystemService(UserManager.class);
+        shadowOf(userManager).addProfile(mUserId, workProfile.id, workProfile);
+
+        addContactsProvider(workProfile.id);
+
+        return workProfile.id;
+    }
+
+    private void addContactsProvider(int userId) {
+        ProviderInfo providerInfo = new ProviderInfo();
+        providerInfo.authority = String.format("%s@%s", userId, ContactsContract.AUTHORITY);
+        mContactsProviders.put(userId, Robolectric.buildContentProvider(FakeContactsProvider.class)
+                .create(providerInfo).get());
+    }
+
+    private void addContact(int userId, String name, boolean starred) {
+        mContactsProviders.get(userId).addContact(name, starred);
+    }
+
+    @Test
+    public void getAllContacts_singleProfile() {
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+
+        ImmutableList<Contact> allContacts = mBackend.getAllContacts();
+
+        assertThat(allContacts).containsExactly(
+                new Contact(UserHandle.of(mUserId), 1, "Huey", null),
+                new Contact(UserHandle.of(mUserId), 2, "Dewey", null),
+                new Contact(UserHandle.of(mUserId), 3, "Louie", null));
+    }
+
+    @Test
+    public void getAllContacts_multipleProfiles() {
+        int profileId = addMainUserProfile();
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+        addContact(profileId, "Fry", false);
+        addContact(profileId, "Bender", true);
+
+        ImmutableList<Contact> allContacts = mBackend.getAllContacts();
+
+        assertThat(allContacts).containsExactly(
+                new Contact(UserHandle.of(mUserId), 1, "Huey", null),
+                new Contact(UserHandle.of(mUserId), 2, "Dewey", null),
+                new Contact(UserHandle.of(mUserId), 3, "Louie", null),
+                new Contact(UserHandle.of(profileId), 1, "Fry", null),
+                new Contact(UserHandle.of(profileId), 2, "Bender", null));
+    }
+
+    @Test
+    public void getStarredContacts_singleProfile() {
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+
+        ImmutableList<Contact> allContacts = mBackend.getStarredContacts();
+
+        assertThat(allContacts).containsExactly(
+                new Contact(UserHandle.of(mUserId), 2, "Dewey", null));
+    }
+
+    @Test
+    public void getStarredContacts_multipleProfiles() {
+        int profileId = addMainUserProfile();
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+        addContact(profileId, "Fry", false);
+        addContact(profileId, "Bender", true);
+
+        ImmutableList<Contact> allContacts = mBackend.getStarredContacts();
+
+        assertThat(allContacts).containsExactly(
+                new Contact(UserHandle.of(mUserId), 2, "Dewey", null),
+                new Contact(UserHandle.of(profileId), 2, "Bender", null));
+    }
+
+    @Test
+    public void getAllContactsCount_singleProfile() {
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+
+        assertThat(mBackend.getAllContactsCount()).isEqualTo(3);
+    }
+
+    @Test
+    public void getAllContactsCount_multipleProfiles() {
+        int profileId = addMainUserProfile();
+        addContact(mUserId, "Huey", false);
+        addContact(mUserId, "Dewey", true);
+        addContact(mUserId, "Louie", false);
+        addContact(profileId, "Fry", false);
+        addContact(profileId, "Bender", true);
+
+        assertThat(mBackend.getAllContactsCount()).isEqualTo(5);
+    }
+
+    private static class FakeContactsProvider extends ContentProvider {
+
+        private record ContactRow(int id, String name, boolean starred) {}
+
+        private final ArrayList<ContactRow> mContacts = new ArrayList<>();
+
+        FakeContactsProvider() {
+        }
+
+        @Override
+        public boolean onCreate() {
+            return true;
+        }
+
+        public int addContact(String name, boolean starred) {
+            mContacts.add(new ContactRow(mContacts.size() + 1, name, starred));
+            return mContacts.size();
+        }
+
+        @Nullable
+        @Override
+        public Cursor query(@NonNull Uri uri, @Nullable String[] projection,
+                @Nullable String selection, @Nullable String[] selectionArgs,
+                @Nullable String sortOrder) {
+            Uri baseUri = ContentProvider.getUriWithoutUserId(uri);
+            if (!ContactsContract.Contacts.CONTENT_URI.equals(baseUri)) {
+                throw new IllegalArgumentException("Unsupported uri for fake: " + uri);
+            }
+
+            if (projection == null || !Iterables.elementsEqual(ImmutableList.copyOf(projection),
+                    ImmutableList.of(ContactsContract.Contacts._ID,
+                            ContactsContract.Contacts.DISPLAY_NAME_PRIMARY,
+                            ContactsContract.Contacts.PHOTO_THUMBNAIL_URI))) {
+                throw new IllegalArgumentException(
+                        "Unsupported projection for fake: " + Arrays.toString(projection));
+            }
+
+            if (selection != null && !selection.equals(ContactsContract.Data.STARRED + "=1")) {
+                throw new IllegalArgumentException("Unsupported selection for fake: " + selection);
+            }
+            boolean selectingStarred = selection != null; // Checked as only valid selection above
+
+
+            MatrixCursor cursor = new MatrixCursor(projection);
+            for (ContactRow contactRow : mContacts) {
+                if (!selectingStarred || contactRow.starred) {
+                    cursor.addRow(ImmutableList.of(contactRow.id, contactRow.name, Uri.EMPTY));
+                }
+            }
+
+            return cursor;
+        }
+
+        @Override
+        @Nullable
+        public String getType(@NonNull Uri uri) {
+            return "";
+        }
+
+        @Nullable
+        @Override
+        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int delete(@NonNull Uri uri, @Nullable String selection,
+                @Nullable String[] selectionArgs) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int update(@NonNull Uri uri, @Nullable ContentValues values,
+                @Nullable String selection, @Nullable String[] selectionArgs) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceControllerTest.java
index a7d52b16575..f9601d70f6c 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAllBypassingAppsPreferenceControllerTest.java
@@ -20,7 +20,6 @@ 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.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -28,10 +27,8 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Flags;
-import android.app.NotificationChannel;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.ParceledListSlice;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 
@@ -39,7 +36,6 @@ import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
-import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -54,6 +50,7 @@ import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @RunWith(RobolectricTestRunner.class)
 @EnableFlags(Flags.FLAG_MODES_UI)
@@ -66,7 +63,7 @@ public class ZenModeAllBypassingAppsPreferenceControllerTest {
 
     private Context mContext;
     @Mock
-    private NotificationBackend mBackend;
+    private ZenHelperBackend mBackend;
     @Mock
     private PreferenceCategory mPreferenceCategory;
     @Mock
@@ -102,18 +99,25 @@ public class ZenModeAllBypassingAppsPreferenceControllerTest {
         entry2.info.packageName = "test2";
         entry2.info.uid = 0;
 
+        ApplicationsState.AppEntry entry3= mock(ApplicationsState.AppEntry.class);
+        entry3.info = new ApplicationInfo();
+        entry3.info.packageName = "test3";
+        entry3.info.uid = 0;
+
         List<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
         appEntries.add(entry1);
         appEntries.add(entry2);
-        List<NotificationChannel> channelsBypassing = new ArrayList<>();
-        channelsBypassing.add(mock(NotificationChannel.class));
-        channelsBypassing.add(mock(NotificationChannel.class));
-        when(mBackend.getNotificationChannelsBypassingDnd(anyString(),
-                anyInt())).thenReturn(new ParceledListSlice<>(channelsBypassing));
+        appEntries.add(entry3);
+        when(mBackend.getPackagesBypassingDnd(anyInt())).thenReturn(
+                Map.of("test", true, "test2", false));
 
         // THEN there's are two preferences
         mController.updateAppList(appEntries);
-        verify(mPreferenceCategory, times(2)).addPreference(any());
+        ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
+        verify(mPreferenceCategory, times(2)).addPreference(captor.capture());
+        List<Preference> prefs = captor.getAllValues();
+        assertThat(prefs.get(0).getSummary().toString()).isEqualTo("All notifications");
+        assertThat(prefs.get(1).getSummary().toString()).isEqualTo("Some notifications");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
index fa83f309db1..e747b423af5 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
@@ -77,6 +77,7 @@ import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 @RunWith(RobolectricTestRunner.class)
@@ -200,8 +201,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         ApplicationsState.AppEntry app2 = createAppEntry("app2", mContext.getUserId());
         List<ApplicationsState.AppEntry> allApps = List.of(app1, app2);
 
-        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId(),
-                false)).thenReturn(List.of("app1"));
+        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId())).thenReturn(
+                Map.of("app1", true));
 
         assertThat(mController.getAppsBypassingDndSortedByName(allApps)).containsExactly(app1);
     }
@@ -213,8 +214,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         ApplicationsState.AppEntry appB = createAppEntry("B", mContext.getUserId());
         List<ApplicationsState.AppEntry> allApps = List.of(appC, appA, appB);
 
-        when(mHelperBackend.getPackagesBypassingDnd(eq(mContext.getUserId()), anyBoolean()))
-                .thenReturn(List.of("B", "C", "A"));
+        when(mHelperBackend.getPackagesBypassingDnd(eq(mContext.getUserId())))
+                .thenReturn(Map.of("B", true, "C", false, "A", true));
 
         assertThat(mController.getAppsBypassingDndSortedByName(allApps))
                 .containsExactly(appA, appB, appC).inOrder();
@@ -234,10 +235,10 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         List<ApplicationsState.AppEntry> allApps = List.of(workCopy, personalCopy, otherPersonal,
                 otherWork);
 
-        when(mHelperBackend.getPackagesBypassingDnd(eq(mContext.getUserId()), anyBoolean()))
-                .thenReturn(List.of("app", "p2"));
-        when(mHelperBackend.getPackagesBypassingDnd(eq(10), anyBoolean()))
-                .thenReturn(List.of("app"));
+        when(mHelperBackend.getPackagesBypassingDnd(eq(mContext.getUserId())))
+                .thenReturn(Map.of("app", true, "p2", true));
+        when(mHelperBackend.getPackagesBypassingDnd(eq(10)))
+                .thenReturn(Map.of("app", false));
 
         // Personal copy before work copy (names match).
         assertThat(mController.getAppsBypassingDndSortedByName(allApps))
@@ -253,7 +254,7 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         mController.updateState(mPreference, zenMode);
 
         verifyNoMoreInteractions(mSession);
-        verify(mHelperBackend, never()).getPackagesBypassingDnd(anyInt(), anyBoolean());
+        verify(mHelperBackend, never()).getPackagesBypassingDnd(anyInt());
         assertThat(String.valueOf(mPreference.getSummary())).isEqualTo("None");
     }
 
@@ -266,9 +267,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
         appEntries.add(createAppEntry("test", mContext.getUserId()));
 
-        when(mHelperBackend.getPackagesBypassingDnd(
-                mContext.getUserId(), false))
-                .thenReturn(List.of("test"));
+        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId()))
+                .thenReturn(Map.of("test", false));
 
         // Updates the preference with the zen mode. We expect that this causes the app session
         // to trigger a rebuild (and display a temporary text in the meantime).
@@ -286,8 +286,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
         ZenMode zenMode = createPriorityChannelsZenMode();
 
         mController.updateState(mPreference, zenMode);
-        when(mHelperBackend.getPackagesBypassingDnd(anyInt(), anyBoolean()))
-                .thenReturn(ImmutableList.of("test1", "test2"));
+        when(mHelperBackend.getPackagesBypassingDnd(anyInt()))
+                .thenReturn(Map.of("test1", false, "test2", false));
         ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
         appEntries.add(createAppEntry("test1", mContext.getUserId()));
         appEntries.add(createAppEntry("test2", mContext.getUserId()));
@@ -328,8 +328,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
                 .build();
         ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
         appEntries.add(createAppEntry("test", mContext.getUserId()));
-        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId(), false))
-                .thenReturn(List.of("test"));
+        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId()))
+                .thenReturn(Map.of("test", true));
 
         mController.updateState(mPreference, zenModeWithNone);
 
@@ -355,8 +355,8 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
                 .build();
         ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
         appEntries.add(createAppEntry("test", mContext.getUserId()));
-        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId(), false))
-                .thenReturn(List.of("test"));
+        when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId()))
+                .thenReturn(Map.of("test", true));
 
         mController.updateState(mPreference, zenModeWithPriority);
 
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java
index 74328bee089..3d076a1d879 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java
@@ -43,6 +43,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowToast;
 
 @RunWith(RobolectricTestRunner.class)
 @EnableFlags(Flags.FLAG_MODES_UI)
@@ -74,29 +75,23 @@ public class ZenModeEditDonePreferenceControllerTest {
     }
 
     @Test
-    public void updateState_nameNonEmpty_buttonEnabled() {
+    public void buttonClick_nameNonEmpty_buttonSaves() {
         ZenMode mode = new TestModeBuilder().setName("Such a nice name").build();
 
         mController.updateState(mPreference, mode);
-
-        assertThat(mButton.isEnabled()).isTrue();
-        verifyNoMoreInteractions(mConfirmSave);
-    }
-
-    @Test
-    public void updateState_nameEmpty_buttonDisabled() {
-        ZenMode aModeHasNoName = new TestModeBuilder().setName("").build();
-
-        mController.updateState(mPreference, aModeHasNoName);
-
-        assertThat(mButton.isEnabled()).isFalse();
-        verifyNoMoreInteractions(mConfirmSave);
-    }
-
-    @Test
-    public void onButtonClick_callsConfirmSave() {
         mButton.performClick();
 
         verify(mConfirmSave).run();
     }
+
+    @Test
+    public void buttonClick_nameEmpty_buttonErrors() {
+        ZenMode aModeHasNoName = new TestModeBuilder().setName("").build();
+
+        mController.updateState(mPreference, aModeHasNoName);
+        mButton.performClick();
+
+        verifyNoMoreInteractions(mConfirmSave);
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo("Mode name cannot be empty");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java
index 795de505097..55d7d3d91c6 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.notification.modes;
 
+import static android.util.TypedValue.COMPLEX_UNIT_DIP;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.verify;
@@ -25,6 +28,8 @@ import android.app.Flags;
 import android.content.Context;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.util.TypedValue;
+import android.view.View.MeasureSpec;
 import android.widget.EditText;
 
 import androidx.preference.PreferenceManager;
@@ -35,6 +40,8 @@ import com.android.settingslib.notification.modes.TestModeBuilder;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.widget.LayoutPreference;
 
+import com.google.android.material.textfield.TextInputLayout;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,6 +50,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import java.util.function.Consumer;
 
@@ -53,8 +61,10 @@ public class ZenModeEditNamePreferenceControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
+    private Context mContext;
     private ZenModeEditNamePreferenceController mController;
     private LayoutPreference mPreference;
+    private TextInputLayout mTextInputLayout;
     private EditText mEditText;
     @Mock private Consumer<String> mNameSetter;
 
@@ -62,14 +72,17 @@ public class ZenModeEditNamePreferenceControllerTest {
     public void setup() {
         MockitoAnnotations.initMocks(this);
 
-        Context context = RuntimeEnvironment.application;
-        PreferenceManager preferenceManager = new PreferenceManager(context);
-        PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(context,
+        mContext = RuntimeEnvironment.application;
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+
+        // Inflation is a test in itself, because it will crash if the Theme isn't set correctly.
+        PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(mContext,
                 R.xml.modes_edit_name_icon, null);
         mPreference = preferenceScreen.findPreference("name");
 
-        mController = new ZenModeEditNamePreferenceController(context, "name", mNameSetter);
+        mController = new ZenModeEditNamePreferenceController(mContext, "name", mNameSetter);
         mController.displayPreference(preferenceScreen);
+        mTextInputLayout = mPreference.findViewById(R.id.edit_input_layout);
         mEditText = mPreference.findViewById(android.R.id.edit);
         assertThat(mEditText).isNotNull();
     }
@@ -88,11 +101,35 @@ public class ZenModeEditNamePreferenceControllerTest {
     public void onEditText_callsNameSetter() {
         ZenMode mode = new TestModeBuilder().setName("A fancy name").build();
         mController.updateState(mPreference, mode);
-        EditText editText = mPreference.findViewById(android.R.id.edit);
 
-        editText.setText("An even fancier name");
+        mEditText.setText("An even fancier name");
 
         verify(mNameSetter).accept("An even fancier name");
         verifyNoMoreInteractions(mNameSetter);
     }
+
+    @Test
+    public void onEditText_emptyText_showsError() {
+        ZenMode mode = new TestModeBuilder().setName("Default name").build();
+        mController.updateState(mPreference, mode);
+
+        mEditText.setText("");
+
+        assertThat(mTextInputLayout.getError()).isNotNull();
+
+        mEditText.setText("this is fine");
+
+        assertThat(mTextInputLayout.getError()).isNull();
+    }
+
+    @Test
+    @Config(qualifiers = "xxxhdpi")
+    public void onEditTextMeasure_hasRequiredHeightForAccessibility() {
+        mEditText.measure(makeMeasureSpec(1_000, MeasureSpec.AT_MOST),
+                makeMeasureSpec(1_000, MeasureSpec.AT_MOST));
+
+        assertThat(mEditText.getMeasuredHeight()).isAtLeast(
+                (int) TypedValue.applyDimension(COMPLEX_UNIT_DIP, 48,
+                        mContext.getResources().getDisplayMetrics()));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
index 85fd0043039..8a66253e589 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
@@ -43,6 +43,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.UserHandle;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.service.notification.ConversationChannelWrapper;
@@ -229,13 +230,13 @@ public final class ZenModePeopleLinkPreferenceControllerTest {
 
     private void setUpContacts(Collection<Integer> allIds, Collection<Integer> starredIds) {
         when(mHelperBackend.getAllContacts()).thenReturn(ImmutableList.copyOf(
-                allIds.stream()
-                        .map(id -> new Contact(id, "#" + id, Uri.parse("photo://" + id)))
+                allIds.stream().map(id -> new Contact(UserHandle.SYSTEM, id, "#" + id,
+                                Uri.parse("photo://" + id)))
                         .toList()));
 
         when(mHelperBackend.getStarredContacts()).thenReturn(ImmutableList.copyOf(
-                starredIds.stream()
-                        .map(id -> new Contact(id, "#" + id, Uri.parse("photo://" + id)))
+                starredIds.stream().map(id -> new Contact(UserHandle.SYSTEM, id, "#" + id,
+                                Uri.parse("photo://" + id)))
                         .toList()));
     }
 
@@ -253,6 +254,6 @@ public final class ZenModePeopleLinkPreferenceControllerTest {
     }
 
     private static ColorDrawable photoOf(Contact contact) {
-        return new ColorDrawable((int) contact.id());
+        return new ColorDrawable((int) contact.contactId());
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
index eb570947d88..65aede62294 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
@@ -39,21 +39,41 @@ import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Activity;
+import android.app.Dialog;
 import android.app.Flags;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Contacts;
 import android.service.notification.ZenPolicy;
 import android.service.notification.ZenPolicy.ConversationSenders;
 import android.service.notification.ZenPolicy.PeopleType;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import androidx.fragment.app.testing.EmptyFragmentActivity;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
 import androidx.preference.TwoStatePreference;
+import androidx.test.core.content.pm.PackageInfoBuilder;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 
+import com.android.settings.R;
 import com.android.settingslib.notification.modes.TestModeBuilder;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -70,6 +90,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowDialog;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -84,7 +105,13 @@ public final class ZenModePrioritySendersPreferenceControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
+    @Rule
+    public ActivityScenarioRule<EmptyFragmentActivity> mActivityScenario =
+            new ActivityScenarioRule<>(EmptyFragmentActivity.class);
+
     private Context mContext;
+    private Activity mActivity;
+    private PackageManager mPackageManager;
     @Mock private ZenModesBackend mBackend;
     @Mock private ZenHelperBackend mHelperBackend;
 
@@ -97,6 +124,9 @@ public final class ZenModePrioritySendersPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
+        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
+        mActivityScenario.getScenario().onActivity(activity -> mActivity = activity);
+        mPackageManager = mContext.getPackageManager();
 
         mMessagesController = new ZenModePrioritySendersPreferenceController(mContext, "messages",
                 true, mBackend, mHelperBackend);
@@ -114,8 +144,8 @@ public final class ZenModePrioritySendersPreferenceControllerTest {
         mPreferenceScreen.addPreference(mMessagesPrefCategory);
 
         when(mHelperBackend.getStarredContacts()).thenReturn(ImmutableList.of());
-        when(mHelperBackend.getAllContacts()).thenReturn(
-                ImmutableList.of(new ZenHelperBackend.Contact(1, "The only contact", null)));
+        when(mHelperBackend.getAllContacts()).thenReturn(ImmutableList.of(
+                new ZenHelperBackend.Contact(UserHandle.SYSTEM, 1, "The only contact", null)));
         when(mHelperBackend.getAllContactsCount()).thenReturn(1);
 
         when(mHelperBackend.getImportantConversations()).thenReturn(ImmutableList.of());
@@ -1439,4 +1469,157 @@ public final class ZenModePrioritySendersPreferenceControllerTest {
         assertThat(captor.getValue().getPolicy().getPriorityCallSenders())
                 .isEqualTo(PEOPLE_TYPE_NONE);
     }
+
+    @Test
+    public void displayPreference_hasContactsApp_hasSettingsButton() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */ false);
+        mCallsController.displayPreference(mPreferenceScreen);
+
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_STARRED);
+
+        assertThat(((View) contactsPref.getExtraWidget().getParent()).getVisibility()).isEqualTo(
+                View.VISIBLE);
+    }
+
+    @Test
+    public void displayPreference_noContactsApp_noSettingsButton() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        shadowOf(mPackageManager).removePackage(contactsPackage);
+        mCallsController.displayPreference(mPreferenceScreen);
+
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_STARRED);
+
+        assertThat(((View) contactsPref.getExtraWidget().getParent()).getVisibility()).isEqualTo(
+                View.GONE);
+    }
+
+    @Test
+    public void contactsSettingsClick_usesBestIntent() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */ true);
+
+        mCallsController.displayPreference(mPreferenceScreen);
+        mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
+
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_CONTACTS);
+        contactsPref.getExtraWidget().performClick();
+
+        Intent nextActivity = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(nextActivity).isNotNull();
+        assertThat(nextActivity.getPackage()).isEqualTo(contactsPackage);
+        assertThat(nextActivity.getAction()).isEqualTo(Contacts.Intents.UI.LIST_DEFAULT);
+    }
+
+    @Test
+    public void starredContactsSettingsClick_usesBestIntent() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */  true);
+
+        mCallsController.displayPreference(mPreferenceScreen);
+        mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_STARRED);
+
+        contactsPref.getExtraWidget().performClick();
+
+        Intent nextActivity = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(nextActivity).isNotNull();
+        assertThat(nextActivity.getPackage()).isEqualTo(contactsPackage);
+        assertThat(nextActivity.getAction()).isEqualTo(Contacts.Intents.UI.LIST_STARRED_ACTION);
+    }
+
+    @Test
+    public void contactsSettingsClick_usesFallbackIntent() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */ false);
+
+        mCallsController.displayPreference(mPreferenceScreen);
+        mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_CONTACTS);
+
+        contactsPref.getExtraWidget().performClick();
+
+        Intent nextActivity = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(nextActivity).isNotNull();
+        assertThat(nextActivity.getPackage()).isEqualTo(contactsPackage);
+        assertThat(nextActivity.getAction()).isEqualTo(Intent.ACTION_MAIN);
+    }
+
+    @Test
+    public void contactsSettingsClick_singleProfile_opensActivityWithoutDialog() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */ true);
+
+        mCallsController.displayPreference(mPreferenceScreen);
+        mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_CONTACTS);
+
+        contactsPref.getExtraWidget().performClick();
+
+        assertThat(ShadowDialog.getLatestDialog()).isNull();
+        assertThat(shadowOf(mActivity).getNextStartedActivity()).isNotNull();
+    }
+
+    @Test
+    public void contactsSettingsClick_multipleProfiles_showsProfileChooserDialog() {
+        String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
+        setUpContactsApp(contactsPackage, /* withPreciseIntents= */ true);
+
+        UserInfo workProfile = new UserInfo(mContext.getUserId() + 10, "Work Profile", 0);
+        workProfile.userType = UserManager.USER_TYPE_PROFILE_MANAGED;
+        UserManager userManager = mContext.getSystemService(UserManager.class);
+        shadowOf(userManager).addProfile(mContext.getUserId(), workProfile.id, workProfile);
+
+        mCallsController.displayPreference(mPreferenceScreen);
+        mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
+        SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_CONTACTS);
+
+        contactsPref.getExtraWidget().performClick();
+
+        Dialog profileSelectDialog = ShadowDialog.getLatestDialog();
+        assertThat(profileSelectDialog).isNotNull();
+        TextView dialogTitle = profileSelectDialog.findViewById(android.R.id.title);
+        assertThat(dialogTitle.getText().toString()).isEqualTo("Choose profile");
+    }
+
+    private void setUpContactsApp(String contactsPackage, boolean withPreciseIntents) {
+        ComponentName contactsActivity = new ComponentName(contactsPackage, "ContactsActivity");
+        shadowOf(mPackageManager).installPackage(
+                PackageInfoBuilder.newBuilder()
+                        .setPackageName(contactsPackage)
+                        .build());
+        shadowOf(mPackageManager).addActivityIfNotPresent(contactsActivity);
+
+        // Fallback / default intent filter.
+        IntentFilter mainFilter = new IntentFilter(Intent.ACTION_MAIN);
+        mainFilter.addCategory(Intent.CATEGORY_DEFAULT);
+        mainFilter.addCategory(Intent.CATEGORY_APP_CONTACTS);
+        shadowOf(mPackageManager).addIntentFilterForActivity(contactsActivity, mainFilter);
+
+        if (withPreciseIntents) {
+            IntentFilter listFilter = new IntentFilter(Contacts.Intents.UI.LIST_DEFAULT);
+            listFilter.addCategory(Intent.CATEGORY_DEFAULT);
+            shadowOf(mPackageManager).addIntentFilterForActivity(contactsActivity, listFilter);
+
+            IntentFilter starredFilter = new IntentFilter(Contacts.Intents.UI.LIST_STARRED_ACTION);
+            starredFilter.addCategory(Intent.CATEGORY_DEFAULT);
+            shadowOf(mPackageManager).addIntentFilterForActivity(contactsActivity, starredFilter);
+        }
+    }
+
+    private SelectorWithWidgetPreference getBoundSelectorPreference(String key) {
+        SelectorWithWidgetPreference selectorPref = checkNotNull(
+                mCallsPrefCategory.findPreference(key));
+
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View view = inflater.inflate(selectorPref.getLayoutResource(), null);
+        LinearLayout widgetView = view.findViewById(android.R.id.widget_frame);
+        assertThat(widgetView).isNotNull();
+        inflater.inflate(selectorPref.getWidgetLayoutResource(), widgetView, true);
+
+        PreferenceViewHolder viewHolder = PreferenceViewHolder.createInstanceForTests(view);
+        selectorPref.onBindViewHolder(viewHolder);
+
+        return selectorPref;
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java
index d5c7f61034e..c378e9de427 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java
@@ -32,10 +32,10 @@ import android.service.notification.ZenModeConfig;
 import android.view.ViewGroup;
 import android.widget.ToggleButton;
 
-import androidx.fragment.app.Fragment;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.notification.modes.TestModeBuilder;
 import com.android.settingslib.notification.modes.ZenMode;
 import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -60,7 +60,7 @@ public class ZenModeSetSchedulePreferenceControllerTest {
     private Context mContext;
 
     @Mock
-    private Fragment mParent;
+    private DashboardFragment mParent;
     @Mock
     private Calendar mCalendar;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java
index a0e1d38f24d..d222a8b9568 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java
@@ -29,7 +29,6 @@ import static com.google.common.truth.Truth.assertThat;
 
 import static org.robolectric.Shadows.shadowOf;
 
-import android.app.AutomaticZenRule;
 import android.app.Flags;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -38,9 +37,7 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.SystemZenRules;
 import android.service.notification.ZenDeviceEffects;
-import android.service.notification.ZenModeConfig;
 import android.service.notification.ZenPolicy;
 
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -476,46 +473,73 @@ public class ZenModeSummaryHelperTest {
     }
 
     @Test
-    public void getModesSummary_noRules_noSummary() {
+    public void getModesSummary_noModesWtf_fallbackSummary() {
         String summary = mSummaryHelper.getModesSummary(ImmutableList.of());
-        assertThat(summary).isEmpty();
+        assertThat(summary).isEqualTo("Do Not Disturb");
     }
 
     @Test
-    public void getModesSummary_onlyDndAndNotActive_noSummary() {
-        ImmutableList<ZenMode> modes = ImmutableList.of(TestModeBuilder.MANUAL_DND_INACTIVE);
-        String summary = mSummaryHelper.getModesSummary(modes);
-        assertThat(summary).isEmpty();
-    }
-
-    @Test
-    public void getModesSummary_noRulesActive_countsOnlyEnabledAutomaticModes() {
+    public void getModesSummary_oneMode_listsMode() {
         ImmutableList<ZenMode> modes = ImmutableList.of(
-                TestModeBuilder.MANUAL_DND_INACTIVE, // Not automatic
-                new TestModeBuilder().setName("Auto 1").build(), // App provided automatic
-                new TestModeBuilder()
-                        .setName("Custom manual 1")
-                        .setPackage(SystemZenRules.PACKAGE_ANDROID)
-                        .setType(AutomaticZenRule.TYPE_OTHER)
-                        .setConditionId(ZenModeConfig.toCustomManualConditionId())
-                        .build(), // Custom manual, not automatic
-                new TestModeBuilder()
-                        .setName("Disabled 1")
-                        .setEnabled(false)
-                        .build(), // Would be automatic, but it's disabled.
-                new TestModeBuilder()
-                        .setName("Sleep")
-                        .setPackage(SystemZenRules.PACKAGE_ANDROID)
-                        .setType(AutomaticZenRule.TYPE_SCHEDULE_TIME)
-                        .build() // Time based, automatic.
+                new TestModeBuilder().setName("Surfing").build()
         );
 
         String summary = mSummaryHelper.getModesSummary(modes);
-        assertThat(summary).isEqualTo("2 modes can turn on automatically");
+        assertThat(summary).isEqualTo("Surfing");
     }
 
     @Test
-    public void getModesSummary_oneModeActive_listsMode() {
+    public void getModesSummary_twoModes_listsModes() {
+        ImmutableList<ZenMode> modes = ImmutableList.of(
+                new TestModeBuilder().setName("Cartwheeling").build(),
+                new TestModeBuilder().setName("Hula-hooping").build()
+        );
+
+        String summary = mSummaryHelper.getModesSummary(modes);
+        assertThat(summary).isEqualTo("Cartwheeling, Hula-hooping");
+    }
+
+    @Test
+    public void getModesSummary_threeModes_listsModes() {
+        ImmutableList<ZenMode> modes = ImmutableList.of(
+                new TestModeBuilder().setName("Prancing").build(),
+                new TestModeBuilder().setName("Hopping").build(),
+                new TestModeBuilder().setName("Skipping").build()
+        );
+
+        String summary = mSummaryHelper.getModesSummary(modes);
+        assertThat(summary).isEqualTo("Prancing, Hopping, Skipping");
+    }
+
+    @Test
+    public void getModesSummary_manyModes_listsThreeModes() {
+        ImmutableList<ZenMode> modes = ImmutableList.of(
+                new TestModeBuilder().setName("Juggling").build(),
+                new TestModeBuilder().setName("Rhyming").build(),
+                new TestModeBuilder().setName("Meandering").build(),
+                new TestModeBuilder().setName("Doodling").build(),
+                new TestModeBuilder().setName("Whistling").build(),
+                new TestModeBuilder().setName("Lounging").build()
+        );
+
+        String summary = mSummaryHelper.getModesSummary(modes);
+        assertThat(summary).isEqualTo("Juggling, Rhyming, Meandering");
+    }
+
+    @Test
+    public void getModesSummary_excludesImplicitModes() {
+        ImmutableList<ZenMode> modes = ImmutableList.of(
+                TestModeBuilder.MANUAL_DND_INACTIVE,
+                new TestModeBuilder().implicitForPackage("com.annoying.one").build(),
+                new TestModeBuilder().setName("Chirping").build()
+        );
+
+        String summary = mSummaryHelper.getModesSummary(modes);
+        assertThat(summary).isEqualTo("Do Not Disturb, Chirping");
+    }
+
+    @Test
+    public void getModesSummary_oneModeActive_listsActiveMode() {
         ImmutableList<ZenMode> modes = ImmutableList.of(
                 TestModeBuilder.MANUAL_DND_ACTIVE,
                 new TestModeBuilder().setName("Inactive").setActive(false).build());
@@ -525,7 +549,7 @@ public class ZenModeSummaryHelperTest {
     }
 
     @Test
-    public void getModesSummary_twoModesActive_listsModes() {
+    public void getModesSummary_twoModesActive_listsActiveModes() {
         ImmutableList<ZenMode> modes = ImmutableList.of(
                 TestModeBuilder.MANUAL_DND_ACTIVE,
                 new TestModeBuilder().setName("Inactive").setActive(false).build(),
@@ -536,7 +560,7 @@ public class ZenModeSummaryHelperTest {
     }
 
     @Test
-    public void getModesSummary_threeModesActive_listsModes() {
+    public void getModesSummary_threeModesActive_listsActiveModes() {
         ImmutableList<ZenMode> modes = ImmutableList.of(
                 TestModeBuilder.MANUAL_DND_INACTIVE,
                 new TestModeBuilder().setName("Inactive #1").setActive(false).build(),
@@ -550,7 +574,7 @@ public class ZenModeSummaryHelperTest {
     }
 
     @Test
-    public void getModesSummary_manyModesActive_listsACouple() {
+    public void getModesSummary_manyModesActive_listsSomeActiveModes() {
         ImmutableList<ZenMode> modes = ImmutableList.of(
                 TestModeBuilder.MANUAL_DND_ACTIVE,
                 new TestModeBuilder().setName("Inactive #1").setActive(false).build(),
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
index b7af71b50fd..d916dcfb068 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
@@ -44,6 +44,8 @@ import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.service.notification.SystemZenRules;
 import android.service.notification.ZenModeConfig;
+import android.text.Spanned;
+import android.text.style.TtsSpan;
 import android.widget.TextView;
 
 import androidx.preference.PreferenceManager;
@@ -293,7 +295,14 @@ public class ZenModeTriggerUpdatePreferenceControllerTest {
 
         assertThat(mPreference.isVisible()).isTrue();
         assertThat(mPreference.getTitle()).isEqualTo("1:00 AM - 3:00 PM");
-        assertThat(mPreference.getSummary()).isEqualTo("Mon - Tue, Thu");
+        Spanned summary = (Spanned) mPreference.getSummary();
+        assertThat(summary.toString()).isEqualTo("Mon - Tue, Thu");
+        TtsSpan[] ttsSpans = summary.getSpans(0, summary.length(), TtsSpan.class);
+        assertThat(ttsSpans).hasLength(1);
+        assertThat(ttsSpans[0].getType()).isEqualTo(TtsSpan.TYPE_TEXT);
+        assertThat(ttsSpans[0].getArgs().getString(TtsSpan.ARG_TEXT)).isEqualTo(
+                "Monday to Tuesday, Thursday");
+
         // Destination as written into the intent by SubSettingLauncher
         assertThat(
                 mPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
index 3722e416061..4f96bf6da7a 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
@@ -16,12 +16,19 @@
 
 package com.android.settings.notification.modes;
 
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
+import static android.service.notification.SystemZenRules.PACKAGE_ANDROID;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.Flags;
 import android.content.Context;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.SystemZenRules;
+import android.service.notification.ZenModeConfig;
+import android.text.Spanned;
+import android.text.style.TtsSpan;
 
 import com.android.settingslib.notification.modes.TestModeBuilder;
 import com.android.settingslib.notification.modes.ZenIconLoader;
@@ -37,6 +44,8 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Calendar;
+
 @RunWith(RobolectricTestRunner.class)
 @EnableFlags(Flags.FLAG_MODES_UI)
 public class ZenModesListItemPreferenceTest {
@@ -122,6 +131,31 @@ public class ZenModesListItemPreferenceTest {
         assertThat(preference.getIcon()).isNotNull();
     }
 
+    @Test
+    public void setZenMode_scheduleTime_hasCustomTtsInSummary() {
+        ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
+        scheduleInfo.days = new int[] { Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY };
+        scheduleInfo.startHour = 11;
+        scheduleInfo.endHour = 15;
+        ZenMode mode = new TestModeBuilder()
+                .setPackage(PACKAGE_ANDROID)
+                .setType(TYPE_SCHEDULE_TIME)
+                .setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
+                .setTriggerDescription(
+                        SystemZenRules.getTriggerDescriptionForScheduleTime(mContext, scheduleInfo))
+                .build();
+
+        ZenModesListItemPreference preference = newPreference(mode);
+
+        assertThat(preference.getSummary()).isInstanceOf(Spanned.class);
+        Spanned summary = (Spanned) preference.getSummary();
+        TtsSpan[] ttsSpans = summary.getSpans(0, summary.length(), TtsSpan.class);
+        assertThat(ttsSpans).hasLength(1);
+        assertThat(ttsSpans[0].getType()).isEqualTo(TtsSpan.TYPE_TEXT);
+        assertThat(ttsSpans[0].getArgs().getString(TtsSpan.ARG_TEXT)).isEqualTo(
+                "Monday to Wednesday, 11:00 AM - 3:00 PM");
+    }
+
     private ZenModesListItemPreference newPreference(ZenMode zenMode) {
         return new ZenModesListItemPreference(mContext, mIconLoader, MoreExecutors.directExecutor(),
                 zenMode);
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
index 27c4ec41774..22d69634cb9 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
@@ -98,13 +98,4 @@ public class ZenModeSettingsTest {
         assertThat(mBuilder.getCallsSettingSummary(policy))
                 .isEqualTo("Starred contacts and repeat callers");
     }
-
-    @Test
-    public void searchProvider_shouldIndexDefaultXml() {
-        final List<SearchIndexableResource> sir = ZenModeSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getXmlResourcesToIndex(mContext, true /* enabled */);
-
-        assertThat(sir).hasSize(1);
-        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
deleted file mode 100644
index 01360fdd414..00000000000
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
+++ /dev/null
@@ -1,231 +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 android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
-import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
-
-import static com.android.settings.notification.zen.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
-import static com.android.settings.notification.zen.ZenOnboardingActivity.PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME;
-import static com.android.settings.notification.zen.ZenOnboardingActivity.isSuggestionComplete;
-
-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.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Flags;
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.provider.Settings;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-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.shadows.ShadowApplication;
-
-@RunWith(RobolectricTestRunner.class)
-public class ZenOnboardingActivityTest {
-
-    @Mock
-    private MetricsLogger mMetricsLogger;
-    @Mock
-    private NotificationManager mNm;
-
-    private ZenOnboardingActivity mActivity;
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowApplication = ShadowApplication.getInstance();
-        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
-
-        mActivity = Robolectric.buildActivity(ZenOnboardingActivity.class)
-                .create()
-                .get();
-        mActivity.setNotificationManager(mNm);
-        mActivity.setMetricsLogger(mMetricsLogger);
-
-        mActivity.setupUI();
-
-        mContext = RuntimeEnvironment.application;
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
-                .thenReturn(getSharedPreferences());
-    }
-
-    @Test
-    public void loadUiRecordsEvent() {
-        verify(mMetricsLogger).visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
-    }
-
-    @Test
-    public void saveNewSetting() {
-        Policy policy = new Policy(PRIORITY_CATEGORY_ALARMS, 0, 0, SUPPRESSED_EFFECT_SCREEN_ON);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        mActivity.mNewSetting.performClick();
-        mActivity.save(null);
-
-        verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
-
-        ArgumentCaptor<Policy> captor = ArgumentCaptor.forClass(Policy.class);
-        if (android.app.Flags.modesApi()) {
-            verify(mNm).setNotificationPolicy(captor.capture(), eq(true));
-        } else {
-            verify(mNm).setNotificationPolicy(captor.capture());
-        }
-
-        Policy actual = captor.getValue();
-        assertThat(actual.priorityCategories).isEqualTo(PRIORITY_CATEGORY_ALARMS
-                | PRIORITY_CATEGORY_REPEAT_CALLERS);
-        assertThat(actual.priorityCallSenders).isEqualTo(Policy.PRIORITY_SENDERS_STARRED);
-        assertThat(actual.priorityMessageSenders).isEqualTo(Policy.PRIORITY_SENDERS_ANY);
-        assertThat(actual.suppressedVisualEffects).isEqualTo(
-                Policy.getAllSuppressedVisualEffects());
-    }
-
-    @Test
-    public void keepCurrentSetting() {
-        Policy policy = new Policy(PRIORITY_CATEGORY_ALARMS, 0, 0, SUPPRESSED_EFFECT_SCREEN_ON);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        mActivity.mKeepCurrentSetting.performClick();
-        mActivity.save(null);
-
-        verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
-        if (Flags.modesApi()) {
-            verify(mNm, never()).setNotificationPolicy(any(), anyBoolean());
-        } else {
-            verify(mNm, never()).setNotificationPolicy(any());
-        }
-    }
-
-    @Test
-    public void isSuggestionComplete_zenUpdated() {
-        Policy policy = new Policy(0, 0, 0, 0);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        setZenUpdated(true);
-        setShowSettingsSuggestion(false);
-        setWithinTimeThreshold(true);
-        assertThat(isSuggestionComplete(mContext)).isTrue();
-    }
-
-    @Test
-    public void isSuggestionComplete_withinTimeThreshold() {
-        Policy policy = new Policy(0, 0, 0, 0);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        setZenUpdated(false);
-        setShowSettingsSuggestion(false);
-        setWithinTimeThreshold(true);
-        assertThat(isSuggestionComplete(mContext)).isFalse();
-    }
-
-    @Test
-    public void isSuggestionComplete_showSettingsSuggestionTrue() {
-        Policy policy = new Policy(0, 0, 0, 0);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        setZenUpdated(false);
-        setShowSettingsSuggestion(true);
-        setWithinTimeThreshold(false);
-        assertThat(isSuggestionComplete(mContext)).isFalse();
-    }
-
-    @Test
-    public void isSuggestionComplete_showSettingsSuggestionFalse_notWithinTimeThreshold() {
-        Policy policy = new Policy(0, 0, 0, 0);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        setZenUpdated(false);
-        setShowSettingsSuggestion(false);
-        setWithinTimeThreshold(false);
-        assertThat(isSuggestionComplete(mContext)).isTrue();
-    }
-
-
-    @Test
-    public void isSuggestionComplete_visualEffectsUpdated() {
-        // all values suppressed
-        Policy policy = new Policy(0, 0, 0, 511);
-        when(mNm.getNotificationPolicy()).thenReturn(policy);
-
-        setZenUpdated(false);
-        setShowSettingsSuggestion(true);
-        setWithinTimeThreshold(true);
-        assertThat(isSuggestionComplete(mContext)).isTrue();
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_UPDATED, -1)).isEqualTo(1);
-    }
-
-
-    private void setZenUpdated(boolean updated) {
-        int zenUpdated = updated ? 1 : 0;
-
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ZEN_SETTINGS_UPDATED, zenUpdated);
-    }
-
-    private void setWithinTimeThreshold(boolean withinTime) {
-        long firstTime = System.currentTimeMillis();
-
-        if (withinTime) {
-            firstTime -= ALWAYS_SHOW_THRESHOLD / 2;
-        } else {
-            firstTime -= ALWAYS_SHOW_THRESHOLD * 2;
-        }
-
-        getSharedPreferences().edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME,
-               firstTime).commit();
-    }
-
-    private void setShowSettingsSuggestion(boolean show) {
-        int showZenSuggestion = 0;
-        if (show) {
-            showZenSuggestion = 1;
-        }
-
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, showZenSuggestion);
-    }
-
-    private SharedPreferences getSharedPreferences() {
-        return mContext.getSharedPreferences("test_zen_sugg", Context.MODE_PRIVATE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index bf5e9577250..5ca9f729cc4 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -23,6 +23,7 @@ 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.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -88,7 +89,11 @@ public class LockscreenDashboardFragmentTest {
                 AmbientDisplayAlwaysOnPreferenceController.class);
 
         mTestFragment.onAttach(mContext);
-        verify(controller).setConfig(any());
+        if (mTestFragment.isCatalystEnabled()) {
+            verifyNoInteractions(controller);
+        } else {
+            verify(controller).setConfig(any());
+        }
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/service/PreferenceServiceRequestTransformerTest.kt b/tests/robotests/src/com/android/settings/service/PreferenceServiceRequestTransformerTest.kt
new file mode 100644
index 00000000000..f064b221282
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/service/PreferenceServiceRequestTransformerTest.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.service
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.platform.test.annotations.RequiresFlagsEnabled
+import android.platform.test.flag.junit.CheckFlagsRule
+import android.platform.test.flag.junit.DeviceFlagsValueProvider
+import android.service.settings.preferences.GetValueRequest
+import android.service.settings.preferences.GetValueResult
+import android.service.settings.preferences.SetValueRequest
+import android.service.settings.preferences.SetValueResult
+import android.service.settings.preferences.SettingsPreferenceMetadata
+import android.service.settings.preferences.SettingsPreferenceValue
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.homepage.SettingsHomepageActivity
+import com.android.settingslib.flags.Flags.FLAG_SETTINGS_CATALYST
+import com.android.settingslib.graph.PreferenceCoordinate
+import com.android.settingslib.graph.PreferenceGetterErrorCode
+import com.android.settingslib.graph.PreferenceGetterFlags
+import com.android.settingslib.graph.PreferenceGetterResponse
+import com.android.settingslib.graph.PreferenceSetterResult
+import com.android.settingslib.graph.proto.PreferenceProto
+import com.android.settingslib.graph.proto.PreferenceValueProto
+import com.android.settingslib.graph.proto.TextProto
+import com.android.settingslib.graph.toProto
+import com.android.settingslib.metadata.SensitivityLevel
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@RequiresFlagsEnabled(FLAG_SETTINGS_CATALYST)
+class PreferenceServiceRequestTransformerTest {
+
+    @get:Rule
+    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()
+
+    @Test
+    fun transformFrameworkGetValueRequest_returnsValidCatalystRequest() {
+        val fRequest = GetValueRequest.Builder("screen", "pref").build()
+        val cRequest = transformFrameworkGetValueRequest(fRequest)
+        with(cRequest) {
+            assertThat(preferences).hasLength(1)
+            assertThat(preferences.first().screenKey).isEqualTo(fRequest.screenKey)
+            assertThat(preferences.first().key).isEqualTo(fRequest.preferenceKey)
+            assertThat(flags).isEqualTo(PreferenceGetterFlags.ALL)
+        }
+    }
+
+    @Test
+    fun transformCatalystGetValueResponse_success_returnsValidFrameworkResponse() {
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val fRequest = GetValueRequest.Builder("screen", "key").build()
+        val cResult = PreferenceGetterResponse(
+            emptyMap(),
+            mapOf(
+                PreferenceCoordinate(fRequest.screenKey, fRequest.preferenceKey) to
+                        PreferenceProto.newBuilder()
+                            .setKey("key")
+                            .setTitle(TextProto.newBuilder().setString("title"))
+                            .setSummary(TextProto.newBuilder().setString("summary"))
+                            .setEnabled(true)
+                            .setAvailable(true)
+                            .setRestricted(true)
+                            .setPersistent(true)
+                            .setSensitivityLevel(SensitivityLevel.LOW_SENSITIVITY)
+                            .setLaunchIntent(
+                                Intent(context, SettingsHomepageActivity::class.java).toProto()
+                            )
+                            .setValue(PreferenceValueProto.newBuilder().setBooleanValue(true))
+                            .build()
+            )
+        )
+        val fResult = transformCatalystGetValueResponse(context, fRequest, cResult)
+        assertThat(fResult!!.resultCode).isEqualTo(GetValueResult.RESULT_OK)
+        with(fResult.metadata!!) {
+            assertThat(title).isEqualTo("title")
+            assertThat(summary).isEqualTo("summary")
+            assertThat(isEnabled).isTrue()
+            assertThat(isAvailable).isTrue()
+            assertThat(isRestricted).isTrue()
+            assertThat(isWritable).isTrue()
+            assertThat(writeSensitivity)
+                .isEqualTo(SettingsPreferenceMetadata.EXPECT_POST_CONFIRMATION)
+            assertThat(launchIntent).isNotNull()
+            assertThat(launchIntent!!.component!!.className)
+                .isEqualTo(SettingsHomepageActivity::class.java.name)
+        }
+        with(fResult.value!!) {
+            assertThat(type).isEqualTo(SettingsPreferenceValue.TYPE_BOOLEAN)
+            assertThat(booleanValue).isTrue()
+        }
+    }
+
+    @Test
+    fun transformCatalystGetValueResponse_failure_returnsValidFrameworkResponse() {
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val fRequest = GetValueRequest.Builder("screen", "key").build()
+        val cResult = PreferenceGetterResponse(
+            mapOf(
+                PreferenceCoordinate(fRequest.screenKey, fRequest.preferenceKey) to
+                        PreferenceGetterErrorCode.NOT_FOUND
+            ),
+            emptyMap()
+        )
+        val fResult = transformCatalystGetValueResponse(context, fRequest, cResult)
+        with(fResult!!) {
+            assertThat(resultCode).isEqualTo(GetValueResult.RESULT_UNSUPPORTED)
+            assertThat(metadata).isNull()
+            assertThat(value).isNull()
+        }
+    }
+
+    @Test
+    fun transformCatalystGetValueResponse_invalidResponse_returnsNull() {
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val fRequest = GetValueRequest.Builder("screen", "key").build()
+        val cResult = PreferenceGetterResponse(emptyMap(), emptyMap())
+        val fResult = transformCatalystGetValueResponse(context, fRequest, cResult)
+        assertThat(fResult).isNull()
+    }
+
+    @Test
+    fun transformFrameworkSetValueRequest_typeBoolean_returnsValidCatalystRequest() {
+        val fRequest = SetValueRequest.Builder(
+            "screen",
+            "pref",
+            SettingsPreferenceValue.Builder(SettingsPreferenceValue.TYPE_BOOLEAN)
+                .setBooleanValue(true)
+                .build()
+        ).build()
+        val cRequest = transformFrameworkSetValueRequest(fRequest)
+        with(cRequest!!) {
+            assertThat(screenKey).isEqualTo(fRequest.screenKey)
+            assertThat(key).isEqualTo(fRequest.preferenceKey)
+            assertThat(value.hasBooleanValue()).isTrue()
+            assertThat(value.booleanValue).isTrue()
+        }
+    }
+
+    @Test
+    fun transformFrameworkSetValueRequest_typeInt_returnsValidCatalystRequest() {
+        val fRequest = SetValueRequest.Builder(
+            "screen",
+            "pref",
+            SettingsPreferenceValue.Builder(SettingsPreferenceValue.TYPE_INT)
+                .setIntValue(5)
+                .build()
+        ).build()
+        val cRequest = transformFrameworkSetValueRequest(fRequest)
+        with(cRequest!!) {
+            assertThat(screenKey).isEqualTo(fRequest.screenKey)
+            assertThat(key).isEqualTo(fRequest.preferenceKey)
+            assertThat(value.hasIntValue()).isTrue()
+            assertThat(value.intValue).isEqualTo(5)
+        }
+    }
+
+    @Test
+    fun transformFrameworkSetValueRequest_typeString_returnsNull() {
+        val fRequest = SetValueRequest.Builder(
+            "screen",
+            "pref",
+            SettingsPreferenceValue.Builder(SettingsPreferenceValue.TYPE_STRING)
+                .setStringValue("value")
+                .build()
+        ).build()
+        val cRequest = transformFrameworkSetValueRequest(fRequest)
+        assertThat(cRequest).isNull()
+    }
+
+    @Test
+    fun transformCatalystSetValueResponse_returnsValidFrameworkResponse() {
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.OK).resultCode
+        ).isEqualTo(SetValueResult.RESULT_OK)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.UNAVAILABLE).resultCode
+        ).isEqualTo(SetValueResult.RESULT_UNAVAILABLE)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.DISABLED).resultCode
+        ).isEqualTo(SetValueResult.RESULT_DISABLED)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.UNSUPPORTED).resultCode
+        ).isEqualTo(SetValueResult.RESULT_UNSUPPORTED)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.DISALLOW).resultCode
+        ).isEqualTo(SetValueResult.RESULT_DISALLOW)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.REQUIRE_APP_PERMISSION)
+                .resultCode
+        ).isEqualTo(SetValueResult.RESULT_REQUIRE_APP_PERMISSION)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.REQUIRE_USER_AGREEMENT)
+                .resultCode
+        ).isEqualTo(SetValueResult.RESULT_REQUIRE_USER_CONSENT)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.RESTRICTED).resultCode
+        ).isEqualTo(SetValueResult.RESULT_RESTRICTED)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.INVALID_REQUEST).resultCode
+        ).isEqualTo(SetValueResult.RESULT_INVALID_REQUEST)
+
+        assertThat(
+            transformCatalystSetValueResponse(PreferenceSetterResult.INTERNAL_ERROR).resultCode
+        ).isEqualTo(SetValueResult.RESULT_INTERNAL_ERROR)
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
index 8442a37873b..379bf5d0164 100644
--- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
@@ -116,7 +116,6 @@ public class CreateShortcutPreferenceControllerTest {
                 .isEqualTo(SHORTCUT_ID_PREFIX + intent.getComponent().flattenToShortString());
     }
 
-    @Ignore("b/314924127")
     @Test
     public void queryShortcuts_shouldOnlyIncludeSystemApp() {
         final ResolveInfo ri1 = new ResolveInfo();
@@ -137,10 +136,11 @@ public class CreateShortcutPreferenceControllerTest {
         doReturn(false).when(mController).canShowWifiHotspot();
         final List<ResolveInfo> info = mController.queryShortcuts();
         assertThat(info).hasSize(1);
-        assertThat(info.get(0).activityInfo).isEqualTo(ri2.activityInfo);
+        final ActivityInfo resultActivityInfo = info.get(0).activityInfo;
+        assertThat(resultActivityInfo.name).isEqualTo(ri2.activityInfo.name);
+        assertThat(resultActivityInfo.applicationInfo.isSystemApp()).isTrue();
     }
 
-    @Ignore("b/314924127")
     @Test
     public void queryShortcuts_shouldSortBasedOnPriority() {
         final ResolveInfo ri1 = new ResolveInfo();
@@ -164,8 +164,12 @@ public class CreateShortcutPreferenceControllerTest {
         doReturn(false).when(mController).canShowWifiHotspot();
         final List<ResolveInfo> info = mController.queryShortcuts();
         assertThat(info).hasSize(2);
-        assertThat(info.get(0).activityInfo).isEqualTo(ri2.activityInfo);
-        assertThat(info.get(1).activityInfo).isEqualTo(ri1.activityInfo);
+
+        final ResolveInfo resultRi1 = info.get(0);
+        assertThat(resultRi1.activityInfo.name).isEqualTo(ri2.activityInfo.name);
+        final ResolveInfo resultRi2 = info.get(1);
+        assertThat(resultRi2.activityInfo.name).isEqualTo(ri1.activityInfo.name);
+        assertThat(resultRi1.priority).isLessThan(resultRi2.priority);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index 36f6cd4058e..0171dc402f5 100644
--- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -54,6 +54,7 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -103,6 +104,8 @@ public class SimSelectNotificationTest {
     private DisplayMetrics mDisplayMetrics;
     @Mock
     private SimDialogActivity mActivity;
+    @Mock
+    private UserManager mUserManager;
 
     private final String mFakeDisplayName = "fake_display_name";
     private final CharSequence mFakeNotificationChannelTitle = "fake_notification_channel_title";
@@ -128,6 +131,8 @@ public class SimSelectNotificationTest {
                 .thenReturn(mNotificationManager);
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
                 .thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(UserManager.class))
+                .thenReturn(mUserManager);
         when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
                 .thenReturn(mSubscriptionManager);
@@ -135,6 +140,7 @@ public class SimSelectNotificationTest {
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.checkPermission(any(), any()))
                 .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mUserManager.isMainUser()).thenReturn(true);
 
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
         when(mTelephonyManager.isDataEnabledForApn(TYPE_MMS)).thenReturn(false);
@@ -217,6 +223,18 @@ public class SimSelectNotificationTest {
         verify(mNotificationManager, never()).createNotificationChannel(any());
     }
 
+    @Test
+    public void onReceivePrimarySubListChange_userIdIsNotMain_notificationShouldNotSend() {
+        when(mUserManager.isMainUser()).thenReturn(false);
+        Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
+        intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
+                EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA);
+
+        // If MMS data is already enabled, there's no need to trigger the notification.
+        mSimSelectNotification.onReceive(mContext, intent);
+        verify(mNotificationManager, never()).createNotificationChannel(any());
+    }
+
     @Test
     public void onReceivePrimarySubListChange_NoExtra_notificationShouldNotSend() {
         Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index cd642255f03..53ea81fae33 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.sound;
 
+import static android.content.pm.PackageManager.FEATURE_PC;
 import static android.media.AudioSystem.DEVICE_OUT_BLE_HEADSET;
 import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;
 import static android.media.AudioSystem.DEVICE_OUT_EARPIECE;
@@ -42,6 +43,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
@@ -49,14 +51,17 @@ import android.media.VolumeProvider;
 import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
 import android.media.session.PlaybackState;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
+import com.android.media.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
+import com.android.settings.media.MediaOutputUtils;
 import com.android.settings.testutils.shadow.ShadowAudioManager;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settingslib.bluetooth.A2dpProfile;
@@ -113,6 +118,8 @@ public class MediaOutputPreferenceControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
+    @Mock
+    private PackageManager mPackageManager;
     @Mock
     private LocalBluetoothManager mLocalManager;
     @Mock
@@ -486,6 +493,32 @@ public class MediaOutputPreferenceControllerTest {
         assertThat(mPreference.isVisible()).isFalse();
     }
 
+    /**
+     * During a call
+     * Preference should be visible when input routing is available in desktop
+     */
+    @EnableFlags(Flags.FLAG_ENABLE_AUDIO_INPUT_DEVICE_ROUTING_AND_VOLUME_CONTROL)
+    @Test
+    public void updateState_inCall_preferenceVisible_inputRoutingEnabledInDesktop()
+            throws PackageManager.NameNotFoundException {
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.hasSystemFeature(FEATURE_PC)).thenReturn(true);
+
+        ApplicationInfo appInfo = new ApplicationInfo();
+        appInfo.flags = ApplicationInfo.FLAG_INSTALLED;
+        appInfo.packageName = TEST_PACKAGE_NAME;
+        appInfo.name = TEST_APPLICATION_LABEL;
+        when(mPackageManager.getApplicationInfo(TEST_PACKAGE_NAME,
+                PackageManager.MATCH_DISABLED_COMPONENTS
+                        | PackageManager.MATCH_ANY_USER)).thenReturn(appInfo);
+
+
+        mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
     @Test
     public void findActiveDevice_onlyA2dpDeviceActive_returnA2dpDevice() {
         when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(null);
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 9f02f1f762e..ee1872d7210 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -29,7 +29,6 @@ import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
-import com.android.settings.notification.zen.ZenSuggestionActivity;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
 import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;
 
@@ -81,14 +80,6 @@ public class SettingsSuggestionsTest {
                 R.string.night_display_suggestion_summary);
     }
 
-    @Test
-    public void zenSuggestion_isValid() {
-        assertSuggestionEquals(
-                ZenSuggestionActivity.class.getName(),
-                R.string.zen_suggestion_title,
-                R.string.zen_suggestion_summary);
-    }
-
     private void assertSuggestionEquals(String activityName, @StringRes int titleRes,
             @StringRes int summaryRes) {
 
diff --git a/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java b/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
index 4d698215c43..fd9a88e1dc8 100644
--- a/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
@@ -17,11 +17,11 @@
 package com.android.settings.testutils;
 
 import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -35,8 +35,6 @@ import android.os.Build;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -48,15 +46,18 @@ public class AccessibilityTestUtils {
 
     public static void setSoftwareShortcutMode(
             Context context, boolean gestureNavEnabled, boolean floatingButtonEnabled) {
-        int buttonMode = floatingButtonEnabled ? ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU : -1;
+        int buttonMode = ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+        if (floatingButtonEnabled) {
+            buttonMode = ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+        } else if (gestureNavEnabled) {
+            buttonMode = ACCESSIBILITY_BUTTON_MODE_GESTURE;
+        }
         int navMode = gestureNavEnabled ? NAV_BAR_MODE_GESTURAL : NAV_BAR_MODE_3BUTTON;
 
-        Settings.Secure.putInt(context.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, buttonMode);
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.integer.config_navBarInteractionMode, navMode);
-        assertThat(context.getResources().getInteger(
-                com.android.internal.R.integer.config_navBarInteractionMode)).isEqualTo(navMode);
+        Settings.Secure.putIntForUser(context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, buttonMode, context.getUserId());
+        Settings.Secure.putIntForUser(context.getContentResolver(),
+                Settings.Secure.NAVIGATION_MODE, navMode, context.getUserId());
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
index fcd1e42c547..7de69a7ec55 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
@@ -24,6 +24,8 @@ import android.content.Context;
 import android.util.ArrayMap;
 import android.view.accessibility.AccessibilityManager;
 
+import com.android.internal.accessibility.common.ShortcutConstants;
+
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
@@ -71,4 +73,14 @@ public class ShadowAccessibilityManager extends org.robolectric.shadows.ShadowAc
             @NonNull List<AccessibilityShortcutInfo> installedAccessibilityShortcutList) {
         mInstalledAccessibilityShortcutList = installedAccessibilityShortcutList;
     }
+
+    /**
+     * Implements the hidden method
+     * {@link AccessibilityManager#getAccessibilityShortcutTargets}.
+     */
+    @Implementation
+    public List<String> getAccessibilityShortcutTargets(
+            @ShortcutConstants.UserShortcutType int shortcutType) {
+        return List.of();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 85db0bd88b9..754c429df06 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -37,6 +37,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
+import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
@@ -112,6 +113,7 @@ public class UserSettingsTest {
     private static final String KEY_USER_GUEST = "user_guest";
     private static final String KEY_ALLOW_MULTIPLE_USERS = "allow_multiple_users";
     private static final String KEY_USER_SETTINGS_SCREEN = "user_settings_screen";
+    private static final String KEY_ADD_USER = "user_add";
     private static final int ACTIVE_USER_ID = 0;
     private static final int INACTIVE_ADMIN_USER_ID = 1;
     private static final int INACTIVE_SECONDARY_USER_ID = 14;
@@ -130,6 +132,8 @@ public class UserSettingsTest {
     @Mock
     private PreferenceManager mMockPreferenceManager;
     @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
     private UserPreference mMePreference;
     @Mock
     private RestrictedPreference mAddUserPreference;
@@ -222,7 +226,7 @@ public class UserSettingsTest {
 
     @Test
     public void testGetRawDataToIndex_returnAllIndexablePreferences() {
-        String[] expectedKeys = {KEY_ALLOW_MULTIPLE_USERS, KEY_USER_SETTINGS_SCREEN};
+        String[] expectedKeys = {KEY_ALLOW_MULTIPLE_USERS, KEY_USER_SETTINGS_SCREEN, KEY_ADD_USER};
         List<String> keysResultList = new ArrayList<>();
         ShadowUserManager.getShadow().setSupportsMultipleUsers(true);
         List<SearchIndexableRaw> rawData =
@@ -235,6 +239,54 @@ public class UserSettingsTest {
         assertThat(keysResultList).containsExactly(expectedKeys);
     }
 
+    @Test
+    public void testGetRawDataToIndex_addRestrictedProfileAllowed_addUserTitleIsCorrect() {
+        ShadowUserManager.getShadow().setSupportsMultipleUsers(true);
+        SettingsShadowResources.overrideResource(
+                com.android.settings.R.bool.config_offer_restricted_profiles,
+                Boolean.TRUE);
+        when(mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_ADD_USER, mContext.getUser()))
+                .thenReturn(false);
+        ShadowUserManager.getShadow().setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED,
+                true);
+        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
+                .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.isDeviceManaged()).thenReturn(false);
+
+        List<SearchIndexableRaw> rawData =
+                UserSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+
+        String title = null;
+        for (SearchIndexableRaw rawDataItem : rawData) {
+            if (rawDataItem.key.equals(KEY_ADD_USER)) {
+                title = rawDataItem.title;
+            }
+        }
+
+        assertThat(title).isEqualTo(mContext.getString(
+                com.android.settings.R.string.user_add_user_or_profile_menu));
+    }
+
+    @Test
+    public void testGetRawDataToIndex_addRestrictedProfileDisallowed_addUserTitleIsCorrect() {
+        ShadowUserManager.getShadow().setSupportsMultipleUsers(true);
+        SettingsShadowResources.overrideResource(
+                com.android.settings.R.bool.config_offer_restricted_profiles,
+                Boolean.FALSE);
+        List<SearchIndexableRaw> rawData =
+                UserSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true);
+
+        String title = null;
+        for (SearchIndexableRaw rawDataItem : rawData) {
+            if (rawDataItem.key.equals(KEY_ADD_USER)) {
+                title = rawDataItem.title;
+            }
+        }
+
+        assertThat(title).isEqualTo(mContext.getString(
+                com.android.settingslib.R.string.user_add_user));
+    }
+
     @Test
     public void testAssignDefaultPhoto_hasDefaultUserIconSize() {
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 9b5f4520520..3bea65d2e7b 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -48,7 +48,6 @@ import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 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;
@@ -210,7 +209,6 @@ public class WebViewAppPickerTest {
         verify(mActivity, times(1)).finish();
     }
 
-    @Ignore("b/313615637")
     @Test
     public void testNotFinishedIfAdmin() {
         mUserManager.setIsAdminUser(true);
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 03684ad88a5..b5dfc315895 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -231,7 +231,7 @@ public class HighlightablePreferenceGroupAdapterTest {
         assertThat(mAdapter.mFadeInAnimated).isTrue();
         assertThat(mViewHolder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
         assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(true);
-        verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder);
+        verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder, 10);
     }
 
     @Test
@@ -256,14 +256,14 @@ public class HighlightablePreferenceGroupAdapterTest {
         // through animation.
         assertThat(mAdapter.mFadeInAnimated).isTrue();
         // remove highlight should be requested.
-        verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder);
+        verify(mAdapter).requestRemoveHighlightDelayed(mViewHolder, 10);
 
         ReflectionHelpers.setField(mAdapter, "mHighlightPosition", 10);
         mAdapter.updateBackground(mViewHolder, 10);
         // only sets background color once - if it's animation this would be called many times
-        verify(mViewHolder.itemView).setBackgroundColor(mAdapter.mHighlightColor);
+        verify(mViewHolder.itemView).setBackgroundResource(mAdapter.mHighlightBackgroundRes);
         // remove highlight should be requested.
-        verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder);
+        verify(mAdapter, times(2)).requestRemoveHighlightDelayed(mViewHolder, 10);
     }
 
     @Test
@@ -273,7 +273,8 @@ public class HighlightablePreferenceGroupAdapterTest {
 
         mAdapter.updateBackground(mViewHolder, 0);
 
-        assertThat(mViewHolder.itemView.getBackground()).isNotInstanceOf(ColorDrawable.class);
+        assertThat(mViewHolder.itemView.getBackground())
+                .isNotEqualTo(mAdapter.mHighlightBackgroundRes);
         assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
index a5ebdade033..498a2c2b9df 100644
--- a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
@@ -41,6 +41,7 @@ public class SettingsMainSwitchPreferenceTest {
     private EnforcedAdmin mEnforcedAdmin;
     private SettingsMainSwitchPreference mPreference;
     private PreferenceViewHolder mHolder;
+    private View mRootView;
 
     @Before
     public void setUp() {
@@ -50,9 +51,9 @@ public class SettingsMainSwitchPreferenceTest {
         mPreference = new SettingsMainSwitchPreference(context);
         ReflectionHelpers.setField(mPreference, "mEnforcedAdmin", mEnforcedAdmin);
         ReflectionHelpers.setField(mPreference, "mMainSwitchBar", switchBar);
-        final View rootView = View.inflate(context, com.android.settings.R.layout.preference_widget_main_switch,
+        mRootView = View.inflate(context, com.android.settings.R.layout.preference_widget_main_switch,
                 null /* parent */);
-        mHolder = PreferenceViewHolder.createInstanceForTests(rootView);
+        mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
     }
 
     @Test
@@ -74,4 +75,22 @@ public class SettingsMainSwitchPreferenceTest {
         assertThat(mPreference.isShowing()).isFalse();
         assertThat(mPreference.isVisible()).isFalse();
     }
+
+    @Test
+    public void focusability_mainSwitchBarIsNotFocusable() {
+        mPreference.show();
+
+        mPreference.onBindViewHolder(mHolder);
+
+        assertThat(mPreference.getSwitchBar().isFocusable()).isFalse();
+    }
+
+    @Test
+    public void focusability_mainSwitchBarFrameLayoutIsFocusable() {
+        mPreference.show();
+
+        mPreference.onBindViewHolder(mHolder);
+
+        assertThat(mRootView.isFocusable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt
new file mode 100644
index 00000000000..474e304b338
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.calling
+
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class WifiCallingScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = WifiCallingScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_WIFI_CALLING
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(WifiCallingScreen.KEY)
+    }
+
+    override fun migration() {}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 4440bc94ca0..283083e112c 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -49,6 +49,7 @@ import android.telephony.ims.ImsMmTelManager;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -90,6 +91,7 @@ public class WifiCallingSettingsForSubTest {
     private static final String PREFERENCE_NO_OPTIONS_DESC = "no_options_description";
     private static final String TEST_EMERGENCY_ADDRESS_CARRIER_APP =
             "com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp";
+    private static final String PREFERENCE_EMERGENCY_ADDRESS = "emergency_address_key";
 
     private TestFragment mFragment;
     private Context mContext;
@@ -138,6 +140,7 @@ public class WifiCallingSettingsForSubTest {
         doReturn(mContext.getResources()).when(mFragment).getResources();
         doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
         doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
+        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
         final Bundle bundle = new Bundle();
         when(mFragment.getArguments()).thenReturn(bundle);
         doNothing().when(mFragment).addPreferencesFromResource(anyInt());
@@ -380,19 +383,27 @@ public class WifiCallingSettingsForSubTest {
 
         @Override
         public <T extends Preference> T findPreference(CharSequence key) {
-            if (SWITCH_BAR.equals(key)) {
+            if (SWITCH_BAR.contentEquals(key)) {
                 return (T) mSwitchPref;
             }
-            if (BUTTON_WFC_MODE.equals(key)) {
+            if (BUTTON_WFC_MODE.contentEquals(key)) {
                 return (T) mButtonWfcMode;
             }
-            if (BUTTON_WFC_ROAMING_MODE.equals(key)) {
+            if (BUTTON_WFC_ROAMING_MODE.contentEquals(key)) {
                 return (T) mButtonWfcRoamingMode;
             }
-            if (PREFERENCE_NO_OPTIONS_DESC.equals(key)) {
+            if (PREFERENCE_NO_OPTIONS_DESC.contentEquals(key)) {
                 return (T) mDescriptionView;
             }
-            return (T) mock(ListWithEntrySummaryPreference.class);
+            if (PREFERENCE_EMERGENCY_ADDRESS.contentEquals(key)) {
+                return (T) mUpdateAddress;
+            }
+            return null;
+        }
+
+        @Override
+        public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+            return null;
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
index ff1125de656..9f5fcf8b72c 100644
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
@@ -16,6 +16,11 @@
 
 package com.android.settings.wifi.dpp;
 
+import static com.android.wifitrackerlib.WifiEntry.SECURITY_NONE;
+import static com.android.wifitrackerlib.WifiEntry.SECURITY_OWE;
+import static com.android.wifitrackerlib.WifiEntry.SECURITY_PSK;
+import static com.android.wifitrackerlib.WifiEntry.SECURITY_SAE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -148,4 +153,24 @@ public class WifiDppQrCodeScannerFragmentTest {
         verify(mActivity).setResult(eq(Activity.RESULT_OK), any());
         verify(mActivity).finish();
     }
+
+    @Test
+    public void isSecurityMatched_securityNotMatch_returnFalse() {
+        assertThat(mFragment.isSecurityMatched(SECURITY_NONE, SECURITY_PSK)).isFalse();
+    }
+
+    @Test
+    public void isSecurityMatched_securityMatch_returnTrue() {
+        assertThat(mFragment.isSecurityMatched(SECURITY_PSK, SECURITY_PSK)).isTrue();
+    }
+
+    @Test
+    public void isSecurityMatched_tryPskSaeTransition_returnTrue() {
+        assertThat(mFragment.isSecurityMatched(SECURITY_SAE, SECURITY_PSK)).isTrue();
+    }
+
+    @Test
+    public void isSecurityMatched_noPasswordSecurity_returnTrue() {
+        assertThat(mFragment.isSecurityMatched(SECURITY_NONE, SECURITY_OWE)).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
index 0982f26d76c..32e3a61c860 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
@@ -147,8 +147,8 @@ public class WifiTetherSwitchBarControllerTest {
     }
 
     @Test
-    public void onSwitchChanged_switchNotEnabled_doNothingForTethering() {
-        when(mSwitch.isEnabled()).thenReturn(false);
+    public void onSwitchChanged_switchIsBusy_doNothingForTethering() {
+        mController.mIsSwitchBusy = true;
 
         mController.onCheckedChanged(mSwitch, true);
 
diff --git a/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt b/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt
new file mode 100644
index 00000000000..9c2574e52f9
--- /dev/null
+++ b/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+
+/**
+ * Helper class to override system properties.
+ *
+ * [System.setProperty] changes the static state in the JVM, which is shared by all tests. Hence,
+ * there is chance that test cases are dependent/interfered due to system property unexpectedly.
+ * This helper class backs up the old properties when invoking [override] and restore the old
+ * properties in [close] to avoid flaky testing.
+ */
+class SystemProperty(overrides: Map<String, String?> = mapOf()) : AutoCloseable {
+    private val oldProperties = mutableMapOf<String, String?>()
+
+    constructor(key: String, value: String?) : this(mapOf(key to value))
+
+    init {
+        override(overrides)
+    }
+
+    fun override(key: String, value: String?) = override(mapOf(key to value))
+
+    fun override(overrides: Map<String, String?>) {
+        // back up system properties for the overrides
+        for (key in overrides.keys) {
+            // only back up the oldest property
+            if (!oldProperties.containsKey(key)) {
+                oldProperties[key] = System.getProperty(key)
+            }
+        }
+        overrides.overrideProperties()
+    }
+
+    override fun close() {
+        // restore the backed up properties
+        oldProperties.overrideProperties()
+        oldProperties.clear()
+    }
+
+    private fun Map<String, String?>.overrideProperties() {
+        for ((key, value) in this) {
+            if (value != null) {
+                System.setProperty(key, value)
+            } else {
+                System.clearProperty(key)
+            }
+        }
+    }
+}
diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUtils.java
index ed03bcc8413..7d115f81aca 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -51,6 +51,7 @@ public class ShadowUtils {
     private static boolean sIsBatteryPresent;
     private static boolean sIsMultipleBiometricsSupported;
     private static boolean sIsPrivateProfile;
+    private static boolean sIsProtectedPackage;
 
     @Implementation
     protected static int enforceSameOwner(Context context, int userId) {
@@ -84,6 +85,7 @@ public class ShadowUtils {
         sIsBatteryPresent = true;
         sIsMultipleBiometricsSupported = false;
         sIsPrivateProfile = false;
+        sIsProtectedPackage = false;
     }
 
     public static void setIsDemoUser(boolean isDemoUser) {
@@ -199,4 +201,13 @@ public class ShadowUtils {
     public static void setIsPrivateProfile(boolean isPrivateProfile) {
         sIsPrivateProfile = isPrivateProfile;
     }
+
+    @Implementation
+    protected static boolean isProtectedPackage(Context context, String packageName) {
+        return sIsProtectedPackage;
+    }
+
+    public static void setIsProtectedPackage(boolean isProtectedPackage) {
+        sIsProtectedPackage = isProtectedPackage;
+    }
 }
diff --git a/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt b/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
index e7fc3ed3d66..2f68521f3a1 100644
--- a/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
+++ b/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
@@ -29,6 +29,7 @@ import com.android.settings.biometrics.fingerprint2.domain.interactor.Accessibil
 import com.android.settings.biometrics.fingerprint2.domain.interactor.FoldStateInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.OrientationInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.Default
+import com.android.settings.biometrics.fingerprint2.lib.model.Orientation
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.modules.enrolling.rfps.ui.viewmodel.RFPSIconTouchViewModel
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.modules.enrolling.rfps.ui.viewmodel.RFPSViewModel
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.BackgroundViewModel
@@ -44,6 +45,7 @@ import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.Fing
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintScrollViewModel
 import com.android.settings.testutils2.FakeFingerprintManagerInteractor
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -73,7 +75,11 @@ class Injector(step: FingerprintNavigationStep.UiStep) {
 
   var accessibilityInteractor =
     object : AccessibilityInteractor {
-      override val isAccessibilityEnabled: Flow<Boolean> = flowOf(true)
+      override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> = flowOf(true)
+      override val isEnabled: Boolean
+        get() = true
+      override fun announce(clazz: Class<*>, announcement: CharSequence?) {}
+       override fun interrupt() {}
     }
 
   var foldStateInteractor =
@@ -93,6 +99,7 @@ class Injector(step: FingerprintNavigationStep.UiStep) {
       override val rotationFromDefault: Flow<Int> = rotation
 
       override fun getRotationFromDefault(rotation: Int): Int = rotation
+      override val orientationChanged: Flow<Orientation> = flowOf(Orientation.Portrait)
     }
   var gatekeeperViewModel = FingerprintGatekeeperViewModel(fingerprintManagerInteractor)
 
diff --git a/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt b/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt
index f61a3d3a02e..32ca2cdb59c 100644
--- a/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt
+++ b/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt
@@ -38,8 +38,12 @@ import com.android.systemui.biometrics.shared.model.FingerprintSensor
 import com.android.systemui.biometrics.shared.model.FingerprintSensorType
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.transform
+import kotlinx.coroutines.flow.update
 
 /** Fake to be used by other classes to easily fake the FingerprintManager implementation. */
 class FakeFingerprintManagerInteractor :
@@ -52,7 +56,7 @@ class FakeFingerprintManagerInteractor :
   RenameFingerprintInteractor,
   SensorInteractor {
 
-  var enrollableFingerprints: Int = 5
+  private val enrollableFingerprints = MutableStateFlow(5)
   var enrolledFingerprintsInternal: MutableList<FingerprintData> = mutableListOf()
   var challengeToGenerate: Pair<Long, ByteArray> = Pair(-1L, byteArrayOf())
   var authenticateAttempt = FingerprintAuthAttemptModel.Success(1)
@@ -82,13 +86,13 @@ class FakeFingerprintManagerInteractor :
   override val enrolledFingerprints: Flow<List<FingerprintData>> = flow {
     emit(enrolledFingerprintsInternal)
   }
-  override val canEnrollFingerprints: Flow<Boolean> = flow {
-    emit(enrolledFingerprintsInternal.size < enrollableFingerprints)
+  override val canEnrollFingerprints: Flow<Boolean> = enrollableFingerprints.transform {
+     emit(enrolledFingerprintsInternal.size < it)
   }
 
-  override fun maxFingerprintsEnrollable(): Int {
-    return enrollableFingerprints
-  }
+  override val maxFingerprintsEnrollable: Flow<Int> = enrollableFingerprints.asStateFlow()
+
+  override fun setShouldUseSettingsMaxFingerprints(useSettings: Boolean) {}
 
   override val sensorPropertiesInternal: Flow<FingerprintSensor?> = flow { emit(sensorProp) }
   override val hasSideFps: Flow<Boolean> =
@@ -110,4 +114,7 @@ class FakeFingerprintManagerInteractor :
     }
   }
 
+  fun setMaxEnrollableFingerprints(fingerprints: Int) {
+    enrollableFingerprints.update { fingerprints }
+  }
 }
diff --git a/tests/spa_unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.kt
new file mode 100644
index 00000000000..8524ef462fd
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo
+
+import android.content.Context
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+
+@RunWith(AndroidJUnit4::class)
+class PhoneNumberPreferenceControllerTest {
+
+    private val mockTelephonyManager = mock<TelephonyManager>()
+    private val mockSubscriptionManager = mock<SubscriptionManager>()
+
+    private val context: Context =
+        spy(ApplicationProvider.getApplicationContext()) {
+            on { getSystemService(SubscriptionManager::class.java) } doReturn
+                mockSubscriptionManager
+
+            on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+        }
+
+    private val subscriptionInfo = mock<SubscriptionInfo>()
+    private val preference = spy(Preference(context))
+    private val secondPreference = mock<Preference>()
+    private var category = PreferenceCategory(context)
+    private var preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
+
+    private var controller = spy(PhoneNumberPreferenceController(context, "phone_number"))
+
+    @Before
+    fun setup() {
+        preference.setKey(controller.preferenceKey)
+        preference.isVisible = true
+        preferenceScreen.addPreference(preference)
+        category.key = "basic_info_category"
+        preferenceScreen.addPreference(category)
+
+        doReturn(secondPreference).whenever(controller).createNewPreference(context)
+    }
+
+    @Test
+    fun displayPreference_multiSim_shouldAddSecondPreference() {
+        whenever(mockTelephonyManager.phoneCount).thenReturn(2)
+
+        val sim1Preference = Preference(context)
+        category.addItemFromInflater(sim1Preference)
+        controller.displayPreference(preferenceScreen)
+
+        assertThat(category.preferenceCount).isEqualTo(2)
+    }
+
+    @Test
+    fun updateState_singleSim_shouldUpdateTitleAndPhoneNumber() {
+        val phoneNumber = "1111111111"
+        doReturn(subscriptionInfo).whenever(controller).getSubscriptionInfo(any())
+        doReturn(phoneNumber).whenever(controller).getFormattedPhoneNumber(subscriptionInfo)
+        whenever(mockTelephonyManager.phoneCount).thenReturn(1)
+        controller.displayPreference(preferenceScreen)
+
+        controller.updateState(preference)
+
+        verify(preference).title = context.getString(R.string.status_number)
+        verify(preference).summary = phoneNumber
+    }
+
+    @Test
+    fun updateState_multiSim_shouldUpdateTitleAndPhoneNumberOfMultiplePreferences() {
+        val phoneNumber = "1111111111"
+        doReturn(subscriptionInfo).whenever(controller).getSubscriptionInfo(any())
+        doReturn(phoneNumber).whenever(controller).getFormattedPhoneNumber(subscriptionInfo)
+        whenever(mockTelephonyManager.phoneCount).thenReturn(2)
+        controller.displayPreference(preferenceScreen)
+
+        controller.updateState(preference)
+
+        verify(preference).title =
+            context.getString(R.string.status_number_sim_slot, 1 /* sim slot */)
+        verify(preference).summary = phoneNumber
+        verify(secondPreference).title =
+            context.getString(R.string.status_number_sim_slot, 2 /* sim slot */)
+        verify(secondPreference).summary = phoneNumber
+    }
+
+    @Test
+    fun getSummary_cannotGetActiveSubscriptionInfo_shouldShowNotAvailable() {
+        whenever(mockSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null)
+        controller.displayPreference(preferenceScreen)
+
+        controller.updateState(preference)
+
+        verify(preference).summary = context.getString(R.string.device_info_not_available)
+    }
+
+    @Test
+    fun getSummary_getEmptySubscriptionInfo_shouldShowNotAvailable() {
+        whenever(mockSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(emptyList())
+        controller.displayPreference(preferenceScreen)
+
+        controller.updateState(preference)
+
+        verify(preference).summary = context.getString(R.string.device_info_not_available)
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt b/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt
index 6f9029e6609..676ac48dfa9 100644
--- a/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt
@@ -16,21 +16,55 @@
 
 package com.android.settings.network
 
+import android.content.Context
 import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import android.telephony.UiccCardInfo
+import android.telephony.UiccPortInfo
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
 
 @RunWith(AndroidJUnit4::class)
 class SimOnboardingServiceTest {
+    val simOnboardingService = SimOnboardingService()
+
+    private val mockTelephonyManager = mock<TelephonyManager> {
+        on { activeModemCount } doReturn 2
+        on { isMultiSimSupported } doReturn TelephonyManager.MULTISIM_ALLOWED
+        on { uiccCardsInfo } doReturn mepUiccCardInfoList
+    }
+
+    private val mockSubscriptionManager = mock<SubscriptionManager> {
+            on { activeSubscriptionInfoList } doReturn listOf(
+                SUB_INFO_1,
+                SUB_INFO_2
+            )
+            on { availableSubscriptionInfoList } doReturn listOf(
+                SUB_INFO_1,
+                SUB_INFO_2,
+                SUB_INFO_3,
+            )
+        }
+
+    private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+        on { getSystemService(SubscriptionManager::class.java) } doReturn mockSubscriptionManager
+        on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+    }
 
     @Test
     fun addItemForRenaming_addItemWithNewName_findItem() {
-        val simOnboardingService = SimOnboardingService()
         val newName = "NewName"
-
         simOnboardingService.addItemForRenaming(SUB_INFO_1, newName)
 
         assertThat(simOnboardingService.renameMutableMap)
@@ -39,8 +73,6 @@ class SimOnboardingServiceTest {
 
     @Test
     fun addItemForRenaming_sameNameAndItemNotInList_removeItem() {
-        val simOnboardingService = SimOnboardingService()
-
         simOnboardingService.addItemForRenaming(SUB_INFO_1, DISPLAY_NAME_1)
 
         assertThat(simOnboardingService.renameMutableMap)
@@ -49,7 +81,6 @@ class SimOnboardingServiceTest {
 
     @Test
     fun addItemForRenaming_sameNameAndItemInList_removeItem() {
-        val simOnboardingService = SimOnboardingService()
         simOnboardingService.renameMutableMap[SUB_INFO_1.subscriptionId] = "NewName"
 
         simOnboardingService.addItemForRenaming(SUB_INFO_1, DISPLAY_NAME_1)
@@ -58,13 +89,205 @@ class SimOnboardingServiceTest {
             .doesNotContainKey(SUB_INFO_1.subscriptionId)
     }
 
+    @Test
+    fun isDsdsConditionSatisfied_isMultiSimEnabled_returnFalse(){
+        simOnboardingService.initData(SUB_ID_3, context, {})
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isFalse()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_isNotMultiSimSupported_returnFalse() {
+        mockTelephonyManager.stub {
+            on { activeModemCount } doReturn 1
+            on {
+                isMultiSimSupported
+            } doReturn TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE
+        }
+        simOnboardingService.initData(SUB_ID_3, context, {})
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isFalse()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_mepAndOneActiveSim_returnTrue() = runBlocking {
+        mockTelephonyManager.stub {
+            on { activeModemCount } doReturn 1
+        }
+        simOnboardingService.initData(SUB_ID_3, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isTrue()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_mepAndNoActiveSim_returnFalse() = runBlocking {
+        mockTelephonyManager.stub {
+            on { activeModemCount } doReturn 1
+        }
+        mockSubscriptionManager.stub {
+            on { activeSubscriptionInfoList } doReturn listOf()
+        }
+        simOnboardingService.initData(SUB_ID_3, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isFalse()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_insertEsimAndOneActivePsimNoMep_returnTrue() = runBlocking {
+        mockTelephonyManager.stub {
+            on { getActiveModemCount() } doReturn 1
+            on { uiccCardsInfo } doReturn noMepUiccCardInfoList
+        }
+        simOnboardingService.initData(SUB_ID_3, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isTrue()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_insertEsimAndNoPsimNoMep_returnFalse() = runBlocking {
+        mockTelephonyManager.stub {
+            on { getActiveModemCount() } doReturn 1
+            on { uiccCardsInfo } doReturn noMepUiccCardInfoList
+        }
+        mockSubscriptionManager.stub {
+            on { activeSubscriptionInfoList } doReturn listOf()
+        }
+        simOnboardingService.initData(SUB_ID_3, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isFalse()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_insertPsimAndOneActiveEsimNoMep_returnTrue() = runBlocking {
+        mockTelephonyManager.stub {
+            on { getActiveModemCount() } doReturn 1
+            on { uiccCardsInfo } doReturn noMepUiccCardInfoList
+        }
+        mockSubscriptionManager.stub {
+            on { activeSubscriptionInfoList } doReturn listOf(
+                SUB_INFO_2
+            )
+        }
+        simOnboardingService.initData(SUB_ID_1, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isTrue()
+    }
+
+    @Test
+    fun isDsdsConditionSatisfied_insertPsimAndNoEsimNoMep_returnFalse() = runBlocking {
+        mockTelephonyManager.stub {
+            on { getActiveModemCount() } doReturn 1
+            on { uiccCardsInfo } doReturn noMepUiccCardInfoList
+        }
+        mockSubscriptionManager.stub {
+            on { activeSubscriptionInfoList } doReturn listOf()
+        }
+        simOnboardingService.initData(SUB_ID_1, context, {})
+        delay(100)
+
+        assertThat(simOnboardingService.isDsdsConditionSatisfied()).isFalse()
+    }
+
     private companion object {
         const val SUB_ID_1 = 1
+        const val SUB_ID_2 = 2
+        const val SUB_ID_3 = 3
+        const val SUB_ID_4 = 4
         const val DISPLAY_NAME_1 = "Sub 1"
 
         val SUB_INFO_1: SubscriptionInfo = SubscriptionInfo.Builder().apply {
             setId(SUB_ID_1)
             setDisplayName(DISPLAY_NAME_1)
         }.build()
+
+        val SUB_INFO_2: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID_2)
+            setEmbedded(true)
+        }.build()
+
+        val SUB_INFO_3: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID_3)
+            setEmbedded(true)
+        }.build()
+
+        val SUB_INFO_4: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID_4)
+        }.build()
+
+        private const val REMOVABLE_CARD_ID_1: Int = 25
+        private const val REMOVABLE_CARD_ID_2: Int = 26
+        private const val EUICC_CARD_ID_3: Int = 27
+        private const val EUICC_CARD_ID_4: Int = 28
+
+        val noMepUiccCardInfoList: List<UiccCardInfo> = listOf(
+            createUiccCardInfo(
+                isEuicc = true,
+                cardId = EUICC_CARD_ID_3,
+                physicalSlotIndex = 0,
+                isRemovable = false,
+                isMultipleEnabledProfileSupported = false,
+                logicalSlotIndex = -1,
+                portIndex = -1
+            ),
+            createUiccCardInfo(
+                isEuicc = false,
+                cardId = REMOVABLE_CARD_ID_1,
+                physicalSlotIndex = 1,
+                isRemovable = true,
+                isMultipleEnabledProfileSupported = false,
+                logicalSlotIndex = -1,
+                portIndex = -1
+            )
+        )
+        val mepUiccCardInfoList: List<UiccCardInfo> = listOf(
+            createUiccCardInfo(
+                isEuicc = true,
+                cardId = EUICC_CARD_ID_3,
+                physicalSlotIndex = 0,
+                isRemovable = false,
+                logicalSlotIndex = -1,
+                portIndex = -1
+            ),
+            createUiccCardInfo(
+                isEuicc = false,
+                cardId = REMOVABLE_CARD_ID_1,
+                physicalSlotIndex = 1,
+                isRemovable = true,
+                logicalSlotIndex = -1,
+                portIndex = -1
+            )
+        )
+
+        private fun createUiccCardInfo(
+            isEuicc: Boolean,
+            cardId: Int,
+            physicalSlotIndex: Int,
+            isRemovable: Boolean,
+            logicalSlotIndex: Int,
+            portIndex: Int,
+            isMultipleEnabledProfileSupported:Boolean = true,
+        ): UiccCardInfo {
+            return UiccCardInfo(
+                isEuicc,  /* isEuicc */
+                cardId,  /* cardId */
+                null,  /* eid */
+                physicalSlotIndex,  /* physicalSlotIndex */
+                isRemovable,  /* isRemovable */
+                isMultipleEnabledProfileSupported,  /* isMultipleEnabledProfileSupported */
+                listOf(
+                    UiccPortInfo(
+                        "123451234567890",  /* iccId */
+                        portIndex,  /* portIdx */
+                        logicalSlotIndex,  /* logicalSlotIdx */
+                        true /* isActive */
+                    )
+                )
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
index 51d2c87dff3..205cfa06277 100644
--- a/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/TetherPreferenceControllerTest.kt
@@ -18,6 +18,9 @@ package com.android.settings.network
 
 import android.content.Context
 import android.net.TetheringManager
+import androidx.lifecycle.testing.TestLifecycleOwner
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceManager
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.dx.mockito.inline.extended.ExtendedMockito
@@ -25,11 +28,15 @@ import com.android.settings.R
 import com.android.settings.core.BasePreferenceController
 import com.android.settingslib.TetherUtil
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.MockitoSession
+import org.mockito.kotlin.mock
 import org.mockito.quality.Strictness
 
 @RunWith(AndroidJUnit4::class)
@@ -38,7 +45,14 @@ class TetherPreferenceControllerTest {
 
     private val context: Context = ApplicationProvider.getApplicationContext()
 
-    private val controller = TetherPreferenceController(context, TEST_KEY)
+    private val mockTetheredRepository =
+        mock<TetheredRepository> { on { tetheredTypesFlow() }.thenReturn(flowOf(emptySet())) }
+
+    private val controller = TetherPreferenceController(context, TEST_KEY, mockTetheredRepository)
+
+    private val preference = PreferenceCategory(context).apply { key = TEST_KEY }
+
+    private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
 
     @Before
     fun setUp() {
@@ -49,6 +63,9 @@ class TetherPreferenceControllerTest {
             .startMocking()
 
         ExtendedMockito.doReturn(true).`when` { TetherUtil.isTetherAvailable(context) }
+
+        preferenceScreen.addPreference(preference)
+        controller.displayPreference(preferenceScreen)
     }
 
     @After
@@ -57,21 +74,30 @@ class TetherPreferenceControllerTest {
     }
 
     @Test
-    fun getAvailabilityStatus_whenTetherAvailable() {
-        ExtendedMockito.doReturn(true).`when` { TetherUtil.isTetherAvailable(context) }
-
+    fun getAvailabilityStatus_alwaysReturnAvailable() {
         val availabilityStatus = controller.availabilityStatus
 
         assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)
     }
 
     @Test
-    fun getAvailabilityStatus_whenTetherNotAvailable() {
+    fun onViewCreated_whenTetherAvailable() = runBlocking {
+        ExtendedMockito.doReturn(true).`when` { TetherUtil.isTetherAvailable(context) }
+
+        controller.onViewCreated(TestLifecycleOwner())
+        delay(100)
+
+        assertThat(preference.isVisible).isTrue()
+    }
+
+    @Test
+    fun onViewCreated_whenTetherNotAvailable() = runBlocking {
         ExtendedMockito.doReturn(false).`when` { TetherUtil.isTetherAvailable(context) }
 
-        val availabilityStatus = controller.availabilityStatus
+        controller.onViewCreated(TestLifecycleOwner())
+        delay(100)
 
-        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE)
+        assertThat(preference.isVisible).isFalse()
     }
 
     @Test
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnTypesTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnTypesTest.kt
index ce0d0f55ffd..13b5167095c 100644
--- a/tests/spa_unit/src/com/android/settings/network/apn/ApnTypesTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnTypesTest.kt
@@ -91,6 +91,68 @@ class ApnTypesTest {
         assertThat(apnType).isEqualTo("default,mms,supl,hipri,fota,cbs,xcap")
     }
 
+    @Test
+    fun hasAllApnTypes_allString() {
+        val apnTypes = listOf(ApnSetting.TYPE_ALL_STRING)
+
+        val hasAllApnTypes = ApnTypes.hasAllApnTypes(apnTypes)
+
+        assertThat(hasAllApnTypes).isTrue()
+    }
+
+    @Test
+    fun hasAllApnTypes_allTypes() {
+        val apnTypes = listOf(
+            ApnSetting.TYPE_DEFAULT_STRING,
+            ApnSetting.TYPE_MMS_STRING,
+            ApnSetting.TYPE_SUPL_STRING,
+            ApnSetting.TYPE_DUN_STRING,
+            ApnSetting.TYPE_HIPRI_STRING,
+            ApnSetting.TYPE_FOTA_STRING,
+            ApnSetting.TYPE_IMS_STRING,
+            ApnSetting.TYPE_CBS_STRING,
+            ApnSetting.TYPE_IA_STRING,
+            ApnSetting.TYPE_EMERGENCY_STRING,
+            ApnSetting.TYPE_MCX_STRING,
+            ApnSetting.TYPE_XCAP_STRING,
+            ApnSetting.TYPE_VSIM_STRING,
+            ApnSetting.TYPE_BIP_STRING,
+            ApnSetting.TYPE_ENTERPRISE_STRING,
+            ApnSetting.TYPE_OEM_PAID_STRING,
+            ApnSetting.TYPE_OEM_PRIVATE_STRING,
+        )
+
+        val hasAllApnTypes = ApnTypes.hasAllApnTypes(apnTypes)
+
+        assertThat(hasAllApnTypes).isTrue()
+    }
+
+    @Test
+    fun hasAllApnTypes_allTypesExceptDefault() {
+        val apnTypes = listOf(
+            ApnSetting.TYPE_MMS_STRING,
+            ApnSetting.TYPE_SUPL_STRING,
+            ApnSetting.TYPE_DUN_STRING,
+            ApnSetting.TYPE_HIPRI_STRING,
+            ApnSetting.TYPE_FOTA_STRING,
+            ApnSetting.TYPE_IMS_STRING,
+            ApnSetting.TYPE_CBS_STRING,
+            ApnSetting.TYPE_IA_STRING,
+            ApnSetting.TYPE_EMERGENCY_STRING,
+            ApnSetting.TYPE_MCX_STRING,
+            ApnSetting.TYPE_XCAP_STRING,
+            ApnSetting.TYPE_VSIM_STRING,
+            ApnSetting.TYPE_BIP_STRING,
+            ApnSetting.TYPE_ENTERPRISE_STRING,
+            ApnSetting.TYPE_OEM_PAID_STRING,
+            ApnSetting.TYPE_OEM_PRIVATE_STRING,
+        )
+
+        val hasAllApnTypes = ApnTypes.hasAllApnTypes(apnTypes)
+
+        assertThat(hasAllApnTypes).isFalse()
+    }
+
     private companion object {
         const val APN_TYPE = "type"
     }
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.kt
index 4d532604205..75c19135b9c 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.kt
@@ -17,6 +17,7 @@
 package com.android.settings.network.telephony
 
 import android.content.Context
+import android.telephony.CarrierConfigManager
 import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
 import android.telephony.TelephonyManager
 import android.telephony.data.ApnSetting
@@ -26,6 +27,7 @@ import com.android.settings.core.BasePreferenceController.AVAILABLE
 import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE
 import com.android.settings.network.telephony.MmsMessagePreferenceController.Companion.MmsMessageSearchItem
 import com.google.common.truth.Truth.assertThat
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.doReturn
@@ -63,6 +65,21 @@ class MmsMessagePreferenceControllerTest {
         getDefaultDataSubId = { defaultDataSubId },
     )
 
+    @Before
+    fun setUp() {
+        CarrierConfigRepository.resetForTest()
+        CarrierConfigRepository.setBooleanForTest(
+            subId = SUB_1_ID,
+            key = CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL,
+            value = true,
+        )
+        CarrierConfigRepository.setBooleanForTest(
+            subId = SUB_2_ID,
+            key = CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL,
+            value = true,
+        )
+    }
+
     @Test
     fun getAvailabilityStatus_invalidSubscription_unavailable() {
         controller.init(INVALID_SUBSCRIPTION_ID)
@@ -164,6 +181,27 @@ class MmsMessagePreferenceControllerTest {
         assertThat(availabilityStatus).isEqualTo(AVAILABLE)
     }
 
+    @Test
+    fun getAvailabilityStatus_carrierConfigEnabledMmsFalse_unavailable() {
+        defaultDataSubId = SUB_2_ID
+        mockTelephonyManager2.stub {
+            on { isDataEnabled } doReturn false
+            on {
+                isMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH)
+            } doReturn true
+        }
+        CarrierConfigRepository.setBooleanForTest(
+            subId = SUB_2_ID,
+            key = CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL,
+            value = false,
+        )
+        controller.init(SUB_2_ID)
+
+        val availabilityStatus = controller.getAvailabilityStatus()
+
+        assertThat(availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+    }
+
     @Test
     fun searchIsAvailable_notDefaultDataAndDataOnAndAutoDataSwitchOn_unavailable() {
         mockTelephonyManager1.stub {
@@ -200,6 +238,27 @@ class MmsMessagePreferenceControllerTest {
         assertThat(isAvailable).isTrue()
     }
 
+    @Test
+    fun searchIsAvailable_carrierConfigEnabledMmsFalse_unavailable() {
+        defaultDataSubId = SUB_2_ID
+        mockTelephonyManager2.stub {
+            on { isDataEnabled } doReturn false
+            on {
+                isMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH)
+            } doReturn true
+        }
+        CarrierConfigRepository.setBooleanForTest(
+            subId = SUB_2_ID,
+            key = CarrierConfigManager.KEY_MMS_MMS_ENABLED_BOOL,
+            value = false,
+        )
+        controller.init(SUB_2_ID)
+
+        val availabilityStatus = controller.getAvailabilityStatus()
+
+        assertThat(availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+    }
+
     @Test
     fun isChecked_whenMmsNotAlwaysAllowed_returnFalse() {
         mockTelephonyManager2.stub {
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/UiccSlotRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/UiccSlotRepositoryTest.kt
index 96aa1514b15..911e1d1a7c6 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/UiccSlotRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/UiccSlotRepositoryTest.kt
@@ -44,7 +44,7 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
@@ -61,7 +61,7 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
@@ -78,7 +78,7 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isTrue()
     }
@@ -95,7 +95,7 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isTrue()
     }
@@ -116,7 +116,7 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
@@ -137,13 +137,13 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isTrue()
     }
 
     @Test
-    fun anyRemovablePhysicalSimEnabled_activePsim_returnsTrue() {
+    fun anyRemovablePhysicalSimSlotActiveAndInserted_activePsim_returnsTrue() {
         mockTelephonyManager.stub {
             on { uiccSlotsInfo } doReturn
                 arrayOf(
@@ -152,13 +152,13 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isTrue()
     }
 
     @Test
-    fun anyRemovablePhysicalSimEnabled_inactivePsim_returnsFalse() {
+    fun anyRemovablePhysicalSimSlotActiveAndInserted_inactivePsim_returnsFalse() {
         mockTelephonyManager.stub {
             on { uiccSlotsInfo } doReturn
                 arrayOf(
@@ -167,13 +167,13 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
 
     @Test
-    fun anyRemovablePhysicalSimEnabled_activeEsimAndActivePsim_returnsTrue() {
+    fun anyRemovablePhysicalSimSlotActiveAndInserted_activeEsimAndActivePsim_returnsTrue() {
         mockTelephonyManager.stub {
             on { uiccSlotsInfo } doReturn
                 arrayOf(
@@ -184,13 +184,13 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isTrue()
     }
 
     @Test
-    fun anyRemovablePhysicalSimEnabled_activeEsimAndInactivePsim_returnsFalse() {
+    fun anyRemovablePhysicalSimSlotActiveAndInserted_activeEsimAndInactivePsim_returnsFalse() {
         mockTelephonyManager.stub {
             on { uiccSlotsInfo } doReturn
                 arrayOf(
@@ -201,16 +201,16 @@ class UiccSlotRepositoryTest {
                 )
         }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
 
     @Test
-    fun anyRemovablePhysicalSimEnabled_uiccSlotInfoIsNull_returnsFalse() {
+    fun anyRemovablePhysicalSimSlotActiveAndInserted_uiccSlotInfoIsNull_returnsFalse() {
         mockTelephonyManager.stub { on { uiccSlotsInfo } doReturn arrayOf(null) }
 
-        val result = repository.anyRemovablePhysicalSimEnabled()
+        val result = repository.anyRemovablePhysicalSimSlotActiveAndInserted()
 
         assertThat(result).isFalse()
     }
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.kt
index 4babfaae301..b9bda771299 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.kt
@@ -47,6 +47,8 @@ class VideoCallingPreferenceControllerTest {
     private val context: Context = ApplicationProvider.getApplicationContext()
 
     private val mockCallStateRepository = mock<CallStateRepository> {}
+    private val mockVideoCallingRepository = mock<VideoCallingRepository> {}
+
 
     private var controller =
         spy(
@@ -54,6 +56,7 @@ class VideoCallingPreferenceControllerTest {
                 context = context,
                 key = TEST_KEY,
                 callStateRepository = mockCallStateRepository,
+                videoCallingRepository = mockVideoCallingRepository
             )
         ) {
             on { queryImsState(SUB_ID) } doReturn mockVtQueryImsState
@@ -70,6 +73,42 @@ class VideoCallingPreferenceControllerTest {
         controller.displayPreference(preferenceScreen)
     }
 
+
+    @Test
+    fun displayPreference_uiInitState_isHidden() {
+        assertThat(preference.isVisible).isFalse()
+    }
+
+    @Test
+    fun onViewCreated_videoCallIsNotReady_isHidden() = runBlocking {
+        mockVideoCallingRepository.stub {
+            on { isVideoCallReadyFlow(SUB_ID) } doReturn flowOf(false)
+        }
+        mockCallStateRepository.stub {
+            on { callStateFlow(SUB_ID) } doReturn flowOf(TelephonyManager.CALL_STATE_IDLE)
+        }
+
+        controller.onViewCreated(TestLifecycleOwner())
+        delay(100)
+
+        assertThat(preference.isVisible).isFalse()
+    }
+
+    @Test
+    fun onViewCreated_videoCallIsNotReady_isShown() = runBlocking {
+        mockVideoCallingRepository.stub {
+            on { isVideoCallReadyFlow(SUB_ID) } doReturn flowOf(true)
+        }
+        mockCallStateRepository.stub {
+            on { callStateFlow(SUB_ID) } doReturn flowOf(TelephonyManager.CALL_STATE_IDLE)
+        }
+
+        controller.onViewCreated(TestLifecycleOwner())
+        delay(100)
+
+        assertThat(preference.isVisible).isTrue()
+    }
+
     @Test
     fun updateState_4gLteOff_disabledAndUnchecked() {
         mockQueryVoLteState.stub { on { isEnabledByUser } doReturn false }
@@ -82,6 +121,9 @@ class VideoCallingPreferenceControllerTest {
 
     @Test
     fun updateState_4gLteOnWithoutCall_enabledAndChecked() = runBlocking {
+        mockVideoCallingRepository.stub {
+            on { isVideoCallReadyFlow(SUB_ID) } doReturn flowOf(true)
+        }
         mockVtQueryImsState.stub {
             on { isEnabledByUser } doReturn true
             on { isAllowUserControl } doReturn true
@@ -101,6 +143,9 @@ class VideoCallingPreferenceControllerTest {
 
     @Test
     fun updateState_4gLteOnWithCall_disabledAndChecked() = runBlocking {
+        mockVideoCallingRepository.stub {
+            on { isVideoCallReadyFlow(SUB_ID) } doReturn flowOf(true)
+        }
         mockVtQueryImsState.stub {
             on { isEnabledByUser } doReturn true
             on { isAllowUserControl } doReturn true
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
index f821e1a76fd..6044389e8d6 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.kt
@@ -18,10 +18,12 @@ package com.android.settings.network.telephony.gsm
 
 import android.content.Context
 import android.content.Intent
+import android.platform.test.annotations.EnableFlags
 import android.provider.Settings
 import android.telephony.CarrierConfigManager
 import android.telephony.ServiceState
 import android.telephony.TelephonyManager
+import android.telephony.satellite.SatelliteManager
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertIsOff
@@ -36,6 +38,7 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.settings.R
 import com.android.settings.Settings.NetworkSelectActivity
+import com.android.settings.flags.Flags
 import com.android.settings.spa.preference.ComposePreference
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.delay
@@ -46,6 +49,8 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.mockito.junit.MockitoJUnit
 import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doNothing
@@ -57,6 +62,9 @@ import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
 class AutoSelectPreferenceControllerTest {
+    @get:Rule
+    val mockito = MockitoJUnit.rule()
+
     @get:Rule
     val composeTestRule = createComposeRule()
 
@@ -65,8 +73,12 @@ class AutoSelectPreferenceControllerTest {
         on { simOperatorName } doReturn OPERATOR_NAME
     }
 
+    private val mockSatelliteManager = mock<SatelliteManager> {
+    }
+
     private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
         on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+        on { getSystemService(SatelliteManager::class.java) } doReturn mockSatelliteManager
         doNothing().whenever(mock).startActivity(any())
     }
 
@@ -115,7 +127,6 @@ class AutoSelectPreferenceControllerTest {
             .assertIsOff()
     }
 
-
     @Test
     fun isEnabled_isRoaming_enabled() {
         serviceState.roaming = true
@@ -158,6 +169,68 @@ class AutoSelectPreferenceControllerTest {
             .assertIsNotEnabled()
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    fun isEnabled_isSatelliteSessionStartedAndSelectedSubForSatellite_disabled() {
+        controller.selectedNbIotSatelliteSubscriptionCallback
+            .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID)
+        controller.satelliteModemStateCallback
+            .onSatelliteModemStateChanged(SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED)
+
+        composeTestRule.setContent {
+            controller.Content()
+        }
+
+        composeTestRule.onNodeWithText(context.getString(R.string.select_automatically))
+            .assertIsNotEnabled()
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    fun isEnabled_isSatelliteSessionNotStartedButIsSelectedSubForSatellite_enabled() {
+        controller.selectedNbIotSatelliteSubscriptionCallback
+            .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID)
+        controller.satelliteModemStateCallback
+            .onSatelliteModemStateChanged(SatelliteManager.SATELLITE_MODEM_STATE_OFF)
+
+        composeTestRule.setContent {
+            controller.Content()
+        }
+
+        composeTestRule.onNodeWithText(context.getString(R.string.select_automatically))
+            .assertIsEnabled()
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    fun isEnabled_isSatelliteSessionStartedButNotSelectedSubForSatellite_enabled() {
+        controller.selectedNbIotSatelliteSubscriptionCallback
+            .onSelectedNbIotSatelliteSubscriptionChanged(0)
+        controller.satelliteModemStateCallback
+            .onSatelliteModemStateChanged(SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED)
+
+        composeTestRule.setContent {
+            controller.Content()
+        }
+
+        composeTestRule.onNodeWithText(context.getString(R.string.select_automatically))
+            .assertIsEnabled()
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    fun initialization_noSatellite_noCrash() {
+        `when`(context.getSystemService(SatelliteManager::class.java)).thenReturn(null)
+
+        AutoSelectPreferenceController(
+            context = context,
+            key = TEST_KEY,
+            allowedNetworkTypesFlowFactory = { emptyFlow() },
+            serviceStateFlowFactory = { flowOf(serviceState) },
+            getConfigForSubId = { carrierConfig },
+        ).init(subId = SUB_ID)
+    }
+
     @Test
     fun onClick_turnOff_startNetworkSelectActivity() {
         serviceState.isManualSelection = false
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/mode/NetworkModesTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/mode/NetworkModesTest.kt
new file mode 100644
index 00000000000..799ac0f437a
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/mode/NetworkModesTest.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.mode
+
+import android.telephony.TelephonyManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class NetworkModesTest {
+
+    @Test
+    fun addNrToLteNetworkMode_lteOnly() {
+        val nrNetworkMode =
+            NetworkModes.addNrToLteNetworkMode(TelephonyManager.NETWORK_MODE_LTE_ONLY)
+
+        assertThat(nrNetworkMode).isEqualTo(TelephonyManager.NETWORK_MODE_NR_LTE)
+    }
+
+    @Test
+    fun addNrToLteNetworkMode_lteCdmaEvdo() {
+        val nrNetworkMode =
+            NetworkModes.addNrToLteNetworkMode(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO)
+
+        assertThat(nrNetworkMode).isEqualTo(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO)
+    }
+
+    @Test
+    fun reduceNrToLteNetworkMode_nrLte() {
+        val lteNetworkMode =
+            NetworkModes.reduceNrToLteNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE)
+
+        assertThat(lteNetworkMode).isEqualTo(TelephonyManager.NETWORK_MODE_LTE_ONLY)
+    }
+
+    @Test
+    fun reduceNrToLteNetworkMode_nrLteCdmaEvdo() {
+        val lteNetworkMode =
+            NetworkModes.reduceNrToLteNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO)
+
+        assertThat(lteNetworkMode).isEqualTo(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO)
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/PackageInfoPresenterTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/PackageInfoPresenterTest.kt
index 5dd66e8fff5..f35359fe66c 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/PackageInfoPresenterTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/PackageInfoPresenterTest.kt
@@ -17,6 +17,7 @@
 package com.android.settings.spa.app.appinfo
 
 import android.app.ActivityManager
+import android.app.KeyguardManager
 import android.app.settings.SettingsEnums
 import android.content.Context
 import android.content.Intent
@@ -25,6 +26,8 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.dx.mockito.inline.extended.ExtendedMockito
+import com.android.settings.Utils
 import com.android.settings.testutils.FakeFeatureFactory
 import com.android.settings.testutils.mockAsUser
 import com.android.settingslib.spaprivileged.framework.common.activityManager
@@ -33,8 +36,11 @@ import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
+import org.junit.After
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.MockitoSession
 import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doNothing
@@ -43,6 +49,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import org.mockito.quality.Strictness
 
 @RunWith(AndroidJUnit4::class)
 class PackageInfoPresenterTest {
@@ -51,9 +58,14 @@ class PackageInfoPresenterTest {
 
     private val mockActivityManager = mock<ActivityManager>()
 
+    private val mockKeyguardManager = mock<KeyguardManager>()
+
+    private lateinit var mockSession: MockitoSession
+
     private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
         on { packageManager } doReturn mockPackageManager
         on { activityManager } doReturn mockActivityManager
+        on { getSystemService(Context.KEYGUARD_SERVICE) } doReturn mockKeyguardManager
         doNothing().whenever(mock).startActivityAsUser(any(), any())
         mock.mockAsUser()
     }
@@ -66,6 +78,24 @@ class PackageInfoPresenterTest {
     private val packageInfoPresenter =
         PackageInfoPresenter(context, PACKAGE_NAME, USER_ID, TestScope(), packageManagers)
 
+    private var isUserAuthenticated: Boolean = false
+
+    @Before
+    fun setUp() {
+        mockSession = ExtendedMockito.mockitoSession()
+            .initMocks(this)
+            .mockStatic(Utils::class.java)
+            .strictness(Strictness.LENIENT)
+            .startMocking()
+        whenever(Utils.isProtectedPackage(context, PACKAGE_NAME)).thenReturn(false)
+    }
+
+    @After
+    fun tearDown() {
+        mockSession.finishMocking()
+        isUserAuthenticated = false
+    }
+
     @Test
     fun isInterestedAppChange_packageChanged_isInterested() {
         val intent = Intent(Intent.ACTION_PACKAGE_CHANGED).apply {
@@ -129,25 +159,37 @@ class PackageInfoPresenterTest {
         packageInfoPresenter.disable()
         delay(100)
 
-        verifyAction(SettingsEnums.ACTION_SETTINGS_DISABLE_APP)
-        verify(mockPackageManager).setApplicationEnabledSetting(
-            PACKAGE_NAME, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0
-        )
+        verifyDisablePackage()
+    }
+
+    @Test
+    fun disable_protectedPackage() = runBlocking {
+        mockProtectedPackage()
+        setAuthPassesAutomatically()
+
+        packageInfoPresenter.disable()
+        delay(100)
+
+        verifyUserAuthenticated()
+        verifyDisablePackage()
     }
 
     @Test
     fun startUninstallActivity() = runBlocking {
         packageInfoPresenter.startUninstallActivity()
 
-        verifyAction(SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP)
-        val intent = argumentCaptor<Intent> {
-            verify(context).startActivityAsUser(capture(), any())
-        }.firstValue
-        with(intent) {
-            assertThat(action).isEqualTo(Intent.ACTION_UNINSTALL_PACKAGE)
-            assertThat(data?.schemeSpecificPart).isEqualTo(PACKAGE_NAME)
-            assertThat(getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, true)).isEqualTo(false)
-        }
+        verifyUninstallPackage()
+    }
+
+    @Test
+    fun startUninstallActivity_protectedPackage() = runBlocking {
+        mockProtectedPackage()
+        setAuthPassesAutomatically()
+
+        packageInfoPresenter.startUninstallActivity()
+
+        verifyUserAuthenticated()
+        verifyUninstallPackage()
     }
 
     @Test
@@ -164,8 +206,19 @@ class PackageInfoPresenterTest {
         packageInfoPresenter.forceStop()
         delay(100)
 
-        verifyAction(SettingsEnums.ACTION_APP_FORCE_STOP)
-        verify(mockActivityManager).forceStopPackageAsUser(PACKAGE_NAME, USER_ID)
+        verifyForceStop()
+    }
+
+    @Test
+    fun forceStop_protectedPackage() = runBlocking {
+        mockProtectedPackage()
+        setAuthPassesAutomatically()
+
+        packageInfoPresenter.forceStop()
+        delay(100)
+
+        verifyUserAuthenticated()
+        verifyForceStop()
     }
 
     @Test
@@ -179,6 +232,48 @@ class PackageInfoPresenterTest {
         verify(metricsFeatureProvider).action(context, category, PACKAGE_NAME)
     }
 
+    private fun verifyDisablePackage() {
+        verifyAction(SettingsEnums.ACTION_SETTINGS_DISABLE_APP)
+        verify(mockPackageManager).setApplicationEnabledSetting(
+            PACKAGE_NAME, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0
+        )
+    }
+
+    private fun verifyUninstallPackage() {
+        verifyAction(SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP)
+
+        val intent = argumentCaptor<Intent> {
+            verify(context).startActivityAsUser(capture(), any())
+        }.firstValue
+        with(intent) {
+            assertThat(action).isEqualTo(Intent.ACTION_UNINSTALL_PACKAGE)
+            assertThat(data?.schemeSpecificPart).isEqualTo(PACKAGE_NAME)
+            assertThat(getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, true)).isEqualTo(false)
+        }
+    }
+
+    private fun verifyForceStop() {
+        verifyAction(SettingsEnums.ACTION_APP_FORCE_STOP)
+        verify(mockActivityManager).forceStopPackageAsUser(PACKAGE_NAME, USER_ID)
+    }
+
+    private fun setAuthPassesAutomatically() {
+        whenever(mockKeyguardManager.isKeyguardSecure).thenReturn(mockUserAuthentication())
+    }
+
+    private fun mockUserAuthentication() : Boolean {
+        isUserAuthenticated = true
+        return false
+    }
+
+    private fun mockProtectedPackage() {
+        whenever(Utils.isProtectedPackage(context, PACKAGE_NAME)).thenReturn(true)
+    }
+
+    private fun verifyUserAuthenticated() {
+        assertThat(isUserAuthenticated).isTrue()
+    }
+
     private companion object {
         const val PACKAGE_NAME = "package.name"
         const val USER_ID = 0
diff --git a/tests/spa_unit/src/com/android/settings/spa/network/PrimarySimRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/spa/network/PrimarySimRepositoryTest.kt
index 459afa9c245..ce4df2ed4d0 100644
--- a/tests/spa_unit/src/com/android/settings/spa/network/PrimarySimRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/network/PrimarySimRepositoryTest.kt
@@ -101,6 +101,16 @@ class PrimarySimRepositoryTest {
             SUB_INFO_1,
             SUB_INFO_2
         )
+
+        context.stub {
+            on { resources } doReturn spyResources
+        }
+        spyResources.stub {
+            on {
+                getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support)
+            } doReturn true
+        }
+
         val expectedList = listOf(
             ListPreferenceOption(
                 id = SUB_INFO_1.subscriptionId,
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index be43f8ef923..07df3c847a8 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -26,11 +26,14 @@ android_test {
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "flag-junit",
+        "kotlin-test",
+        "mockito-kotlin2",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "platform-test-rules",
         "truth",
         "kotlinx_coroutines_test",
+        "SettingsLibPreference-testutils",
         "Settings-testutils2",
         "servicestests-utils",
         // Don't add SettingsLib libraries here - you can use them directly as they are in the
diff --git a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
index d068194cd9c..09c746b732b 100644
--- a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
@@ -25,12 +25,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.provider.Settings;
-import android.view.accessibility.Flags;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -41,7 +36,6 @@ import com.android.internal.accessibility.util.ShortcutUtils;
 
 import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -61,8 +55,6 @@ public class PreferredShortcutsTest {
             CLASS_NAME_2);
     private static final ContentResolver sContentResolver =
             ApplicationProvider.getApplicationContext().getContentResolver();
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
     private final Context mContext = ApplicationProvider.getApplicationContext();
 
     @Before
@@ -175,7 +167,6 @@ public class PreferredShortcutsTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void updatePreferredShortcutFromSettings_colorInversionWithQsAndSoftwareShortcut_preferredShortcutsMatches() {
         String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
         Settings.Secure.putString(sContentResolver,
@@ -192,23 +183,6 @@ public class PreferredShortcutsTest {
 
     }
 
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void updatePreferredShortcutFromSettings_colorInversionWithQsAndHardwareShortcut_qsShortcutNotSaved() {
-        String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
-        Settings.Secure.putString(sContentResolver,
-                Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, target);
-        Settings.Secure.putString(sContentResolver,
-                Settings.Secure.ACCESSIBILITY_QS_TARGETS, target);
-        assertThat(!android.view.accessibility.Flags.a11yQsShortcut()).isTrue();
-
-        PreferredShortcuts.updatePreferredShortcutsFromSettings(mContext, Set.of(target));
-
-        int savedPreferredShortcut = PreferredShortcuts.retrieveUserShortcutType(
-                mContext, target);
-        assertThat(savedPreferredShortcut).isEqualTo(UserShortcutType.HARDWARE);
-    }
-
     @Test
     public void retrieveUserShortcutTypeWithoutDefault_noUserPreferredShortcuts_returnSoftwareShortcut() {
         String target = COMPONENT_NAME_1.flattenToString();
diff --git a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
index 7229996b2e3..e1c0277c7e9 100644
--- a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.internal.accessibility.AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.doReturn;
@@ -26,12 +24,7 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.provider.Settings;
-import android.view.accessibility.Flags;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -40,7 +33,6 @@ import com.android.internal.R;
 
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -48,8 +40,6 @@ import org.junit.runner.RunWith;
 public class ReduceBrightColorsPreferenceControllerTest {
     private static final String PREF_KEY = "rbc_preference";
 
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
     private Context mContext;
     private Resources mResources;;
     private ReduceBrightColorsPreferenceController mController;
@@ -98,20 +88,6 @@ public class ReduceBrightColorsPreferenceControllerTest {
         assertThat(mController.isAvailable()).isFalse();
     }
 
-
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void getTileComponentName_a11yQsFlagOff_returnComponentName() {
-        assertThat(mController.getTileComponentName())
-                .isEqualTo(REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME);
-    }
-
-    @Test
-    @RequiresFlagsEnabled(Flags.FLAG_A11Y_QS_SHORTCUT)
-    public void getTileComponentName_a11yQsFlagOff_returnNull() {
-        assertThat(mController.getTileComponentName()).isNull();
-    }
-
     private int resourceId(String type, String name) {
         return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
     }
diff --git a/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java b/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
index 342212afc7b..4c0755510b6 100644
--- a/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
+++ b/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
@@ -331,9 +331,7 @@ public class UserAspectRatioManagerTest {
                 .isEqualTo(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName));
     }
 
-    @Test
-    public void testGetUserMinAspectRatioEntry_enabledFullscreenOverride_returnsFullscreen() {
-        setIsOverrideToFullscreenEnabled(true);
+    private void assertUnsetIsFullscreen() {
         // Fullscreen option is pre-selected
         assertThat(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName))
                 .isEqualTo(ResourcesUtils.getResourcesString(
@@ -347,9 +345,7 @@ public class UserAspectRatioManagerTest {
                         "user_aspect_ratio_app_default"));
     }
 
-    @Test
-    public void testGetUserMinAspectRatioEntry_disabledFullscreenOverride_returnsUnchanged() {
-        setIsOverrideToFullscreenEnabled(false);
+    private void assertUnsetIsAppDefault() {
         // Fullscreen option is not pre-selected
         assertThat(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName))
                 .isEqualTo(ResourcesUtils.getResourcesString(
@@ -358,9 +354,43 @@ public class UserAspectRatioManagerTest {
     }
 
     @Test
-    public void testIsOverrideToFullscreenEnabled_returnsTrue()
+    public void testGetUserMinAspectRatioEntry_enabledFullscreenCompatChange_returnsFullscreen() {
+        setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
+        assertUnsetIsFullscreen();
+    }
+
+    @Test
+    public void testGetUserMinAspectRatioEntry_enabledFullscreenOverrideUniRes_returnsFullscreen() {
+        setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
+        assertUnsetIsFullscreen();
+    }
+
+    @Test
+    public void testGetUserMinAspectRatioEntry_noFullscreenCompatChange_returnsUnchanged() {
+        setIsOverrideToFullscreenEnabledBecauseCompatChange(false);
+        assertUnsetIsAppDefault();
+    }
+
+    @Test
+    public void testGetUserMinAspectRatioEntry_noFullscreenUnivRes_returnsUnchanged() {
+        setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(false);
+        assertUnsetIsAppDefault();
+    }
+
+    @Test
+    public void testIsOverrideToFullscreenEnabledCompatChange_returnsTrue()
             throws PackageManager.NameNotFoundException {
-        setIsOverrideToFullscreenEnabled(true);
+        setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
+        assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
+
+        mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, true);
+        assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
+    }
+
+    @Test
+    public void testIsOverrideToFullscreenEnabledUnivRes_returnsTrue()
+            throws PackageManager.NameNotFoundException {
+        setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
         assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
 
         mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, true);
@@ -370,7 +400,7 @@ public class UserAspectRatioManagerTest {
     @Test
     public void testIsOverrideToFullscreenEnabled_optOut_returnsFalse()
             throws PackageManager.NameNotFoundException {
-        setIsOverrideToFullscreenEnabled(true);
+        setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
         mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, false);
         assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
     }
@@ -381,6 +411,12 @@ public class UserAspectRatioManagerTest {
         assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
     }
 
+    @Test
+    public void testIsOverrideToFullscreenEnabledUnivRes_flagDisabled_returnsFalse() {
+        mUtils.setFullscreenCompatChange(true);
+        assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
+    }
+
     @Test
     public void testIsOverrideToFullscreenEnabled_optionDisabled_returnsFalse() {
         mUtils.setFullscreenCompatChange(true);
@@ -389,7 +425,7 @@ public class UserAspectRatioManagerTest {
         assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
     }
 
-    private void setIsOverrideToFullscreenEnabled(boolean enabled) {
+    private void setIsOverrideToFullscreenEnabledBecauseCompatChange(boolean enabled) {
         if (enabled) {
             mSetFlagsRule.enableFlags(FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT);
             mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
@@ -399,6 +435,16 @@ public class UserAspectRatioManagerTest {
                 .thenReturn(enabled);
     }
 
+    private void setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(boolean enabled) {
+        if (enabled) {
+            mSetFlagsRule.enableFlags(FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT);
+            mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
+        }
+        mUtils.setUniversalResizeable(enabled);
+        when(mUtils.hasAspectRatioOption(USER_MIN_ASPECT_RATIO_FULLSCREEN, mPackageName))
+                .thenReturn(enabled);
+    }
+
     private void enableAllDefaultAspectRatioOptions() {
         final int[] aspectRatioOptions = new int[] {
                 USER_MIN_ASPECT_RATIO_UNSET,
@@ -457,6 +503,7 @@ public class UserAspectRatioManagerTest {
 
     private static class FakeUserAspectRatioManager extends UserAspectRatioManager {
         private boolean mFullscreenCompatChange = false;
+        private boolean mIsUniversalResizeable = false;
 
         private FakeUserAspectRatioManager(@NonNull Context context, IPackageManager pm) {
             super(context, pm);
@@ -467,8 +514,17 @@ public class UserAspectRatioManagerTest {
             return mFullscreenCompatChange;
         }
 
+        @Override
+        boolean isUniversalResizeable(String pkgName, int userId) {
+            return mIsUniversalResizeable;
+        }
+
         void setFullscreenCompatChange(boolean enabled) {
             mFullscreenCompatChange = enabled;
         }
+
+        void setUniversalResizeable(boolean enabled) {
+            mIsUniversalResizeable = enabled;
+        }
     }
 }
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
index 019ade7ae58..93ba97b27f5 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.connecteddevice.display;
 
-
 import static android.view.Display.INVALID_DISPLAY;
 
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.PREVIOUSLY_SHOWN_LIST_KEY;
@@ -29,6 +28,7 @@ import static com.android.settings.connecteddevice.display.ExternalDisplayPrefer
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_SETTINGS_RESOURCE;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_USE_PREFERENCE_KEY;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_USE_TITLE_RESOURCE;
+import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
 import static com.android.settingslib.widget.FooterPreference.KEY_FOOTER;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -71,6 +71,7 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
     private ExternalDisplayPreferenceFragment mFragment;
     private int mPreferenceIdFromResource;
     private int mDisplayIdArg = INVALID_DISPLAY;
+    private boolean mLaunchedBuiltinSettings;
     private int mResolutionSelectorDisplayId = INVALID_DISPLAY;
     @Mock
     private MetricsLogger mMockedMetricsLogger;
@@ -85,6 +86,8 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
     @Test
     @UiThreadTest
     public void testShowDisplayList() {
+        mFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, false);
+
         var fragment = initFragment();
         var outState = new Bundle();
         fragment.onSaveInstanceStateCallback(outState);
@@ -101,6 +104,62 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
         assertThat(pref.getPreferenceCount()).isEqualTo(2);
         fragment.onSaveInstanceStateCallback(outState);
         assertThat(outState.getBoolean(PREVIOUSLY_SHOWN_LIST_KEY)).isTrue();
+
+        pref = mPreferenceScreen.findPreference(DisplayTopologyKt.PREFERENCE_KEY);
+        assertThat(pref).isNull();
+
+        pref = mPreferenceScreen.findPreference(
+                ExternalDisplayPreferenceFragment.BUILTIN_DISPLAY_LIST_PREFERENCE_KEY);
+        assertThat(pref).isNull();
+    }
+
+    @Test
+    @UiThreadTest
+    public void testShowDisplayListWithPane_OneExternalDisplay() {
+        mFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, true);
+
+        initFragment();
+        doReturn(new Display[] {mDisplays[1]}).when(mMockedInjector).getAllDisplays();
+        mHandler.flush();
+
+        var pref = mPreferenceScreen.findPreference(DisplayTopologyKt.PREFERENCE_KEY);
+        assertThat(pref).isNotNull();
+
+        PreferenceCategory listPref =
+                mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+        assertThat(listPref).isNotNull();
+        assertThat(listPref.getPreferenceCount()).isEqualTo(1);
+
+        listPref = mPreferenceScreen.findPreference(
+                ExternalDisplayPreferenceFragment.BUILTIN_DISPLAY_LIST_PREFERENCE_KEY);
+        assertThat(listPref).isNotNull();
+        assertThat(listPref.getPreferenceCount()).isEqualTo(1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void testShowDisplayListWithPane_NoExternalDisplays() {
+        mFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, true);
+
+        initFragment();
+        doReturn(new Display[0]).when(mMockedInjector).getAllDisplays();
+        mHandler.flush();
+
+        var pref = mPreferenceScreen.findPreference(DisplayTopologyKt.PREFERENCE_KEY);
+        assertThat(pref).isNotNull();
+
+        PreferenceCategory listPref =
+                mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+        assertThat(listPref).isNull();
+
+        listPref = mPreferenceScreen.findPreference(
+                ExternalDisplayPreferenceFragment.BUILTIN_DISPLAY_LIST_PREFERENCE_KEY);
+        assertThat(listPref).isNotNull();
+        assertThat(listPref.getPreferenceCount()).isEqualTo(1);
+        var builtinPref = listPref.getPreference(0);
+        assertThat(builtinPref.getOnPreferenceClickListener().onPreferenceClick(builtinPref))
+                .isTrue();
+        assertThat(mLaunchedBuiltinSettings).isTrue();
     }
 
     @Test
@@ -386,10 +445,15 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
         }
 
         @Override
-        protected void launchDisplaySettings(final int displayId) {
+        protected void launchExternalDisplaySettings(final int displayId) {
             mDisplayIdArg = displayId;
         }
 
+        @Override
+        protected void launchBuiltinDisplaySettings() {
+            mLaunchedBuiltinSettings = true;
+        }
+
         @Override
         protected void writePreferenceClickMetric(Preference preference) {
             mLogger.writePreferenceClickMetric(preference);
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
index 4cba1ef4666..874ecbd1197 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
@@ -16,8 +16,9 @@
 package com.android.settings.connecteddevice.display;
 
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY;
-import static com.android.settings.flags.Flags.FLAG_ROTATION_CONNECTED_DISPLAY_SETTING;
+import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
 import static com.android.settings.flags.Flags.FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING;
+import static com.android.settings.flags.Flags.FLAG_ROTATION_CONNECTED_DISPLAY_SETTING;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -74,6 +75,7 @@ public class ExternalDisplayTestBase {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         doReturn(0).when(mMockedIDisplayManager).getPreferredWideGamutColorSpaceId();
         mDisplayManagerGlobal = new DisplayManagerGlobal(mMockedIDisplayManager);
+        mFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, false);
         mFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, true);
         mFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, true);
         mDisplays = new Display[] {
diff --git a/tests/unit/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 7e942d9e94e..9a09bf1f0a5 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -93,7 +93,7 @@ public class BuildNumberPreferenceControllerTest {
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
         when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         when(mBiometricManager.canAuthenticate(mContext.getUserId(),
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
 
         mFactory = FakeFeatureFactory.setupForTest();
@@ -213,7 +213,7 @@ public class BuildNumberPreferenceControllerTest {
     public void onActivityResult_confirmPasswordRequestCompleted_launchBiometricPrompt() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mBiometricManager.canAuthenticate(mContext.getUserId(),
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+                BiometricManager.Authenticators.IDENTITY_CHECK))
                 .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
 
         final boolean activityResultHandled = mController.onActivityResult(
@@ -233,8 +233,8 @@ public class BuildNumberPreferenceControllerTest {
     public void onActivityResult_confirmPasswordRequestCompleted_mandatoryBiometricsError() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mBiometricManager.canAuthenticate(mContext.getUserId(),
-                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
-                .thenReturn(BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE);
+                BiometricManager.Authenticators.IDENTITY_CHECK))
+                .thenReturn(BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE);
 
         final boolean activityResultHandled = mController.onActivityResult(
                 BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
diff --git a/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
deleted file mode 100644
index 9a5399c5f07..00000000000
--- a/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
+++ /dev/null
@@ -1,159 +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;
-
-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.content.Context;
-import android.os.Looper;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.Preference;
-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.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.ArrayList;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class PhoneNumberPreferenceControllerTest {
-
-    private Preference mPreference;
-    @Mock
-    private Preference mSecondPreference;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    private PreferenceCategory mCategory;
-    private PreferenceScreen mScreen;
-
-    private Context mContext;
-    private PhoneNumberPreferenceController mController;
-
-    @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);
-        mController = spy(new PhoneNumberPreferenceController(mContext, "phone_number"));
-
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        mScreen = preferenceManager.createPreferenceScreen(mContext);
-        mPreference = spy(new Preference(mContext));
-        mPreference.setKey(mController.getPreferenceKey());
-        mPreference.setVisible(true);
-        mScreen.addPreference(mPreference);
-        final String categoryKey = "basic_info_category";
-        mCategory = new PreferenceCategory(mContext);
-        mCategory.setKey(categoryKey);
-        mScreen.addPreference(mCategory);
-
-        doReturn(mSecondPreference).when(mController).createNewPreference(mContext);
-    }
-
-    @Test
-    public void displayPreference_multiSim_shouldAddSecondPreference() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
-
-        final Preference sim1Preference = new Preference(mContext);
-        mCategory.addItemFromInflater(sim1Preference);
-        mController.displayPreference(mScreen);
-
-        assertThat(mCategory.getPreferenceCount()).isEqualTo(2);
-    }
-
-    @Test
-    public void updateState_singleSim_shouldUpdateTitleAndPhoneNumber() {
-        final String phoneNumber = "1111111111";
-        doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());
-        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
-        when(mTelephonyManager.getPhoneCount()).thenReturn(1);
-        mController.displayPreference(mScreen);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setTitle(ResourcesUtils.getResourcesString(mContext, "status_number"));
-        verify(mPreference).setSummary(phoneNumber);
-    }
-
-    @Test
-    public void updateState_multiSim_shouldUpdateTitleAndPhoneNumberOfMultiplePreferences() {
-        final String phoneNumber = "1111111111";
-        doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());
-        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
-        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
-        mController.displayPreference(mScreen);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setTitle(ResourcesUtils.getResourcesString(
-                mContext, "status_number_sim_slot", 1 /* sim slot */));
-        verify(mPreference).setSummary(phoneNumber);
-        verify(mSecondPreference).setTitle(ResourcesUtils.getResourcesString(
-                mContext, "status_number_sim_slot", 2 /* sim slot */));
-        verify(mSecondPreference).setSummary(phoneNumber);
-    }
-
-    @Test
-    public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() {
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
-        mController.displayPreference(mScreen);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(ResourcesUtils.getResourcesString(
-                mContext, "device_info_default"));
-    }
-
-    @Test
-    public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {
-        List<SubscriptionInfo> infos = new ArrayList<>();
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(ResourcesUtils.getResourcesString(
-                mContext, "device_info_default"));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt b/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt
index 691b6112bf7..f479fa31784 100644
--- a/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt
@@ -30,6 +30,7 @@ import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
 import android.os.CancellationSignal
 import android.os.Handler
 import com.android.settings.biometrics.GatekeeperPasswordProvider
+import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintEnrollmentRepository
 import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintEnrollmentRepositoryImpl
 import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintSensorRepository
 import com.android.settings.biometrics.fingerprint2.data.repository.FingerprintSettingsRepositoryImpl
@@ -61,7 +62,7 @@ import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.last
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
@@ -106,9 +107,14 @@ class FingerprintManagerInteractorTest {
   private val flow: FingerprintFlow = Default
   private val maxFingerprints = 5
   private val currUser = MutableStateFlow(0)
+  private lateinit var fingerprintEnrollRepo: FingerprintEnrollmentRepository
   private val userRepo =
     object : UserRepo {
       override val currentUser: Flow<Int> = currUser
+
+      override fun updateUser(user: Int) {
+        currUser.update { user }
+      }
     }
 
   @Before
@@ -133,29 +139,30 @@ class FingerprintManagerInteractorTest {
       }
 
     val settingsRepository = FingerprintSettingsRepositoryImpl(maxFingerprints)
-    val fingerprintEnrollmentRepository =
+    fingerprintEnrollRepo =
       FingerprintEnrollmentRepositoryImpl(
         fingerprintManager,
         userRepo,
         settingsRepository,
         backgroundDispatcher,
         backgroundScope,
+        fingerprintSensorRepository,
       )
 
     enrolledFingerprintsInteractorUnderTest =
-      EnrolledFingerprintsInteractorImpl(fingerprintManager, userId)
+      EnrolledFingerprintsInteractorImpl(fingerprintEnrollRepo)
     generateChallengeInteractorUnderTest =
-      GenerateChallengeInteractorImpl(fingerprintManager, userId, gateKeeperPasswordProvider)
+      GenerateChallengeInteractorImpl(fingerprintManager, userRepo, gateKeeperPasswordProvider)
     removeFingerprintsInteractorUnderTest =
-      RemoveFingerprintsInteractorImpl(fingerprintManager, userId)
+      RemoveFingerprintsInteractorImpl(fingerprintManager, userRepo)
     renameFingerprintsInteractorUnderTest =
-      RenameFingerprintsInteractorImpl(fingerprintManager, userId, backgroundDispatcher)
-    authenticateInteractorImplUnderTest = AuthenticateInteractorImpl(fingerprintManager, userId)
+      RenameFingerprintsInteractorImpl(fingerprintManager, userRepo, backgroundDispatcher)
+    authenticateInteractorImplUnderTest = AuthenticateInteractorImpl(fingerprintManager, userRepo)
 
     canEnrollFingerprintsInteractorUnderTest =
-      CanEnrollFingerprintsInteractorImpl(fingerprintEnrollmentRepository)
+      CanEnrollFingerprintsInteractorImpl(fingerprintEnrollRepo)
 
-    enrollInteractorUnderTest = EnrollFingerprintInteractorImpl(userId, fingerprintManager, flow)
+    enrollInteractorUnderTest = EnrollFingerprintInteractorImpl(userRepo, fingerprintManager, flow)
   }
 
   @Test
@@ -163,9 +170,16 @@ class FingerprintManagerInteractorTest {
     testScope.runTest {
       whenever(fingerprintManager.getEnrolledFingerprints(anyInt())).thenReturn(emptyList())
 
-      val emptyFingerprintList: List<Fingerprint> = emptyList()
-      assertThat(enrolledFingerprintsInteractorUnderTest.enrolledFingerprints.last())
-        .isEqualTo(emptyFingerprintList)
+      var list: List<FingerprintData>? = null
+      val job =
+        testScope.launch {
+          enrolledFingerprintsInteractorUnderTest.enrolledFingerprints.collect { list = it }
+        }
+
+      runCurrent()
+      job.cancelAndJoin()
+
+      assertThat(list!!.isEmpty())
     }
 
   @Test
@@ -174,10 +188,19 @@ class FingerprintManagerInteractorTest {
       val expected = Fingerprint("Finger 1,", 2, 3L)
       val fingerprintList: List<Fingerprint> = listOf(expected)
       whenever(fingerprintManager.getEnrolledFingerprints(anyInt())).thenReturn(fingerprintList)
+      // This causes the enrolled fingerprints to be updated
+
+      var list: List<FingerprintData>? = null
+      val job =
+        testScope.launch {
+          enrolledFingerprintsInteractorUnderTest.enrolledFingerprints.collect { list = it }
+        }
+
+      runCurrent()
+      job.cancelAndJoin()
 
-      val list = enrolledFingerprintsInteractorUnderTest.enrolledFingerprints.last()
       assertThat(list!!.size).isEqualTo(fingerprintList.size)
-      val actual = list[0]
+      val actual = list!![0]
       assertThat(actual.name).isEqualTo(expected.name)
       assertThat(actual.fingerId).isEqualTo(expected.biometricId)
       assertThat(actual.deviceId).isEqualTo(expected.deviceId)
@@ -220,11 +243,7 @@ class FingerprintManagerInteractorTest {
       whenever(fingerprintManager.getEnrolledFingerprints(anyInt())).thenReturn(fingerprintList)
 
       var result: Boolean? = null
-      val job =
-        testScope.launch {
-          canEnrollFingerprintsInteractorUnderTest.canEnrollFingerprints.collect { result = it }
-        }
-
+      val job = testScope.launch { fingerprintEnrollRepo.canEnrollUser.collect { result = it } }
       runCurrent()
       job.cancelAndJoin()
 
diff --git a/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt b/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
index 04cece83cd0..70e6de10a07 100644
--- a/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
@@ -30,6 +30,7 @@ import com.android.settings.biometrics.fingerprint2.domain.interactor.Accessibil
 import com.android.settings.biometrics.fingerprint2.domain.interactor.FoldStateInteractor
 import com.android.settings.biometrics.fingerprint2.domain.interactor.OrientationInteractor
 import com.android.settings.biometrics.fingerprint2.lib.model.Default
+import com.android.settings.biometrics.fingerprint2.lib.model.Orientation
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.BackgroundViewModel
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollFindSensorViewModel
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollViewModel
@@ -39,6 +40,7 @@ import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.Fing
 import com.android.settings.testutils2.FakeFingerprintManagerInteractor
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -106,7 +108,12 @@ class FingerprintEnrollFindSensorViewModelV2Test {
       )
     accessibilityInteractor =
       object : AccessibilityInteractor {
-        override val isAccessibilityEnabled: Flow<Boolean> = flowOf(false)
+        override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> = flowOf(true)
+        override val isEnabled: Boolean
+          get() = true
+        override fun announce(clazz: Class<*>, announcement: CharSequence?) {}
+        override fun interrupt() {
+        }
       }
     foldStateInteractor =
       object : FoldStateInteractor {
@@ -124,6 +131,7 @@ class FingerprintEnrollFindSensorViewModelV2Test {
         override val rotationFromDefault: Flow<Int> = flowOf(Surface.ROTATION_0)
 
         override fun getRotationFromDefault(rotation: Int): Int = rotation
+        override val orientationChanged: Flow<Orientation> = flowOf(Orientation.Portrait)
       }
     underTest =
       FingerprintEnrollFindSensorViewModel(
diff --git a/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt b/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt
index f59d1fcb820..a9ab5899e75 100644
--- a/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt
@@ -112,7 +112,7 @@ class FingerprintEnrollConfirmationViewModelTest {
           .toFingerprintSensor()
 
       fakeFingerprintManagerInteractor.enrolledFingerprintsInternal = mutableListOf()
-      fakeFingerprintManagerInteractor.enrollableFingerprints = 5
+      fakeFingerprintManagerInteractor.setMaxEnrollableFingerprints(5)
 
       var canEnrollFingerprints: Boolean = false
       val job = launch {
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt b/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
index 95f69da141d..385de309ea2 100644
--- a/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
+++ b/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
@@ -228,7 +228,7 @@ class AppOptModeSharedPreferencesUtilsTest {
     @Test
     fun updateBatteryOptimizationMode_updateToOptimizedMode_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true))
+        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode())
             .thenReturn(MODE_UNRESTRICTED)
 
         val currentOptMode =
@@ -246,9 +246,9 @@ class AppOptModeSharedPreferencesUtilsTest {
     }
 
     @Test
-    fun updateBatteryOptimizationMode_optimizationModeNotChanged_verifyAction() {
+    fun updateBatteryOptimizationMode_optimizationModeImmutable_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(false)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true))
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode)
             .thenReturn(MODE_UNRESTRICTED)
 
         val currentOptMode =
@@ -268,7 +268,7 @@ class AppOptModeSharedPreferencesUtilsTest {
     @Test
     fun updateBatteryOptimizationMode_updateToSameOptimizationMode_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(MODE_RESTRICTED)
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode).thenReturn(MODE_RESTRICTED)
 
         val currentOptMode =
             AppOptModeSharedPreferencesUtils.updateBatteryOptimizationMode(
@@ -286,7 +286,7 @@ class AppOptModeSharedPreferencesUtilsTest {
 
     private fun insertAppOptModeEventForTest(expirationTime: Long, mode: Int = MODE_OPTIMIZED) {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(mode)
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode).thenReturn(mode)
         AppOptModeSharedPreferencesUtils.updateAppOptModeExpirationInternal(
             context,
             mutableListOf(UID),
diff --git a/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java b/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java
index 6675d5a27c4..3faa52e6fb9 100644
--- a/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java
+++ b/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java
@@ -19,10 +19,7 @@ package com.android.settings.inputmethod;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.os.Looper;
 
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -47,17 +44,6 @@ public class KeyboardSettingsFeatureProviderImplTest {
         assertThat(mFeatureProvider.supportsFirmwareUpdate()).isFalse();
     }
 
-    @Test
-    public void addFirmwareUpdateCategory_defaultValue_returnsFalse() {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-        PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
-
-        assertThat(mFeatureProvider.addFirmwareUpdateCategory(mContext, screen)).isFalse();
-    }
-
     @Test
     public void getActionKeyIcon_defaultValue_returnsNull() {
         assertThat(mFeatureProvider.getActionKeyIcon(mContext)).isNull();
diff --git a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
index f8e790f55e7..656fa272ce2 100644
--- a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.language;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import android.content.ComponentName;
@@ -41,10 +40,9 @@ public class LanguagePreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_featureFlagOff_LanguageAndInputSettingsActivitydisabled() {
+    public void getAvailabilityStatus_featureFlagOff_LanguageSettingsActivitydisabled() {
         mController.getAvailabilityStatus();
 
-        assertFalse(isActivityEnable(mContext, Settings.LanguageAndInputSettingsActivity.class));
         assertTrue(isActivityEnable(mContext, Settings.LanguageSettingsActivity.class));
     }
 
diff --git a/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt b/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt
new file mode 100644
index 00000000000..7b519a27cab
--- /dev/null
+++ b/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.language
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import com.android.settings.Settings.LanguageSettingsActivity
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+class LanguageSettingScreenTest: CatalystScreenTestCase() {
+    override val preferenceScreenCreator = LanguageSettingScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_LANGUAGE_SETTING
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(LanguageSettingScreen.KEY)
+    }
+
+    override fun migration() {}
+}
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
index 246fad62af9..8b44c98b7cc 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.widget.TickButtonPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressFeminineControllerTest {
     private PreferenceCategory mPreferenceCategory;
     private PreferenceScreen mPreferenceScreen;
     private TermsOfAddressFeminineController mController;
-    private TickButtonPreference mFemininePreference;
-    private TickButtonPreference mMasculinePreference;
-    private TickButtonPreference mNotSpecifiedPreference;
-    private TickButtonPreference mNeutralPreference;
+    private SelectorWithWidgetPreference mFemininePreference;
+    private SelectorWithWidgetPreference mMasculinePreference;
+    private SelectorWithWidgetPreference mNotSpecifiedPreference;
+    private SelectorWithWidgetPreference mNeutralPreference;
     private GrammaticalInflectionManager mGrammaticalInflectionManager;
 
     @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressFeminineControllerTest {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreferenceCategory = new PreferenceCategory(mContext);
         mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
-        mNotSpecifiedPreference = new TickButtonPreference(mContext);
+        mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
         mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
-        mFemininePreference = new TickButtonPreference(mContext);
+        mFemininePreference = new SelectorWithWidgetPreference(mContext);
         mFemininePreference.setKey(KEY_FEMININE);
-        mMasculinePreference = new TickButtonPreference(mContext);
+        mMasculinePreference = new SelectorWithWidgetPreference(mContext);
         mMasculinePreference.setKey(KEY_MASCULINE);
-        mNeutralPreference = new TickButtonPreference(mContext);
+        mNeutralPreference = new SelectorWithWidgetPreference(mContext);
         mNeutralPreference.setKey(KEY_NEUTRAL);
         mPreferenceScreen.addPreference(mPreferenceCategory);
         mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressFeminineControllerTest {
     @Test
     @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsFeminine_FeminineIsSelected() {
-        TickButtonPreference selectedPreference =
-                (TickButtonPreference) mPreferenceScreen.getPreference(2);
+        SelectorWithWidgetPreference selectedPreference =
+                (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(2);
         selectedPreference.performClick();
 
         assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
index f5ed3959b76..62ba8990df8 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.widget.TickButtonPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressMasculineControllerTest {
     private PreferenceCategory mPreferenceCategory;
     private PreferenceScreen mPreferenceScreen;
     private TermsOfAddressMasculineController mController;
-    private TickButtonPreference mFemininePreference;
-    private TickButtonPreference mMasculinePreference;
-    private TickButtonPreference mNotSpecifiedPreference;
-    private TickButtonPreference mNeutralPreference;
+    private SelectorWithWidgetPreference mFemininePreference;
+    private SelectorWithWidgetPreference mMasculinePreference;
+    private SelectorWithWidgetPreference mNotSpecifiedPreference;
+    private SelectorWithWidgetPreference mNeutralPreference;
     private GrammaticalInflectionManager mGrammaticalInflectionManager;
 
     @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressMasculineControllerTest {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreferenceCategory = new PreferenceCategory(mContext);
         mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
-        mNotSpecifiedPreference = new TickButtonPreference(mContext);
+        mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
         mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
-        mFemininePreference = new TickButtonPreference(mContext);
+        mFemininePreference = new SelectorWithWidgetPreference(mContext);
         mFemininePreference.setKey(KEY_FEMININE);
-        mMasculinePreference = new TickButtonPreference(mContext);
+        mMasculinePreference = new SelectorWithWidgetPreference(mContext);
         mMasculinePreference.setKey(KEY_MASCULINE);
-        mNeutralPreference = new TickButtonPreference(mContext);
+        mNeutralPreference = new SelectorWithWidgetPreference(mContext);
         mNeutralPreference.setKey(KEY_NEUTRAL);
         mPreferenceScreen.addPreference(mPreferenceCategory);
         mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressMasculineControllerTest {
     @Test
     @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsMasculine_MasculineIsSelected() {
-        TickButtonPreference selectedPreference =
-                (TickButtonPreference) mPreferenceScreen.getPreference(3);
+        SelectorWithWidgetPreference selectedPreference =
+                (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(3);
         selectedPreference.performClick();
 
         assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
index 0e53198188e..8fd836bfe43 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.widget.TickButtonPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressNeutralControllerTest {
     private PreferenceCategory mPreferenceCategory;
     private PreferenceScreen mPreferenceScreen;
     private TermsOfAddressNeutralController mController;
-    private TickButtonPreference mFemininePreference;
-    private TickButtonPreference mMasculinePreference;
-    private TickButtonPreference mNotSpecifiedPreference;
-    private TickButtonPreference mNeutralPreference;
+    private SelectorWithWidgetPreference mFemininePreference;
+    private SelectorWithWidgetPreference mMasculinePreference;
+    private SelectorWithWidgetPreference mNotSpecifiedPreference;
+    private SelectorWithWidgetPreference mNeutralPreference;
     private GrammaticalInflectionManager mGrammaticalInflectionManager;
 
     @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressNeutralControllerTest {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreferenceCategory = new PreferenceCategory(mContext);
         mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
-        mNotSpecifiedPreference = new TickButtonPreference(mContext);
+        mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
         mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
-        mFemininePreference = new TickButtonPreference(mContext);
+        mFemininePreference = new SelectorWithWidgetPreference(mContext);
         mFemininePreference.setKey(KEY_FEMININE);
-        mMasculinePreference = new TickButtonPreference(mContext);
+        mMasculinePreference = new SelectorWithWidgetPreference(mContext);
         mMasculinePreference.setKey(KEY_MASCULINE);
-        mNeutralPreference = new TickButtonPreference(mContext);
+        mNeutralPreference = new SelectorWithWidgetPreference(mContext);
         mNeutralPreference.setKey(KEY_NEUTRAL);
         mPreferenceScreen.addPreference(mPreferenceCategory);
         mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressNeutralControllerTest {
     @Test
     @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsNotSpecified_NeutralIsSelected() {
-        TickButtonPreference selectedPreference =
-                (TickButtonPreference) mPreferenceScreen.getPreference(4);
+        SelectorWithWidgetPreference selectedPreference =
+                (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(4);
         selectedPreference.performClick();
 
         assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
index 96bac08dde1..4e9c3ee6fcf 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.widget.TickButtonPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressNotSpecifiedControllerTest {
     private PreferenceCategory mPreferenceCategory;
     private PreferenceScreen mPreferenceScreen;
     private TermsOfAddressNotSpecifiedController mController;
-    private TickButtonPreference mFemininePreference;
-    private TickButtonPreference mMasculinePreference;
-    private TickButtonPreference mNotSpecifiedPreference;
-    private TickButtonPreference mNeutralPreference;
+    private SelectorWithWidgetPreference mFemininePreference;
+    private SelectorWithWidgetPreference mMasculinePreference;
+    private SelectorWithWidgetPreference mNotSpecifiedPreference;
+    private SelectorWithWidgetPreference mNeutralPreference;
     private GrammaticalInflectionManager mGrammaticalInflectionManager;
 
     @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressNotSpecifiedControllerTest {
         mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreferenceCategory = new PreferenceCategory(mContext);
         mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
-        mNotSpecifiedPreference = new TickButtonPreference(mContext);
+        mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
         mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
-        mFemininePreference = new TickButtonPreference(mContext);
+        mFemininePreference = new SelectorWithWidgetPreference(mContext);
         mFemininePreference.setKey(KEY_FEMININE);
-        mMasculinePreference = new TickButtonPreference(mContext);
+        mMasculinePreference = new SelectorWithWidgetPreference(mContext);
         mMasculinePreference.setKey(KEY_MASCULINE);
-        mNeutralPreference = new TickButtonPreference(mContext);
+        mNeutralPreference = new SelectorWithWidgetPreference(mContext);
         mNeutralPreference.setKey(KEY_NEUTRAL);
         mPreferenceScreen.addPreference(mPreferenceCategory);
         mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressNotSpecifiedControllerTest {
     @Test
     @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() {
-        TickButtonPreference selectedPreference =
-                (TickButtonPreference) mPreferenceScreen.getPreference(1);
+        SelectorWithWidgetPreference selectedPreference =
+                (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(1);
         selectedPreference.performClick();
 
         assertThat(selectedPreference.getKey()).isEqualTo(KEY_NOT_SPECIFIED);
diff --git a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 7612805370a..ca404f697e0 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.network;
 
-import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
+import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
+
+import static com.android.settings.flags.Flags.FLAG_CATALYST_NETWORK_PROVIDER_AND_INTERNET_SCREEN;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,6 +32,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Looper;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.provider.SettingsSlicesContract;
 import android.util.AndroidRuntimeException;
@@ -44,6 +47,7 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -51,6 +55,8 @@ import org.mockito.MockitoAnnotations;
 
 @RunWith(AndroidJUnit4.class)
 public class AirplaneModePreferenceControllerTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
 
     private static final int ON = 1;
     private static final int OFF = 0;
@@ -68,6 +74,7 @@ public class AirplaneModePreferenceControllerTest {
 
     @Before
     public void setUp() {
+        mSetFlagsRule.disableFlags(FLAG_CATALYST_NETWORK_PROVIDER_AND_INTERNET_SCREEN);
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
@@ -78,12 +85,12 @@ public class AirplaneModePreferenceControllerTest {
         mResolver = mContext.getContentResolver();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         mController = new AirplaneModePreferenceController(mContext,
-                KEY_AIRPLANE_MODE);
+                AirplaneModePreference.KEY);
 
         mPreferenceManager = new PreferenceManager(mContext);
         mScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreference = new RestrictedSwitchPreference(mContext);
-        mPreference.setKey(KEY_AIRPLANE_MODE);
+        mPreference.setKey(AirplaneModePreference.KEY);
         mScreen.addPreference(mPreference);
         mController.setFragment(null);
     }
diff --git a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java
index 59e10c36ec7..7f05913cd82 100644
--- a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java
@@ -152,6 +152,10 @@ public final class CellularSecurityPreferenceControllerTest {
     public void handlePreferenceTreeClick_safetyCenterSupported_shouldRedirectToSafetyCenter() {
         final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
 
+        doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled();
+        doReturn(true).when(mTelephonyManager)
+              .isCellularIdentifierDisclosureNotificationsEnabled();
+        doReturn(true).when(mTelephonyManager).isNullCipherAndIntegrityPreferenceEnabled();
         boolean prefHandled = mController.handlePreferenceTreeClick(mPreference);
 
         assertThat(prefHandled).isTrue();
diff --git a/tests/unit/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/VpnPreferenceControllerTest.java
index ee239ba84a1..7a6a99af8e5 100644
--- a/tests/unit/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -34,7 +34,6 @@ import android.net.VpnManager;
 import android.os.Looper;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.provider.SettingsSlicesContract;
 
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.Preference;
@@ -102,7 +101,7 @@ public class VpnPreferenceControllerTest {
 
         controller.displayPreference(mScreen);
 
-        verify(mPreference).setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
+        verify(mPreference).setDependency(Settings.Global.AIRPLANE_MODE_ON);
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index adc8dc0cdc4..95ae1d1557e 100644
--- a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -16,9 +16,11 @@
 
 package com.android.settings.network.telephony;
 
+import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_OFF;
+
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 
-import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM;
@@ -30,13 +32,17 @@ import static com.android.settings.network.telephony.TelephonyConstants.RadioAcc
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 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.platform.test.annotations.EnableFlags;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -51,8 +57,8 @@ import androidx.test.annotation.UiThreadTest;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.flags.Flags;
 import com.android.settings.network.CarrierConfigCache;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -149,7 +155,7 @@ public class EnabledNetworkModePreferenceControllerTest {
     @Test
     public void updateState_selectedOn5gItem() {
         mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mController.init(SUB_ID, mFragmentManager);
 
@@ -161,14 +167,13 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(
-                        TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
     }
 
     @UiThreadTest
     @Test
     public void updateState_disAllowed5g_5gOptionHidden() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
         mController.init(SUB_ID, mFragmentManager);
@@ -188,7 +193,7 @@ public class EnabledNetworkModePreferenceControllerTest {
     @UiThreadTest
     @Test
     public void updateState_disAllowed5g_selectOn4gOption() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
         mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
         mController.init(SUB_ID, mFragmentManager);
@@ -200,14 +205,13 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(
-                        TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
     }
 
     @UiThreadTest
     @Test
     public void updateState_NrEnableBoolFalse_5gOptionHidden() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA);
         mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
         mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
 
@@ -221,8 +225,7 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(
-                        TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
         assertThat(mPreference.getEntryValues())
                 .asList()
                 .doesNotContain(
@@ -264,14 +267,13 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(
-                        TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
     }
 
     @UiThreadTest
     @Test
     public void updateState_updateByNetworkMode() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
 
         // NETWORK_MODE_TDSCDMA_GSM_WCDMA = RAF_TD_SCDMA | GSM | WCDMA
         when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -280,14 +282,14 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
         assertThat(mPreference.getSummary()).isEqualTo("3G");
     }
 
     @UiThreadTest
     @Test
     public void updateState_updateByNetworkMode_useDefaultValue() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
 
         // NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = LTE | CDMA | EVDO | GSM | WCDMA
         when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -296,40 +298,83 @@ public class EnabledNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+    }
+
+    @UiThreadTest
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_satelliteIsStartedAndSelectedSubForSatellite_disablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_CONNECTED);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID);
+
+        mController.updateState(mPreference);
+
+        assertFalse(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_satelliteIsIdle_enablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_OFF);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID);
+
+        mController.updateState(mPreference);
+
+        assertTrue(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_notSelectedSubForSatellite_enablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_CONNECTED);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(0);
+
+        mController.updateState(mPreference);
+
+        assertTrue(mPreference.isEnabled());
     }
 
     @UiThreadTest
     @Test
     public void onPreferenceChange_updateSuccess() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(
-                        TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                RadioAccessFamily.getRafFromNetworkType(
+                        TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
 
         mController.updateState(mPreference);
         mController.onViewCreated(new TestLifecycleOwner());
         mController.onPreferenceChange(mPreference,
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
     }
 
     @UiThreadTest
     @Test
     public void onPreferenceChange_updateFail() {
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
+                RadioAccessFamily.getRafFromNetworkType(
+                        TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
 
         mController.updateState(mPreference);
         mController.onViewCreated(new TestLifecycleOwner());
         mController.onPreferenceChange(mPreference,
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
 
         assertThat(mPreference.getValue()).isNotEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
     }
 
     @UiThreadTest
@@ -340,7 +385,7 @@ public class EnabledNetworkModePreferenceControllerTest {
         PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
         mPreference.setKey(KEY);
         screen.addPreference(mPreference);
-        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+        mockEnabledNetworkMode(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
 
         // NETWORK_MODE_TDSCDMA_GSM_WCDMA = RAF_TD_SCDMA | GSM | WCDMA
         when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -352,7 +397,7 @@ public class EnabledNetworkModePreferenceControllerTest {
         mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(Integer.parseInt(mPreference.getValue())).isEqualTo(
-                TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+                TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
         assertThat(mPreference.getSummary()).isEqualTo("3G");
     }
 
@@ -411,20 +456,19 @@ public class EnabledNetworkModePreferenceControllerTest {
     }
 
     private void mockEnabledNetworkMode(int networkMode) {
-        if (networkMode == TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA) {
+        if (networkMode == TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA) {
             mockPhoneType(TelephonyManager.PHONE_TYPE_GSM);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, true);
-        } else if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA
-                || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
+        } else if (networkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA
+                || networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
             mockPhoneType(TelephonyManager.PHONE_TYPE_GSM);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, true);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL, true);
-        } else if (networkMode == TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA) {
+        } else if (networkMode == TelephonyManager.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
-                || networkMode
-                == TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA) {
+        } else if (networkMode == TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA
+                || networkMode == TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA) {
             mockPhoneType(TelephonyManager.PHONE_TYPE_GSM);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, true);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL, true);
@@ -438,7 +482,7 @@ public class EnabledNetworkModePreferenceControllerTest {
     }
 
     private void mockAccessFamily(int networkMode) {
-        doReturn(MobileNetworkUtils.getRafFromNetworkType(networkMode))
+        doReturn((long) RadioAccessFamily.getRafFromNetworkType(networkMode))
                 .when(mTelephonyManager)
                 .getSupportedRadioAccessFamily();
     }
diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
index f22ad3bce8d..e0a5c180f27 100644
--- a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -16,12 +16,17 @@
 
 package com.android.settings.network.telephony;
 
+import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_OFF;
+
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_TD_SCDMA;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.WCDMA;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -30,16 +35,19 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.os.PersistableBundle;
+import android.platform.test.annotations.EnableFlags;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
 import androidx.preference.ListPreference;
+import androidx.test.annotation.UiThreadTest;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.flags.Flags;
 import com.android.settings.network.CarrierConfigCache;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.Before;
@@ -98,20 +106,61 @@ public class PreferredNetworkModePreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
         assertThat(mPreference.getSummary()).isEqualTo(
                 ResourcesUtils.getResourcesString(mContext,
                         "preferred_network_mode_tdscdma_gsm_wcdma_summary"));
     }
 
+    @Test
+    @UiThreadTest
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_satelliteIsStartedAndSelectedSubForSatellite_disablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_CONNECTED);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID);
+
+        mController.updateState(mPreference);
+
+        assertFalse(mPreference.isEnabled());
+    }
+
+    @Test
+    @UiThreadTest
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_satelliteIsIdle_enablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_OFF);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(SUB_ID);
+
+        mController.updateState(mPreference);
+
+        assertTrue(mPreference.isEnabled());
+    }
+
+    @Test
+    @UiThreadTest
+    @EnableFlags(Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void updateState_notSelectedSubForSatellite_enablePreference() {
+        mController.mSatelliteModemStateCallback
+                .onSatelliteModemStateChanged(SATELLITE_MODEM_STATE_CONNECTED);
+        mController.mSelectedNbIotSatelliteSubscriptionCallback
+                .onSelectedNbIotSatelliteSubscriptionChanged(0);
+
+        mController.updateState(mPreference);
+
+        assertTrue(mPreference.isEnabled());
+    }
+
     @Test
     public void onPreferenceChange_updateNetworkMode() {
         mController.onPreferenceChange(mPreference,
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA));
 
         verify(mTelephonyManager, times(1)).setAllowedNetworkTypesForReason(
                 TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-                MobileNetworkUtils.getRafFromNetworkType(
-                        TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+                RadioAccessFamily.getRafFromNetworkType(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA));
     }
 }
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
new file mode 100644
index 00000000000..82119f17bd3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.Looper;
+
+import androidx.preference.Preference;
+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.R;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class SatelliteSettingsPreferenceCategoryControllerTest {
+    private static final String KEY = "telephony_satellite_settings_category_key";
+    private static final int TEST_SUB_ID = 0;
+
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+    private Context mContext = null;
+    private SatelliteSettingsPreferenceCategoryController mController = null;
+
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);
+    }
+
+    @Test
+    @Ignore("b/382664790")
+    public void getAvailabilityStatus_default_returnUnsupported() {
+        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+        assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @Ignore("b/382664790")
+    public void setPreferenceTitle_hasDataService_showConnectivity() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceCategory.addPreference(new Preference(mContext));
+        preferenceScreen.addPreference(preferenceCategory);
+        mController.displayPreference(preferenceScreen);
+
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                new int[]{SERVICE_TYPE_DATA});
+
+        assertThat(preferenceCategory.getTitle()).isEqualTo(
+                mContext.getString(R.string.title_satellite_setting_connectivity));
+    }
+
+    @Test
+    @Ignore("b/382664790")
+    public void setPreferenceTitle_hasSmsService_showMessaging() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceScreen.addPreference(preferenceCategory);
+        preferenceCategory.addPreference(new Preference(mContext));
+        mController.displayPreference(preferenceScreen);
+
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                new int[]{SERVICE_TYPE_SMS});
+
+        assertThat(preferenceCategory.getTitle()).isEqualTo(
+                mContext.getString(R.string.satellite_setting_title));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java
new file mode 100644
index 00000000000..477a63f11c6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+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.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.platform.test.annotations.EnableFlags;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+import android.telephony.satellite.SatelliteManager;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.telephony.flags.Flags;
+import com.android.settings.R;
+import com.android.settings.network.CarrierConfigCache;
+
+import org.junit.Before;
+import org.junit.Ignore;
+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 SatelliteSettingsPreferenceControllerTest {
+    private static final String KEY = "key";
+    private static final int TEST_SUB_ID = 0;
+
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+    @Mock
+    private CarrierConfigCache mCarrierConfigCache;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private Context mContext = null;
+    private SatelliteManager mSatelliteManager;
+    private SatelliteSettingPreferenceController mController = null;
+    private PersistableBundle mCarrierConfig = new PersistableBundle();
+
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mSatelliteManager = new SatelliteManager(mContext);
+        CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
+        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(mSatelliteManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(TEST_SUB_ID)).thenReturn(mTelephonyManager);
+        mController = spy(new SatelliteSettingPreferenceController(mContext, KEY));
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
+    public void getAvailabilityStatus_noSatellite_returnUnsupport() {
+        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
+        mController = new SatelliteSettingPreferenceController(mContext, KEY);
+
+        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+
+        assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
+    public void getAvailabilityStatus_carrierIsNotSupport_returnUnavailable() {
+        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
+        mCarrierConfig.putBoolean(
+                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
+                false);
+        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);
+
+        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+
+        assertThat(result).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
+    public void getAvailabilityStatus_carrierIsSupport_returnAvailable() {
+        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
+        mCarrierConfig.putBoolean(
+                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
+                true);
+        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);
+
+        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+
+        assertThat(result).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    @Ignore("avoid post submit failed")
+    @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void getAvailabilityStatus_registerTelephonyCallback_success() {
+        mController.init(TEST_SUB_ID);
+        mController.onResume(null);
+
+        verify(mTelephonyManager).registerTelephonyCallback(any(), any());
+    }
+
+    @Test
+    @Ignore("avoid post submit failed")
+    @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void getAvailabilityStatus_unregisterTelephonyCallback_success() {
+        mController.init(TEST_SUB_ID);
+        mController.onPause(null);
+
+        verify(mTelephonyManager).unregisterTelephonyCallback(any());
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void getAvailabilityStatus_hasServiceDataType_showDataUi() {
+        mController.init(TEST_SUB_ID);
+        Preference preference = new Preference(mContext);
+        preference.setKey(KEY);
+        preference.setTitle("test title");
+        mController.updateState(preference);
+
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                new int[]{SERVICE_TYPE_SMS, SERVICE_TYPE_DATA});
+
+        assertThat(preference.getTitle()).isEqualTo(
+                mContext.getString(R.string.title_satellite_setting_connectivity));
+    }
+
+    @Test
+    @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
+    public void getAvailabilityStatus_onlyHasServiceSmsType_showSmsUi() {
+        mController.init(TEST_SUB_ID);
+        Preference preference = new Preference(mContext);
+        preference.setKey(KEY);
+        preference.setTitle("test title");
+        mController.updateState(preference);
+
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                new int[]{SERVICE_TYPE_SMS});
+
+        assertThat(preference.getTitle()).isEqualTo(
+                mContext.getString(R.string.satellite_setting_title));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
index 7095235b18f..bfe4be2d54c 100644
--- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
@@ -51,6 +51,7 @@ import com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPri
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -234,6 +235,7 @@ public class PrivateSpaceMaintainerTest {
      * Tests that {@link PrivateSpaceMaintainer#lockPrivateSpace()} when PS exists and is running
      * locks the private profile.
      */
+    @Ignore("Flaky pre-submit b/378392936")
     @Test
     public void lockPrivateSpace_psExistsAndPrivateProfileRunning_locksCreatedPrivateSpace() {
         mSetFlagsRule.enableFlags(
@@ -253,6 +255,7 @@ public class PrivateSpaceMaintainerTest {
      * Tests that {@link PrivateSpaceMaintainer#lockPrivateSpace()} when PS exist and private
      * profile not running returns false.
      */
+    @Ignore("Flaky pre-submit b/378392936")
     @Test
     public void lockPrivateSpace_psExistsAndPrivateProfileNotRunning_returnsFalse() {
         mSetFlagsRule.enableFlags(
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekControllerTest.java
index 062aef8393a..cd813453425 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekControllerTest.java
@@ -19,14 +19,18 @@ package com.android.settings.regionalpreferences;
 import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.flags.Flags;
 import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import java.util.Locale;
@@ -37,6 +41,8 @@ public class FirstDayOfWeekControllerTest {
     private String mCacheProviderContent = "";
     private Locale mCacheLocale;
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Before
     public void setUp() throws Exception {
         mApplicationContext = ApplicationProvider.getApplicationContext();
@@ -54,6 +60,7 @@ public class FirstDayOfWeekControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_hasProviderValue_resultIsWed() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-wed");
 
@@ -64,6 +71,7 @@ public class FirstDayOfWeekControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_hasProviderValue_resultIsSat() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-sat");
 
@@ -74,6 +82,7 @@ public class FirstDayOfWeekControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsSat() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
         Locale.setDefault(Locale.forLanguageTag("en-US-u-fw-sat"));
@@ -85,6 +94,7 @@ public class FirstDayOfWeekControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsdefault() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
         Locale.setDefault(Locale.forLanguageTag("en-US"));
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java
index 3b72cba75b7..1881e01b5ff 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java
@@ -25,16 +25,15 @@ import android.os.LocaleList;
 import android.os.Looper;
 import android.provider.Settings;
 
-import com.android.internal.app.LocalePicker;
-import com.android.settings.widget.TickButtonPreference;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.Preference;
 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.internal.app.LocalePicker;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -91,8 +90,9 @@ public class FirstDayOfWeekItemListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredFirstDayOfWeekIsDefault() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(0);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(0);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
@@ -103,8 +103,9 @@ public class FirstDayOfWeekItemListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredFirstDayOfWeekIsSunday() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(1);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(1);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
@@ -114,8 +115,9 @@ public class FirstDayOfWeekItemListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredFirstDayOfWeekIsMonday() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(2);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(2);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemControllerTest.java
index 6a95bb95826..cba30936c23 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemControllerTest.java
@@ -23,22 +23,30 @@ import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 import android.os.LocaleList;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.flags.Flags;
+
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class NumberingSystemControllerTest {
     private Context mApplicationContext;
     private NumberingSystemController mController;
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Before
     public void setUp() throws Exception {
         mApplicationContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getAvailabilityStatus_noLocale_unavailable() {
         LocaleList.setDefault(LocaleList.forLanguageTags("en-US,zh-Hant-TW"));
         mController = new NumberingSystemController(mApplicationContext, "key");
@@ -49,6 +57,7 @@ public class NumberingSystemControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getAvailabilityStatus_hasLocaleWithNumberingSystems_available() {
         // ar-JO has different numbering system.
         LocaleList.setDefault(LocaleList.forLanguageTags("en-US,zh-Hant-TW,ar-JO"));
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java
index 50e21fe6b3f..96d133525bb 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java
@@ -38,10 +38,11 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.internal.app.LocalePicker;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.TickButtonPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Locale;
@@ -82,7 +83,8 @@ public class NumberingSystemItemControllerTest {
                 NumberingSystemItemController.ARG_VALUE_LANGUAGE_SELECT);
         bundle.putString(
                 NumberingSystemItemController.KEY_SELECTED_LANGUAGE, Locale.US.toLanguageTag());
-        TickButtonPreference preference = new TickButtonPreference(mApplicationContext);
+        SelectorWithWidgetPreference preference =
+                new SelectorWithWidgetPreference(mApplicationContext);
         preference.setKey("I_am_the_key");
         mPreferenceScreen.addPreference(preference);
         mController = new NumberingSystemItemController(mApplicationContext, bundle);
@@ -104,13 +106,15 @@ public class NumberingSystemItemControllerTest {
 
     @Test
     @UiThreadTest
+    @Ignore("b/377633438")
     public void handlePreferenceTreeClick_numbersSelect_preferenceHasTick() {
         Bundle bundle = new Bundle();
         bundle.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,
                 NumberingSystemItemController.ARG_VALUE_NUMBERING_SYSTEM_SELECT);
         bundle.putString(
                 NumberingSystemItemController.KEY_SELECTED_LANGUAGE, Locale.US.toLanguageTag());
-        TickButtonPreference preference = new TickButtonPreference(mApplicationContext);
+        SelectorWithWidgetPreference preference =
+                new SelectorWithWidgetPreference(mApplicationContext);
         preference.setKey("test_key");
         mPreferenceScreen.addPreference(preference);
         mController = new NumberingSystemItemController(mApplicationContext, bundle);
@@ -133,8 +137,10 @@ public class NumberingSystemItemControllerTest {
                 NumberingSystemItemController.ARG_VALUE_NUMBERING_SYSTEM_SELECT);
         bundle.putString(
                 NumberingSystemItemController.KEY_SELECTED_LANGUAGE, "ar-BH");
-        TickButtonPreference defaultPreference = new TickButtonPreference(mApplicationContext);
-        TickButtonPreference numberPreference = new TickButtonPreference(mApplicationContext);
+        SelectorWithWidgetPreference defaultPreference =
+                new SelectorWithWidgetPreference(mApplicationContext);
+        SelectorWithWidgetPreference numberPreference =
+                new SelectorWithWidgetPreference(mApplicationContext);
         defaultPreference.setKey("default");
         numberPreference.setKey("latn");
         mPreferenceScreen.addPreference(defaultPreference);
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitControllerTest.java
index aa652cab1f4..561e788533d 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitControllerTest.java
@@ -19,14 +19,18 @@ package com.android.settings.regionalpreferences;
 import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.flags.Flags;
 import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import java.util.Locale;
@@ -37,6 +41,8 @@ public class TemperatureUnitControllerTest {
     private String mCacheProviderContent = "";
     private Locale mCacheLocale;
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Before
     public void setUp() throws Exception {
         mApplicationContext = ApplicationProvider.getApplicationContext();
@@ -54,6 +60,7 @@ public class TemperatureUnitControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_hasProviderValue_resultIsCelsius() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(
                 mApplicationContext, "und-u-mu-celsius");
@@ -65,6 +72,7 @@ public class TemperatureUnitControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_hasProviderValue_resultIsFahrenheit() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(
                 mApplicationContext, "und-u-mu-fahrenhe");
@@ -76,6 +84,7 @@ public class TemperatureUnitControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsFahrenheit() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
         Locale.setDefault(Locale.forLanguageTag("en-US-u-mu-fahrenhe"));
@@ -87,6 +96,7 @@ public class TemperatureUnitControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_REGIONAL_PREFERENCES_API_ENABLED)
     public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsDefault() {
         RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
         Locale.setDefault(Locale.forLanguageTag("en-US"));
diff --git a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java
index 0417443aee5..deedb648791 100644
--- a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java
+++ b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.regionalpreferences;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
@@ -24,16 +25,15 @@ import android.os.LocaleList;
 import android.os.Looper;
 import android.provider.Settings;
 
-import com.android.internal.app.LocalePicker;
-import com.android.settings.widget.TickButtonPreference;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.Preference;
 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.internal.app.LocalePicker;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -88,8 +88,9 @@ public class TemperatureUnitListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredTemperatureUnitIsDefault() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(0);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(0);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
@@ -101,8 +102,9 @@ public class TemperatureUnitListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredTemperatureUnitIsCelsius() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(1);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(1);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
@@ -112,8 +114,9 @@ public class TemperatureUnitListControllerTest {
 
     @Test
     public void displayPreference_setSelectPreferredTemperatureUnitIsFahrenhe() {
-        TickButtonPreference pref = (TickButtonPreference) mPreferenceCategory.getPreference(2);
-        pref.performClick();
+        SelectorWithWidgetPreference pref =
+                (SelectorWithWidgetPreference) mPreferenceCategory.getPreference(2);
+        pref.onClick();
         String record = Settings.System.getString(
                 mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
 
diff --git a/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
index a6ed5c78a21..b4d4fcf1831 100644
--- a/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
+++ b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
@@ -18,6 +18,12 @@ package com.android.settings.search;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.app.Flags;
+import android.platform.test.annotations.RequiresFlagsDisabled;
+import android.platform.test.annotations.RequiresFlagsEnabled;
+import android.platform.test.flag.junit.CheckFlagsRule;
+import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settings.backup.UserBackupSettingsActivity;
@@ -35,12 +41,16 @@ import com.android.settings.security.SecuritySettings;
 import com.android.settings.security.screenlock.ScreenLockSettings;
 import com.android.settings.system.SystemDashboardFragment;
 
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class CustomSiteMapRegistryTest {
 
+    @Rule
+    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+
     @Test
     public void shouldContainScreenLockSettingsPairs() {
         assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
@@ -75,12 +85,20 @@ public class CustomSiteMapRegistryTest {
     }
 
     @Test
+    @RequiresFlagsDisabled(Flags.FLAG_MODES_UI)
     public void shouldContainZenModeBlockedEffectsSettingsPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP).containsEntry(
+                ZenModeBlockedEffectsSettings.class.getName(),
                 ZenModeRestrictNotificationsSettings.class.getName());
     }
 
+    @Test
+    @RequiresFlagsEnabled(Flags.FLAG_MODES_UI)
+    public void shouldNotContainZenModeBlockedEffectsSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP)
+                .doesNotContainKey(ZenModeBlockedEffectsSettings.class.getName());
+    }
+
     @Test
     public void shouldContainGestureNavigationSettingsFragmentPairs() {
         assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
diff --git a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
index 8764d4f7a79..9e138965289 100644
--- a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
+++ b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
@@ -173,6 +173,7 @@ public class VpnSettingsTest {
     }
 
     @Test
+    @UiThreadTest
     public void getVpnApps_isAdvancedVpn_returnsOne() throws Exception {
         ApplicationInfo info = new ApplicationInfo();
         info.uid = 1111;
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSwitchPreferenceTest.kt b/tests/unit/src/com/android/settings/wifi/WifiSwitchPreferenceTest.kt
new file mode 100644
index 00000000000..41de0901bd5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiSwitchPreferenceTest.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContextWrapper
+import android.net.wifi.WifiManager
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class WifiSwitchPreferenceTest {
+
+    private var mockWifiManager = mock<WifiManager>()
+
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when (name) {
+                    getSystemServiceName(WifiManager::class.java) -> mockWifiManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    private val wifiSwitchPreference = WifiSwitchPreference()
+
+    @Test
+    fun getValue_defaultOn_returnOn() {
+        mockWifiManager.stub { on { isWifiEnabled } doReturn true }
+
+        val getValue = wifiSwitchPreference.storage(context).getBoolean(WifiSwitchPreference.KEY)
+
+        assertThat(getValue).isTrue()
+    }
+
+    @Test
+    fun getValue_defaultOff_returnOff() {
+        mockWifiManager.stub { on { isWifiEnabled } doReturn false }
+
+        val getValue = wifiSwitchPreference.storage(context).getBoolean(WifiSwitchPreference.KEY)
+
+        assertThat(getValue).isFalse()
+    }
+
+    @Test
+    fun performClick_defaultOn_checkedIsFalse() {
+        mockWifiManager.stub { on { isWifiEnabled } doReturn true }
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun performClick_defaultOff_checkedIsTrue() {
+        mockWifiManager.stub { on { isWifiEnabled } doReturn false }
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    private fun getSwitchPreference(): SwitchPreferenceCompat =
+        wifiSwitchPreference.createAndBindWidget(context)
+}
diff --git a/tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java b/tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java
index 4765d180119..510ce39350d 100644
--- a/tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java
+++ b/tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java
@@ -78,6 +78,7 @@ import java.util.Arrays;
 public class WifiHotspotRepositoryTest {
     static final String WIFI_SSID = "wifi_ssid";
     static final String WIFI_PASSWORD = "wifi_password";
+    static final String WIFI_PASSWORD_SHORT = "wifi";
 
     static final int WIFI_5GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ;
     static final int WIFI_6GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ_6GHZ;
@@ -477,7 +478,7 @@ public class WifiHotspotRepositoryTest {
 
     @Test
     public void setSpeedType_2g5ghzTo6ghz_setConfigSecurityToWpa3() {
-        mockConfig(SPEED_2GHZ_5GHZ, SECURITY_TYPE_WPA3_SAE_TRANSITION);
+        mockConfig(SPEED_2GHZ_5GHZ, SECURITY_TYPE_WPA3_SAE_TRANSITION, WIFI_PASSWORD);
 
         mRepository.setSpeedType(SPEED_6GHZ);
 
@@ -497,10 +498,32 @@ public class WifiHotspotRepositoryTest {
         SparseIntArray channels = mSoftApConfigCaptor.getValue().getChannels();
         assertThat(channels.get(BAND_2GHZ, CHANNEL_NOT_FOUND)).isNotEqualTo(CHANNEL_NOT_FOUND);
         assertThat(channels.get(BAND_2GHZ_5GHZ, CHANNEL_NOT_FOUND)).isNotEqualTo(CHANNEL_NOT_FOUND);
+    }
+
+    @Test
+    public void setSpeedType_6ghzTo2g5ghzWith8CharPassphrase_changesSecurityToWpa3Transition() {
+        mockConfigSpeedType(SPEED_6GHZ);
+        mRepository.mIsDualBand = true;
+
+        mRepository.setSpeedType(SPEED_2GHZ_5GHZ);
+
+        verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
         assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
                 .isEqualTo(SECURITY_TYPE_WPA3_SAE_TRANSITION);
     }
 
+    @Test
+    public void setSpeedType_6ghzTo2g5ghzWithLessThan8CharPassphrase_doesNotChangeSecurity() {
+        mockConfig(SECURITY_TYPE_WPA3_SAE, SPEED_6GHZ, WIFI_PASSWORD_SHORT);
+        mRepository.mIsDualBand = true;
+
+        mRepository.setSpeedType(SPEED_2GHZ_5GHZ);
+
+        verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
+        assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
+                .isEqualTo(SECURITY_TYPE_WPA3_SAE);
+    }
+
     @Test
     public void setSpeedType_2ghzTo5ghz_setConfigBandTo5ghzPreferred() {
         mockConfigSpeedType(SPEED_2GHZ);
@@ -784,18 +807,18 @@ public class WifiHotspotRepositoryTest {
     }
 
     private void mockConfigSecurityType(int securityType) {
-        mockConfig(securityType, SPEED_2GHZ);
+        mockConfig(securityType, SPEED_2GHZ,
+                (securityType == SECURITY_TYPE_OPEN) ? null : WIFI_PASSWORD);
     }
 
     private void mockConfigSpeedType(int speedType) {
-        mockConfig(SECURITY_TYPE_WPA3_SAE, speedType);
+        mockConfig(SECURITY_TYPE_WPA3_SAE, speedType, WIFI_PASSWORD);
     }
 
-    private void mockConfig(int securityType, int speedType) {
+    private void mockConfig(int securityType, int speedType, String passphrase) {
         SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
         // Security Type
         doReturn(securityType).when(mSecurityType).getValue();
-        String passphrase = (securityType == SECURITY_TYPE_OPEN) ? null : WIFI_PASSWORD;
         configBuilder.setPassphrase(passphrase, securityType).build();
 
         // Speed Type